Update to Chromium version 105.0.5176.0 (#1023155)

This commit is contained in:
Marshall Greenblatt
2022-07-21 13:26:10 -04:00
parent 5e753d211f
commit e9f29ab3d6
92 changed files with 615 additions and 700 deletions

View File

@@ -60,11 +60,11 @@ index 2f5f7a7645103..9ab6fc1d4a654 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 70279e6b632ad..7d6b662e51957 100644
index 04b9beb8c3fc2..7e4d3e31522c0 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -58,11 +58,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
DCHECK(host_type == mojom::ViewType::kExtensionBackgroundPage ||
@@ -59,11 +59,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
host_type == mojom::ViewType::kOffscreenDocument ||
host_type == mojom::ViewType::kExtensionDialog ||
host_type == mojom::ViewType::kExtensionPopup);
- host_contents_ = WebContents::Create(
@@ -79,7 +79,7 @@ index 70279e6b632ad..7d6b662e51957 100644
main_frame_host_ = host_contents_->GetPrimaryMainFrame();
// Listen for when an extension is unloaded from the same profile, as it may
@@ -77,6 +78,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -78,6 +79,44 @@ ExtensionHost::ExtensionHost(const Extension* extension,
ExtensionHostRegistry::Get(browser_context_)->ExtensionHostCreated(this);
}
@@ -108,7 +108,7 @@ index 70279e6b632ad..7d6b662e51957 100644
+ content::WebContentsObserver::Observe(host_contents_);
+ SetViewType(host_contents_, host_type);
+
+ main_frame_host_ = host_contents_->GetMainFrame();
+ main_frame_host_ = host_contents_->GetPrimaryMainFrame();
+
+ // Listen for when an extension is unloaded from the same profile, as it may
+ // be the same extension that this points to.
@@ -125,10 +125,10 @@ index 70279e6b632ad..7d6b662e51957 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index dd22bbc07fb52..c695ece6b1a47 100644
index 35f6735afb66a..40401322681cf 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -53,6 +53,12 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -56,6 +56,12 @@ class ExtensionHost : public DeferredStartRenderHost,
content::SiteInstance* site_instance,
const GURL& url,
mojom::ViewType host_type);
@@ -141,7 +141,7 @@ index dd22bbc07fb52..c695ece6b1a47 100644
ExtensionHost(const ExtensionHost&) = delete;
ExtensionHost& operator=(const ExtensionHost&) = delete;
@@ -63,7 +69,7 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -66,7 +72,7 @@ class ExtensionHost : public DeferredStartRenderHost,
const Extension* extension() const { return extension_; }
const std::string& extension_id() const { return extension_id_; }
@@ -150,7 +150,7 @@ index dd22bbc07fb52..c695ece6b1a47 100644
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_; }
@@ -188,7 +194,8 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -202,7 +208,8 @@ class ExtensionHost : public DeferredStartRenderHost,
raw_ptr<content::BrowserContext> browser_context_;
// The host for our HTML content.
@@ -161,7 +161,7 @@ index dd22bbc07fb52..c695ece6b1a47 100644
// A pointer to the current or speculative main frame in `host_contents_`. We
// can't access this frame through the `host_contents_` directly as it does
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index f87cf6d3bb4b6..bd2f3b576b004 100644
index b060c134279ed..070258e8fbc08 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -31,6 +31,7 @@
@@ -180,7 +180,7 @@ index f87cf6d3bb4b6..bd2f3b576b004 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -219,6 +221,14 @@ class ExtensionsBrowserClient {
@@ -220,6 +222,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;
@@ -196,10 +196,10 @@ index f87cf6d3bb4b6..bd2f3b576b004 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 4d09fbd93cd97..e6bc21a1adf49 100644
index edf33b204d669..694bff911b4b9 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -393,9 +393,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
@@ -379,9 +379,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,
return true; // TODO(kalman): return false here? It might break things...
DVLOG(1) << "CreateBackgroundHost " << extension->id();
@@ -215,6 +215,6 @@ index 4d09fbd93cd97..e6bc21a1adf49 100644
new ExtensionHost(extension, GetSiteInstanceForURL(url).get(), url,
mojom::ViewType::kExtensionBackgroundPage);
+ }
host->CreateRendererSoon();
OnBackgroundHostCreated(host);
return true;
host->SetCloseHandler(
base::BindOnce(&ProcessManager::HandleCloseExtensionHost,
weak_ptr_factory_.GetWeakPtr()));