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 118.0.5993.0 (#1192594)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-09-15 15:51:43 -04:00
parent 4df2933516
commit 27c6a4eabc
92 changed files with 571 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patch/patches/extensions_1947.patch
View File

@@ -60,7 +60,7 @@ index cead7cfa14bae..24142c2e4896f 100644
std::unique_ptr<StreamContainer> stream_container(
new StreamContainer(tab_id, embedded, handler_url, extension_id,
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index a1e0b689174b8..87908c22f7189 100644
index 3d2108f13ea2f..261b0a42bfb21 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -62,11 +62,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -131,10 +131,10 @@ index a1e0b689174b8..87908c22f7189 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index 9754668feabbf..0fe27053dffcd 100644
index dda0620251895..2b29bdef52444 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -61,6 +61,12 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -62,6 +62,12 @@ class ExtensionHost : public DeferredStartRenderHost,
content::SiteInstance* site_instance,
const GURL& url,
mojom::ViewType host_type);
@@ -147,16 +147,16 @@ index 9754668feabbf..0fe27053dffcd 100644
ExtensionHost(const ExtensionHost&) = delete;
ExtensionHost& operator=(const ExtensionHost&) = delete;
@@ -71,7 +77,7 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -72,7 +78,7 @@ class ExtensionHost : public DeferredStartRenderHost,
const Extension* extension() const { return extension_; }
const std::string& extension_id() const { return extension_id_; }
const ExtensionId& extension_id() const { return extension_id_; }
- content::WebContents* host_contents() const { return host_contents_.get(); }
+ content::WebContents* host_contents() const { return host_contents_; }
content::RenderFrameHost* main_frame_host() const { return main_frame_host_; }
content::RenderProcessHost* render_process_host() const;
bool has_loaded_once() const { return has_loaded_once_; }
@@ -222,7 +228,8 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -223,7 +229,8 @@ class ExtensionHost : public DeferredStartRenderHost,
raw_ptr<content::BrowserContext> browser_context_;
// The host for our HTML content.
@@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
}
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index c8b79578252a9..fbfac71f6a861 100644
index 058367b7ab78d..99a9e901566ce 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -32,6 +32,7 @@
@@ -217,7 +217,7 @@ index c8b79578252a9..fbfac71f6a861 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -263,6 +265,14 @@ class ExtensionsBrowserClient {
@@ -265,6 +267,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;
@@ -233,10 +233,10 @@ index c8b79578252a9..fbfac71f6a861 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 c9e90b66d739d..cb3e3345a6f30 100644
index 580df6d9b0ae7..39b2d5ccc074c 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -379,9 +379,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -380,9 +380,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();