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.78

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-07-28 22:24:49 -04:00
parent d5392b33ef
commit 0dba8a1f29
13 changed files with 70 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
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
index 7f4a8b0..f6a2840 100644
index 1dd2465..5e77e8c 100644
--- 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) {
@@ -23,7 +23,7 @@ index 7f4a8b0..f6a2840 100644
if (browser_plugin_guest_ && !GuestMode::IsCrossProcessFrameGuest(this)) {
view_.reset(new WebContentsViewGuest(this, browser_plugin_guest_.get(),
@@ -2259,6 +2266,15 @@ void WebContentsImpl::CreateNewWindow(
@@ -2255,6 +2262,15 @@ void WebContentsImpl::CreateNewWindow(
create_params.renderer_initiated_creation =
main_frame_route_id != MSG_ROUTING_NONE;
@@ -39,7 +39,7 @@ index 7f4a8b0..f6a2840 100644
WebContentsImpl* new_contents = NULL;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -2288,7 +2304,7 @@ void WebContentsImpl::CreateNewWindow(
@@ -2284,7 +2300,7 @@ void WebContentsImpl::CreateNewWindow(
// TODO(brettw): It seems bogus that we have to call this function on the
// newly created object and give it one of its own member variables.
new_view->CreateViewForWidget(
@@ -48,7 +48,7 @@ index 7f4a8b0..f6a2840 100644
}
// Save the created window associated with the route so we can show it
// later.
@@ -5204,7 +5220,7 @@ NavigationEntry*
@@ -5210,7 +5226,7 @@ InterstitialPageImpl* WebContentsImpl::GetInterstitialForRenderManager() {
void WebContentsImpl::CreateRenderWidgetHostViewForRenderManager(
RenderViewHost* render_view_host) {
RenderWidgetHostViewBase* rwh_view =
@@ -73,7 +73,7 @@ index fa0afb5..d677b31 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index ebd18a0..549329f 100644
index 930880c..41ba462 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -67,9 +67,11 @@ class PageState;