Update to Chromium version 55.0.2883.28
This commit is contained in:
parent
afbd288efa
commit
666341d24e
|
@ -7,5 +7,5 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/55.0.2883.21',
|
||||
'chromium_checkout': 'refs/tags/55.0.2883.28',
|
||||
}
|
||||
|
|
|
@ -56,7 +56,9 @@ class CefForceShutdown {
|
|||
}
|
||||
} g_force_shutdown;
|
||||
|
||||
#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
|
||||
#if defined(OS_WIN)
|
||||
|
||||
#if defined(ARCH_CPU_X86_64)
|
||||
// VS2013 only checks the existence of FMA3 instructions, not the enabled-ness
|
||||
// of them at the OS level (this is fixed in VS2015). We force off usage of
|
||||
// FMA3 instructions in the CRT to avoid using that path and hitting illegal
|
||||
|
@ -68,16 +70,31 @@ void DisableFMA3() {
|
|||
disabled = true;
|
||||
_set_FMA3_enable(0);
|
||||
}
|
||||
#endif // WIN && ARCH_CPU_X86_64
|
||||
#endif // defined(ARCH_CPU_X86_64)
|
||||
|
||||
// Signal chrome_elf to initialize crash reporting, rather than doing it in
|
||||
// DllMain. See https://crbug.com/656800 for details.
|
||||
void InitializeCrashReporting() {
|
||||
static bool initialized = false;
|
||||
if (initialized)
|
||||
return;
|
||||
initialized = true;
|
||||
SignalInitializeCrashReporting();
|
||||
}
|
||||
|
||||
#endif // defined(OS_WIN)
|
||||
|
||||
} // namespace
|
||||
|
||||
int CefExecuteProcess(const CefMainArgs& args,
|
||||
CefRefPtr<CefApp> application,
|
||||
void* windows_sandbox_info) {
|
||||
#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
|
||||
#if defined(OS_WIN)
|
||||
#if defined(ARCH_CPU_X86_64)
|
||||
DisableFMA3();
|
||||
#endif
|
||||
InitializeCrashReporting();
|
||||
#endif
|
||||
|
||||
base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
|
||||
#if defined(OS_WIN)
|
||||
|
@ -131,9 +148,12 @@ bool CefInitialize(const CefMainArgs& args,
|
|||
const CefSettings& settings,
|
||||
CefRefPtr<CefApp> application,
|
||||
void* windows_sandbox_info) {
|
||||
#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
|
||||
#if defined(OS_WIN)
|
||||
#if defined(ARCH_CPU_X86_64)
|
||||
DisableFMA3();
|
||||
#endif
|
||||
InitializeCrashReporting();
|
||||
#endif
|
||||
|
||||
// Return true if the global context already exists.
|
||||
if (g_context)
|
||||
|
|
|
@ -39,10 +39,10 @@ index 14d8550..92e5b21 100644
|
|||
// built in media player for the given |url|. Defaults to false.
|
||||
virtual bool ShouldUseMediaPlayerForURL(const GURL& url);
|
||||
diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
|
||||
index 8880b8d..cab954b 100644
|
||||
index a6b0993..7a926da 100644
|
||||
--- renderer/render_frame_impl.cc
|
||||
+++ renderer/render_frame_impl.cc
|
||||
@@ -5008,7 +5008,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
@@ -5009,7 +5009,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
(pending_navigation_params_ &&
|
||||
!pending_navigation_params_->request_params.redirects.empty());
|
||||
|
||||
|
@ -50,7 +50,7 @@ index 8880b8d..cab954b 100644
|
|||
// The handlenavigation API is deprecated and will be removed once
|
||||
// crbug.com/325351 is resolved.
|
||||
if (GetContentClient()->renderer()->HandleNavigation(
|
||||
@@ -5017,7 +5016,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
@@ -5018,7 +5017,6 @@ WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
||||
is_redirect)) {
|
||||
return blink::WebNavigationPolicyIgnore;
|
||||
}
|
||||
|
|
|
@ -11,10 +11,10 @@ index 585f0d8..9f60467 100644
|
|||
|
||||
# TODO(dgn): Layer violation but breaks the build otherwise, see
|
||||
diff --git BUILD.gn BUILD.gn
|
||||
index 93699f0..3346d3e 100644
|
||||
index a7bcf41..f676b26 100644
|
||||
--- BUILD.gn
|
||||
+++ BUILD.gn
|
||||
@@ -280,6 +280,7 @@ group("both_gn_and_gyp") {
|
||||
@@ -279,6 +279,7 @@ group("both_gn_and_gyp") {
|
||||
# and whether there should be other targets that are iOS-only and missing.
|
||||
deps += [
|
||||
"//cc:cc_unittests",
|
||||
|
@ -116,7 +116,7 @@ index 3e93269..9821a4b 100644
|
|||
if (is_mac) {
|
||||
output_locales = locales_as_mac_outputs
|
||||
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
|
||||
index 6994618..4ed3f85 100644
|
||||
index 3f379fe..3fd205f 100644
|
||||
--- chrome/installer/mini_installer/BUILD.gn
|
||||
+++ chrome/installer/mini_installer/BUILD.gn
|
||||
@@ -125,7 +125,7 @@ template("generate_mini_installer") {
|
||||
|
|
|
@ -35,10 +35,10 @@ index 5509a57..d32b4cc 100644
|
|||
bool inert_visual_viewport;
|
||||
bool record_whole_document;
|
||||
diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
|
||||
index 9aefa5e..fb4d3a7 100644
|
||||
index bfb5ccf..a7ed90c 100644
|
||||
--- renderer/render_view_impl.cc
|
||||
+++ renderer/render_view_impl.cc
|
||||
@@ -1487,6 +1487,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
|
||||
@@ -1488,6 +1488,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
|
||||
blink::WebView* web_view,
|
||||
CompositorDependencies* compositor_deps) {
|
||||
ApplyWebPreferences(prefs, web_view);
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
|
||||
index 055cd9d..3a63433 100644
|
||||
index c594edc..2c35305 100644
|
||||
--- chrome/app/generated_resources.grd
|
||||
+++ chrome/app/generated_resources.grd
|
||||
@@ -7073,7 +7073,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
||||
|
|
Loading…
Reference in New Issue