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 69.0.3476.0 (#571360)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-07-02 13:11:49 -04:00
parent 669e8673ce
commit 2d48a07bec
47 changed files with 546 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patch/patches/extensions_1947.patch
View File

@@ -27,10 +27,10 @@ index 53c7404ef1f9..ac33df7cfe0e 100644
auto* browser_context = web_contents->GetBrowserContext();
StreamsPrivateAPI* streams_private = GetStreamsPrivateAPI(browser_context);
diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
index f57d8ead39af..201b60891caf 100644
index 79f407b8cb20..fe4c65b5d0a5 100644
--- content/browser/frame_host/render_frame_host_manager.cc
+++ content/browser/frame_host/render_frame_host_manager.cc
@@ -917,10 +917,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
@@ -927,10 +927,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
// TODO(alexmos): This check should've been enforced earlier in the
// navigation, in chrome::Navigate(). Verify this, and then convert this to
// a CHECK and remove the fallback.
@@ -46,7 +46,7 @@ index f57d8ead39af..201b60891caf 100644
return true;
}
@@ -1061,7 +1062,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
@@ -1069,7 +1070,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
// Double-check that the new SiteInstance is associated with the right
// BrowserContext.
@@ -57,10 +57,10 @@ index f57d8ead39af..201b60891caf 100644
// If |new_instance| is a new SiteInstance for a subframe that requires a
// dedicated process, set its process reuse policy so that such subframes are
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 062add3424de..b2b4a46193df 100644
index 9ada95562d77..e0ebf0289097 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -376,6 +376,13 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -382,6 +382,13 @@ class CONTENT_EXPORT ContentBrowserClient {
// Returns true if error page should be isolated in its own process.
virtual bool ShouldIsolateErrorPage(bool in_main_frame);
@@ -75,10 +75,10 @@ index 062add3424de..b2b4a46193df 100644
// current SiteInstance, if it does not yet have a site.
virtual bool ShouldAssignSiteForURL(const GURL& url);
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 8017d648301b..a0dbd923c64d 100644
index b1bd45860305..5169b816f185 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -68,11 +68,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -67,11 +67,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
DCHECK(host_type == VIEW_TYPE_EXTENSION_BACKGROUND_PAGE ||
host_type == VIEW_TYPE_EXTENSION_DIALOG ||
host_type == VIEW_TYPE_EXTENSION_POPUP);
@@ -95,7 +95,7 @@ index 8017d648301b..a0dbd923c64d 100644
render_view_host_ = host_contents_->GetRenderViewHost();
@@ -87,6 +88,48 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -86,6 +87,48 @@ ExtensionHost::ExtensionHost(const Extension* extension,
dispatcher()->set_delegate(this);
}
@@ -219,10 +219,10 @@ index 9e8ebb1a4d59..b42e88b11f6a 100644
// once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index 73a77af25cfc..27d940d5b46c 100644
index 1f8c4ed09d60..933019a7a483 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -350,9 +350,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -353,9 +353,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();