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 68.0.3416.0 (#554961)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-05-18 13:45:18 +03:00
parent 240ba800ed
commit a9f0fa9dfe
41 changed files with 322 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patch/patches/extensions_1947.patch
View File

@@ -27,7 +27,7 @@ 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 b6fb23189522..ccbf05206387 100644
index d7875ac0c044..d369de7e33f1 100644
--- content/browser/frame_host/render_frame_host_manager.cc
+++ content/browser/frame_host/render_frame_host_manager.cc
@@ -903,10 +903,11 @@ bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
@@ -57,7 +57,7 @@ index b6fb23189522..ccbf05206387 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 c8dcbf0f6daa..19c162f0c76a 100644
index 0a347624dcc5..46a2398b567f 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -366,6 +366,13 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -75,18 +75,18 @@ index c8dcbf0f6daa..19c162f0c76a 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 a5a821840124..a2a8a0d63272 100644
index 294243d2e7de..867bbf9ac3a2 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -68,11 +68,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);
- host_contents_.reset(WebContents::Create(
- WebContents::CreateParams(browser_context_, site_instance))),
- host_contents_ = WebContents::Create(
- WebContents::CreateParams(browser_context_, site_instance)),
- content::WebContentsObserver::Observe(host_contents_.get());
+ host_contents_owned_.reset(WebContents::Create(
+ WebContents::CreateParams(browser_context_, site_instance)));
+ host_contents_owned_ = WebContents::Create(
+ WebContents::CreateParams(browser_context_, site_instance));
+ host_contents_ = host_contents_owned_.get();
+ content::WebContentsObserver::Observe(host_contents_);
host_contents_->SetDelegate(this);
@@ -145,7 +145,7 @@ index a5a821840124..a2a8a0d63272 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index c93e3a48c7ee..ff6e2dbbca56 100644
index 8c7a96fdc179..6462365b24f2 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -51,13 +51,19 @@ class ExtensionHost : public DeferredStartRenderHost,