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 64.0.3282.119

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-02-01 15:55:40 -05:00
parent c8368c8b13
commit 0e44127ee5
6 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patch/patches/extensions_1947.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/frame_host/render_frame_host_manager.cc content/browser/frame_host/render_frame_host_manager.cc
index 92065af1b9d4..2036db554e67 100644
index 1971727c0a8f..2babb3aca3d0 100644
--- content/browser/frame_host/render_frame_host_manager.cc
+++ content/browser/frame_host/render_frame_host_manager.cc
@@ -1083,10 +1083,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
@@ -1111,10 +1111,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.
@@ -18,7 +18,7 @@ index 92065af1b9d4..2036db554e67 100644
return true;
}
@@ -1225,7 +1226,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
@@ -1253,7 +1254,8 @@ RenderFrameHostManager::GetSiteInstanceForNavigation(
// Double-check that the new SiteInstance is associated with the right
// BrowserContext.
@@ -28,11 +28,26 @@ index 92065af1b9d4..2036db554e67 100644
// If |new_instance| is a new SiteInstance for a subframe with an isolated
// origin, set its process reuse policy so that such subframes are
@@ -1286,10 +1288,10 @@ void RenderFrameHostManager::InitializeRenderFrameIfNecessary(
if (render_frame_host != render_frame_host_.get())
return;
- EnsureRenderFrameHostVisibilityConsistent();
-
- // TODO: uncomment this when the method is shared. Not adding the call now
- // to make merge to 63 easier.
+ EnsureRenderFrameHostVisibilityConsistent();
+
+ // TODO: uncomment this when the method is shared. Not adding the call now
+ // to make merge to 63 easier.
// EnsureRenderFrameHostPageFocusConsistent();
// TODO(nasko): This is a very ugly hack. The Chrome extensions process
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index 3841f3c1c010..f2a7eb747a2a 100644
index 6b6614b9b04a..881907067740 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -350,6 +350,13 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -346,6 +346,13 @@ class CONTENT_EXPORT ContentBrowserClient {
const GURL& current_url,
const GURL& new_url);
@@ -191,10 +206,10 @@ index 69434c704f2f..f31b65fcd192 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 5a06db3d4495..b960853f02b2 100644
index 20ceb782efe3..734972c71897 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -349,9 +349,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -350,9 +350,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();