bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 58.0.3029.6

This commit is contained in:
Marshall Greenblatt 2017-03-09 13:31:23 -05:00
parent 54647945f1
commit 2071058036
4 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': '939b32ee5ba05c396eef3fd992822fcca9a2e262',
'chromium_checkout': 'refs/tags/58.0.3029.6',
}

21
patch/patches/DEPS.patch Normal file
View File

@ -0,0 +1,21 @@
diff --git a/DEPS b/DEPS
index 849d1f7..c5297af 100644
--- a/DEPS
+++ b/DEPS
@@ -1166,12 +1166,12 @@ recursedeps = [
'src/buildtools',
'src/third_party/android_tools',
[
- 'DEPS.chromium',
- 'src/third_party/angle'
+ 'src/third_party/angle',
+ 'DEPS.chromium'
],
[
- 'DEPS',
- 'src/third_party/swiftshader'
+ 'src/third_party/swiftshader',
+ 'DEPS'
]
]

34
patch/patches/crashpad_1995.patch
View File

@ -31,7 +31,7 @@ index d2ce8b9..e4fc7c6 100644
cflags = [ "/wd4201" ]
}
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
index 4750471..a341ac0 100644
index a53beea..703f779 100644
--- chrome/common/crash_keys.cc
+++ chrome/common/crash_keys.cc
@@ -4,6 +4,8 @@
@ -52,7 +52,7 @@ index 4750471..a341ac0 100644
// The following keys may be chunked by the underlying crash logging system,
// but ultimately constitute a single key-value pair.
//
@@ -252,10 +254,16 @@ size_t RegisterChromeCrashKeys() {
@@ -251,10 +253,16 @@ size_t RegisterChromeCrashKeys() {
// This dynamic set of keys is used for sets of key value pairs when gathering
// a collection of data, like command line switches or extension IDs.
@ -71,7 +71,7 @@ index 4750471..a341ac0 100644
// Register the extension IDs.
{
@@ -289,7 +297,7 @@ size_t RegisterChromeCrashKeys() {
@@ -288,7 +296,7 @@ size_t RegisterChromeCrashKeys() {
return base::debug::InitCrashKeys(&keys.at(0), keys.size(), kChunkMaxLength);
}
@ -80,7 +80,7 @@ index 4750471..a341ac0 100644
static const char* const kIgnoreSwitches[] = {
switches::kEnableLogging,
switches::kFlagSwitchesBegin,
@@ -345,7 +353,7 @@ static bool IsBoringSwitch(const std::string& flag) {
@@ -344,7 +352,7 @@ static bool IsBoringSwitch(const std::string& flag) {
}
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line) {
@ -203,7 +203,7 @@ index c658fa9..8c4a145 100644
g_crash_helper_enabled = true;
return true;
diff --git components/crash/content/app/breakpad_linux.cc components/crash/content/app/breakpad_linux.cc
index 3c31d76..26a2602 100644
index 722ce16..711f2f2 100644
--- components/crash/content/app/breakpad_linux.cc
+++ components/crash/content/app/breakpad_linux.cc
@@ -29,6 +29,7 @@
@ -222,7 +222,7 @@ index 3c31d76..26a2602 100644
#endif
bool g_is_crash_reporter_enabled = false;
@@ -685,7 +687,7 @@ bool CrashDone(const MinidumpDescriptor& minidump,
@@ -688,7 +690,7 @@ bool CrashDone(const MinidumpDescriptor& minidump,
info.process_type_length = 7;
info.distro = base::g_linux_distro;
info.distro_length = my_strlen(base::g_linux_distro);
@ -231,7 +231,7 @@ index 3c31d76..26a2602 100644
info.process_start_time = g_process_start_time;
info.oom_size = base::g_oom_size;
info.pid = g_pid;
@@ -1341,7 +1343,7 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
@@ -1359,7 +1361,7 @@ void ExecUploadProcessOrTerminate(const BreakpadInfo& info,
header_content_encoding,
header_content_type,
post_file,
@ -240,7 +240,7 @@ index 3c31d76..26a2602 100644
"--timeout=10", // Set a timeout so we don't hang forever.
"--tries=1", // Don't retry if the upload fails.
"-O", // Output reply to the file descriptor path.
@@ -1680,10 +1682,19 @@ void HandleCrashDump(const BreakpadInfo& info) {
@@ -1698,10 +1700,19 @@ void HandleCrashDump(const BreakpadInfo& info) {
GetCrashReporterClient()->GetProductNameAndVersion(&product_name, &version);
writer.AddBoundary();
@ -262,7 +262,7 @@ index 3c31d76..26a2602 100644
if (info.pid > 0) {
char pid_value_buf[kUint64StringSize];
uint64_t pid_value_len = my_uint64_len(info.pid);
@@ -1977,6 +1988,17 @@ void InitCrashReporter(const std::string& process_type) {
@@ -1999,6 +2010,17 @@ void InitCrashReporter(const std::string& process_type) {
PostEnableBreakpadInitialization();
}
@ -281,7 +281,7 @@ index 3c31d76..26a2602 100644
void InitNonBrowserCrashReporterForAndroid(const std::string& process_type) {
SanitizationInfo sanitization_info;
diff --git components/crash/content/app/breakpad_linux.h components/crash/content/app/breakpad_linux.h
index 3ef4e8a..d0a4b12 100644
index 0160f62..b732498 100644
--- components/crash/content/app/breakpad_linux.h
+++ components/crash/content/app/breakpad_linux.h
@@ -16,6 +16,9 @@ namespace breakpad {
@ -292,10 +292,10 @@ index 3ef4e8a..d0a4b12 100644
+void SetCrashServerURL(const std::string& url);
+
#if defined(OS_ANDROID)
struct SanitizationInfo {
bool should_sanitize_dumps = false;
extern void InitCrashKeysForTesting();
diff --git components/crash/content/app/crash_reporter_client.cc components/crash/content/app/crash_reporter_client.cc
index fd88348..cbb9533 100644
index eac090b..c6ca2d3 100644
--- components/crash/content/app/crash_reporter_client.cc
+++ components/crash/content/app/crash_reporter_client.cc
@@ -88,11 +88,12 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
@ -320,7 +320,7 @@ index fd88348..cbb9533 100644
#if defined(OS_WIN)
bool CrashReporterClient::GetCrashDumpLocation(base::string16* crash_dir) {
@@ -141,6 +143,32 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
@@ -149,6 +151,32 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
}
#endif
@ -353,7 +353,7 @@ index fd88348..cbb9533 100644
#if defined(OS_ANDROID)
int CrashReporterClient::GetAndroidMinidumpDescriptor() {
return 0;
@@ -165,9 +193,4 @@ bool CrashReporterClient::ShouldEnableBreakpadMicrodumps() {
@@ -173,9 +201,4 @@ bool CrashReporterClient::ShouldEnableBreakpadMicrodumps() {
}
#endif
@ -364,7 +364,7 @@ index fd88348..cbb9533 100644
-
} // namespace crash_reporter
diff --git components/crash/content/app/crash_reporter_client.h components/crash/content/app/crash_reporter_client.h
index 513727c..aef4590 100644
index ccc3048..663e880 100644
--- components/crash/content/app/crash_reporter_client.h
+++ components/crash/content/app/crash_reporter_client.h
@@ -8,6 +8,7 @@
@ -398,7 +398,7 @@ index 513727c..aef4590 100644
// The location where minidump files should be written. Returns true if
// |crash_dir| was set. Windows has to use base::string16 because this code
@@ -176,6 +179,23 @@ class CrashReporterClient {
@@ -181,6 +184,23 @@ class CrashReporterClient {
// Returns true if breakpad should run in the given process type.
virtual bool EnableBreakpadForProcess(const std::string& process_type);

12
patch/patches/plugin_info_2015.patch
View File

@ -210,10 +210,10 @@ index 3e92d37..ecd8493 100644
const std::string& mime_type,
bool allow_wildcard,
diff --git content/common/frame_messages.h content/common/frame_messages.h
index 774d9cb..c74223f 100644
index 023494a..b3728a0 100644
--- content/common/frame_messages.h
+++ content/common/frame_messages.h
@@ -1244,8 +1244,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -1241,8 +1241,9 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// Used to get the list of plugins. |main_frame_origin| is used to handle
// exceptions for plugin content settings.
@ -224,7 +224,7 @@ index 774d9cb..c74223f 100644
url::Origin /* main_frame_origin */,
std::vector<content::WebPluginInfo> /* plugins */)
@@ -1253,9 +1254,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
@@ -1250,9 +1251,10 @@ IPC_SYNC_MESSAGE_CONTROL2_1(FrameHostMsg_GetPlugins,
// type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the
// found plugin.
@ -285,7 +285,7 @@ index 3b610b1..7c439e0 100644
WebPluginInfo* plugin) = 0;
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 4af9b67..d73ac0b 100644
index a8cbf91..c03cdeb 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -2752,7 +2752,8 @@ blink::WebPlugin* RenderFrameImpl::createPlugin(
@ -298,7 +298,7 @@ index 4af9b67..d73ac0b 100644
params.mimeType.utf8(), &found, &info, &mime_type));
if (!found)
return NULL;
@@ -5246,9 +5247,8 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -5256,9 +5257,8 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
(pending_navigation_params_ &&
!pending_navigation_params_->request_params.redirects.empty());
@ -310,7 +310,7 @@ index 4af9b67..d73ac0b 100644
// The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation(
@@ -5257,7 +5257,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
@@ -5267,7 +5267,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
is_redirect)) {
return blink::WebNavigationPolicyIgnore;
}