Update to Chromium version 96.0.4664.0 (#929512)

This commit is contained in:
Marshall Greenblatt
2021-10-18 18:17:16 -04:00
parent 4dd314dec3
commit 6872dadd74
103 changed files with 897 additions and 675 deletions

View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 55a636ca71a25..41dcccd02b4fa 100644
index e7e2e3d3163bb..e12381457f0bb 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2881,6 +2881,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2899,6 +2899,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
frame_tree_.Init(site_instance.get(), params.renderer_initiated_creation,
params.main_frame_name);
@@ -15,7 +15,7 @@ index 55a636ca71a25..41dcccd02b4fa 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2891,6 +2897,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2909,6 +2915,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
view_.reset(CreateWebContentsView(this, delegate,
&render_view_host_delegate_view_));
}
@@ -23,7 +23,7 @@ index 55a636ca71a25..41dcccd02b4fa 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3713,6 +3720,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -3739,6 +3746,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@@ -39,7 +39,7 @@ index 55a636ca71a25..41dcccd02b4fa 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -7500,6 +7516,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -7526,6 +7542,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary();
}
@@ -50,22 +50,22 @@ index 55a636ca71a25..41dcccd02b4fa 100644
void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc
index e40e14fd4913f..2ca3b08277e3d 100644
index c7302d7af6d8b..d19be54f36d39 100644
--- content/public/browser/web_contents.cc
+++ content/public/browser/web_contents.cc
@@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
@@ -31,6 +31,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
renderer_initiated_creation(false),
desired_renderer_state(kOkayToHaveRendererProcess),
starting_sandbox_flags(network::mojom::WebSandboxFlags::kNone),
+ delegate_view(nullptr),
is_never_visible(false) {}
is_never_visible(false),
creator_location(creator_location) {}
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index aa3ecdb440db8..bedc9eee352f0 100644
index bfa0e468e11e6..31061d5821e60 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -86,10 +86,12 @@ class BrowserContext;
@@ -88,10 +88,12 @@ class BrowserContext;
class BrowserPluginGuestDelegate;
class RenderFrameHost;
class RenderViewHost;
@@ -78,7 +78,7 @@ index aa3ecdb440db8..bedc9eee352f0 100644
class WebUI;
struct DropData;
struct MHTMLGenerationParams;
@@ -222,6 +224,10 @@ class WebContents : public PageNavigator,
@@ -228,6 +230,10 @@ class WebContents : public PageNavigator,
// Sandboxing flags set on the new WebContents.
network::mojom::WebSandboxFlags starting_sandbox_flags;
@@ -122,10 +122,10 @@ index a0da74d5cbe4a..1d6e4673a610f 100644
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index d6f20a6c8d283..8cd985c25196b 100644
index 6921e5e094cfd..cb199b2d405d6 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -705,6 +705,10 @@ class CONTENT_EXPORT WebContentsObserver {
@@ -727,6 +727,10 @@ class CONTENT_EXPORT WebContentsObserver {
// WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}