bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 60.0.3112.40

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-06-27 12:50:17 -04:00
parent 7afb6c61ff
commit 86bb301075
13 changed files with 50 additions and 29 deletions
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 # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/60.0.3112.10', 'chromium_checkout': 'refs/tags/60.0.3112.40',
} }

6
patch/patch.cfg
View File

@@ -303,4 +303,10 @@ patches = [
# https://bitbucket.org/chromiumembedded/cef/issues/2196 # https://bitbucket.org/chromiumembedded/cef/issues/2196
'name': 'printing_context_2196', 'name': 'printing_context_2196',
}, },
{
# Windows: Fix GPU process crash.
# https://bugs.chromium.org/p/chromium/issues/detail?id=735986
'name': 'libangle_735986',
'path': 'third_party/angle/',
},
] ]

2
patch/patches/browser_plugin_guest_1565.patch
View File

@@ -36,7 +36,7 @@ index 1f985ec..47bf303 100644
} }
diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc diff --git content/browser/frame_host/interstitial_page_impl.cc content/browser/frame_host/interstitial_page_impl.cc
index d890e64..1965603 100644 index 90e4de3..5311193 100644
--- content/browser/frame_host/interstitial_page_impl.cc --- content/browser/frame_host/interstitial_page_impl.cc
+++ content/browser/frame_host/interstitial_page_impl.cc +++ content/browser/frame_host/interstitial_page_impl.cc
@@ -605,7 +605,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() { @@ -605,7 +605,7 @@ WebContentsView* InterstitialPageImpl::CreateWebContentsView() {

8
patch/patches/chrome_profile.patch
View File

@@ -63,10 +63,10 @@ index 4b43013..169ca47 100644
content::BrowserContext* GetBrowserContextRedirectedInIncognito( content::BrowserContext* GetBrowserContextRedirectedInIncognito(
content::BrowserContext* context); content::BrowserContext* context);
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
index 385f9c3..3d126bd 100644 index 5753fec..cc23f06 100644
--- chrome/browser/profiles/profile_manager.h --- chrome/browser/profiles/profile_manager.h
+++ chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h
@@ -89,7 +89,7 @@ class ProfileManager : public base::NonThreadSafe, @@ -95,7 +95,7 @@ class ProfileManager : public base::NonThreadSafe,
// acceptable. Returns null if creation of the new profile fails. // acceptable. Returns null if creation of the new profile fails.
// TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then // TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
// make this method private. // make this method private.
@@ -75,7 +75,7 @@ index 385f9c3..3d126bd 100644
// Returns total number of profiles available on this machine. // Returns total number of profiles available on this machine.
size_t GetNumberOfProfiles(); size_t GetNumberOfProfiles();
@@ -117,7 +117,7 @@ class ProfileManager : public base::NonThreadSafe, @@ -123,7 +123,7 @@ class ProfileManager : public base::NonThreadSafe,
// Returns true if the profile pointer is known to point to an existing // Returns true if the profile pointer is known to point to an existing
// profile. // profile.
@@ -84,7 +84,7 @@ index 385f9c3..3d126bd 100644
// Returns the directory where the first created profile is stored, // Returns the directory where the first created profile is stored,
// relative to the user data directory currently in use. // relative to the user data directory currently in use.
@@ -126,7 +126,7 @@ class ProfileManager : public base::NonThreadSafe, @@ -132,7 +132,7 @@ class ProfileManager : public base::NonThreadSafe,
// Get the Profile last used (the Profile to which owns the most recently // Get the Profile last used (the Profile to which owns the most recently
// focused window) with this Chrome build. If no signed profile has been // focused window) with this Chrome build. If no signed profile has been
// stored in Local State, hand back the Default profile. // stored in Local State, hand back the Default profile.

18
patch/patches/content_1129_2015.patch
View File

@@ -78,10 +78,10 @@ index ea5764b..ae06854 100644
mime_type, false, NULL, &plugin, NULL)); mime_type, false, NULL, &plugin, NULL));
} }
diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc diff --git content/browser/frame_host/navigation_handle_impl.cc content/browser/frame_host/navigation_handle_impl.cc
index 7563fdf..d4e0a38 100644 index 578c05b..b2d2687 100644
--- content/browser/frame_host/navigation_handle_impl.cc --- content/browser/frame_host/navigation_handle_impl.cc
+++ content/browser/frame_host/navigation_handle_impl.cc +++ content/browser/frame_host/navigation_handle_impl.cc
@@ -294,12 +294,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() { @@ -299,12 +299,6 @@ net::Error NavigationHandleImpl::GetNetErrorCode() {
} }
RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() { RenderFrameHostImpl* NavigationHandleImpl::GetRenderFrameHost() {
@@ -95,7 +95,7 @@ index 7563fdf..d4e0a38 100644
} }
diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc diff --git content/browser/frame_host/render_frame_host_impl.cc content/browser/frame_host/render_frame_host_impl.cc
index 55f8a8b..5020178 100644 index cee576c..e3a7dd5 100644
--- content/browser/frame_host/render_frame_host_impl.cc --- content/browser/frame_host/render_frame_host_impl.cc
+++ content/browser/frame_host/render_frame_host_impl.cc +++ content/browser/frame_host/render_frame_host_impl.cc
@@ -865,10 +865,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) { @@ -865,10 +865,8 @@ bool RenderFrameHostImpl::OnMessageReceived(const IPC::Message &msg) {
@@ -109,7 +109,7 @@ index 55f8a8b..5020178 100644
IPC_MESSAGE_HANDLER(FrameHostMsg_RequestOverlayRoutingToken, IPC_MESSAGE_HANDLER(FrameHostMsg_RequestOverlayRoutingToken,
OnRequestOverlayRoutingToken) OnRequestOverlayRoutingToken)
IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow) IPC_MESSAGE_HANDLER(FrameHostMsg_ShowCreatedWindow, OnShowCreatedWindow)
@@ -1323,6 +1321,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError( @@ -1329,6 +1327,7 @@ void RenderFrameHostImpl::OnDidFailProvisionalLoadWithError(
if (navigation_handle_) { if (navigation_handle_) {
navigation_handle_->set_net_error_code( navigation_handle_->set_net_error_code(
static_cast<net::Error>(params.error_code)); static_cast<net::Error>(params.error_code));
@@ -117,7 +117,7 @@ index 55f8a8b..5020178 100644
} }
frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params); frame_tree_node_->navigator()->DidFailProvisionalLoadWithError(this, params);
@@ -2578,14 +2577,12 @@ void RenderFrameHostImpl::OnHidePopup() { @@ -2584,14 +2583,12 @@ void RenderFrameHostImpl::OnHidePopup() {
} }
#endif #endif
@@ -429,7 +429,7 @@ index ebf4cd4..27a9df4 100644
virtual void FocusedNodeChanged(const blink::WebNode& node) {} virtual void FocusedNodeChanged(const blink::WebNode& node) {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index d1e9d50..ad7c36d7 100644 index 7e2ea09..799a0d2 100644
--- content/renderer/render_frame_impl.cc --- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc
@@ -2902,7 +2902,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -2902,7 +2902,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -451,7 +451,7 @@ index d1e9d50..ad7c36d7 100644
} }
void RenderFrameImpl::WillCommitProvisionalLoad() { void RenderFrameImpl::WillCommitProvisionalLoad() {
@@ -5495,9 +5498,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5502,9 +5505,8 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
(!IsBrowserSideNavigationEnabled() || (!IsBrowserSideNavigationEnabled() ||
url != pending_navigation_params_->request_params.redirects[0])); url != pending_navigation_params_->request_params.redirects[0]));
@@ -463,7 +463,7 @@ index d1e9d50..ad7c36d7 100644
// The handlenavigation API is deprecated and will be removed once // The handlenavigation API is deprecated and will be removed once
// crbug.com/325351 is resolved. // crbug.com/325351 is resolved.
if (GetContentClient()->renderer()->HandleNavigation( if (GetContentClient()->renderer()->HandleNavigation(
@@ -5510,7 +5512,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation( @@ -5517,7 +5519,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
} }
return blink::kWebNavigationPolicyIgnore; return blink::kWebNavigationPolicyIgnore;
} }
@@ -472,7 +472,7 @@ index d1e9d50..ad7c36d7 100644
Referrer referrer( Referrer referrer(
RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request)); RenderViewImpl::GetReferrerFromRequest(frame_, info.url_request));
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 116d31a8..ef645bb 100644 index d7a0de4..8d1e96e 100644
--- content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc
@@ -754,6 +754,8 @@ void RenderThreadImpl::Init( @@ -754,6 +754,8 @@ void RenderThreadImpl::Init(

15
patch/patches/libangle_735986.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git src/libANGLE/renderer/d3d/d3d11/Clear11.cpp src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
index 2b960fe..4755132 100644
--- src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
+++ src/libANGLE/renderer/d3d/d3d11/Clear11.cpp
@@ -370,8 +370,8 @@ gl::Error Clear11::clearFramebuffer(const ClearParameters &clearParams,
{
const gl::FramebufferAttachment &attachment = colorAttachments[colorAttachmentIndex];
- if (clearParams.clearColor[colorAttachmentIndex] && attachment.isAttached() &&
- drawBufferStates[colorAttachmentIndex] != GL_NONE)
+ if (!clearParams.clearColor[colorAttachmentIndex] || !attachment.isAttached() ||
+ drawBufferStates[colorAttachmentIndex] == GL_NONE)
{
continue;
}

6
patch/patches/prefs_content_1161.patch
View File

@@ -1,8 +1,8 @@
diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
index 3220d59..f0fa24c 100644 index e0f025b..b691251 100644
--- content/public/common/common_param_traits_macros.h --- content/public/common/common_param_traits_macros.h
+++ content/public/common/common_param_traits_macros.h +++ content/public/common/common_param_traits_macros.h
@@ -206,6 +206,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences) @@ -207,6 +207,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes) IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale) IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled) IPC_STRUCT_TRAITS_MEMBER(smart_insert_delete_enabled)
@@ -35,7 +35,7 @@ index 41f7a69..d04e476 100644
bool inert_visual_viewport; bool inert_visual_viewport;
bool record_whole_document; bool record_whole_document;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index 48b7bc0..f4d9b48 100644 index af998d3..56a4cf9 100644
--- content/renderer/render_view_impl.cc --- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc +++ content/renderer/render_view_impl.cc
@@ -1399,6 +1399,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal( @@ -1399,6 +1399,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(

6
patch/patches/storage_partition_1973.patch
View File

@@ -90,7 +90,7 @@ index 0f23bbe..b21982f 100644
CHECK(GetUserData(kMojoWasInitialized)) CHECK(GetUserData(kMojoWasInitialized))
<< "Attempting to destroy a BrowserContext that never called " << "Attempting to destroy a BrowserContext that never called "
diff --git content/browser/devtools/protocol/service_worker_handler.cc content/browser/devtools/protocol/service_worker_handler.cc diff --git content/browser/devtools/protocol/service_worker_handler.cc content/browser/devtools/protocol/service_worker_handler.cc
index 242d33e..4dfb463 100644 index 31abe59..849745c 100644
--- content/browser/devtools/protocol/service_worker_handler.cc --- content/browser/devtools/protocol/service_worker_handler.cc
+++ content/browser/devtools/protocol/service_worker_handler.cc +++ content/browser/devtools/protocol/service_worker_handler.cc
@@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent( @@ -321,10 +321,9 @@ Response ServiceWorkerHandler::DispatchSyncEvent(
@@ -152,7 +152,7 @@ index 73f3cba..55d488b 100644
BrowserThread::PostTask( BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE, BrowserThread::IO, FROM_HERE,
diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc diff --git content/browser/renderer_host/render_process_host_impl.cc content/browser/renderer_host/render_process_host_impl.cc
index cbd667c..c0158c9 100644 index 8d76dbf..8b3c223 100644
--- content/browser/renderer_host/render_process_host_impl.cc --- content/browser/renderer_host/render_process_host_impl.cc
+++ content/browser/renderer_host/render_process_host_impl.cc +++ content/browser/renderer_host/render_process_host_impl.cc
@@ -482,7 +482,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data, @@ -482,7 +482,7 @@ class DefaultSubframeProcessHostHolder : public base::SupportsUserData::Data,
@@ -346,7 +346,7 @@ index cbd667c..c0158c9 100644
if (!GetWorkerRefCount()) if (!GetWorkerRefCount())
return; return;
service_worker_ref_count_ = 0; service_worker_ref_count_ = 0;
@@ -3065,8 +3084,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance( @@ -3063,8 +3082,8 @@ RenderProcessHost* RenderProcessHostImpl::GetProcessHostForSiteInstance(
g_render_process_host_factory_->CreateRenderProcessHost( g_render_process_host_factory_->CreateRenderProcessHost(
browser_context, site_instance); browser_context, site_instance);
} else { } else {

6
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@@ -18,7 +18,7 @@ index 98460d7..ffbfa04f 100644
return renderer_frame_number_; return renderer_frame_number_;
} }
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index 904897a..38f6e28 100644 index fd1e999..c4dad6d 100644
--- content/browser/renderer_host/render_widget_host_view_base.h --- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -72,6 +72,7 @@ class BrowserAccessibilityDelegate; @@ -72,6 +72,7 @@ class BrowserAccessibilityDelegate;
@@ -38,7 +38,7 @@ index 904897a..38f6e28 100644
// This only needs to be overridden by RenderWidgetHostViewBase subclasses // This only needs to be overridden by RenderWidgetHostViewBase subclasses
// that handle content embedded within other RenderWidgetHostViews. // that handle content embedded within other RenderWidgetHostViews.
@@ -355,6 +358,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, @@ -359,6 +362,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
// helps to position the full screen widget on the correct monitor. // helps to position the full screen widget on the correct monitor.
virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0; virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
@@ -51,7 +51,7 @@ index 904897a..38f6e28 100644
// Sets the cursor to the one associated with the specified cursor_type // Sets the cursor to the one associated with the specified cursor_type
virtual void UpdateCursor(const WebCursor& cursor) = 0; virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -469,6 +478,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView, @@ -473,6 +482,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
const bool wheel_scroll_latching_enabled_; const bool wheel_scroll_latching_enabled_;

4
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 627a0e5..21c6210 100644 index 7f4a8b0..f6a2840 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -1692,6 +1692,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1692,6 +1692,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -48,7 +48,7 @@ index 627a0e5..21c6210 100644
} }
// Save the created window associated with the route so we can show it // Save the created window associated with the route so we can show it
// later. // later.
@@ -5182,7 +5198,7 @@ NavigationEntry* @@ -5204,7 +5220,7 @@ NavigationEntry*
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager( void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) { RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view = RenderWidgetHostViewBase* rwh_view =

2
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -17,7 +17,7 @@ index 372b21d..78107f3 100644
.Top() .Top()
.GetSecurityContext() .GetSecurityContext()
diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
index 9c6d497..6296f53 100644 index 97a5393..21da4ee 100644
--- third_party/WebKit/Source/core/frame/LocalFrame.cpp --- third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ third_party/WebKit/Source/core/frame/LocalFrame.cpp +++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -930,7 +930,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -930,7 +930,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {

2
patch/patches/webkit_popups.patch
View File

@@ -25,7 +25,7 @@ index 2a35f2c..dded520 100644
DCHECK(RuntimeEnabledFeatures::pagePopupEnabled()); DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp
index a8985f8..2cf5913 100644 index bd1490b..80b61b8 100644
--- third_party/WebKit/Source/web/WebViewImpl.cpp --- third_party/WebKit/Source/web/WebViewImpl.cpp
+++ third_party/WebKit/Source/web/WebViewImpl.cpp +++ third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -353,6 +353,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client, @@ -353,6 +353,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,

2
patch/patches/webview_plugin_2020.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 3ff9d30..5b53c44 100644 index c79a92e..e619f31 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -5158,7 +5158,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -5158,7 +5158,7 @@ Keep your key file in a safe place. You will need it to create new versions of y