mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 119.0.6045.0 (#1204232)
Mac: 13.5+ build system w/ 14.0 base SDK (Xcode 15.0) is now required.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
|
||||
index 6f1581c517bf6..5c4004b963ef6 100644
|
||||
index 355f0d796d3c6..d8c047d6173e3 100644
|
||||
--- content/browser/web_contents/web_contents_impl.cc
|
||||
+++ content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3324,6 +3324,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3348,6 +3348,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
params.main_frame_name, GetOpener(), primary_main_frame_policy,
|
||||
base::UnguessableToken::Create());
|
||||
|
||||
@@ -15,7 +15,7 @@ index 6f1581c517bf6..5c4004b963ef6 100644
|
||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||
|
||||
@@ -3334,6 +3340,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3358,6 +3364,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||
&render_view_host_delegate_view_);
|
||||
}
|
||||
@@ -23,7 +23,7 @@ index 6f1581c517bf6..5c4004b963ef6 100644
|
||||
CHECK(render_view_host_delegate_view_);
|
||||
CHECK(view_.get());
|
||||
|
||||
@@ -3523,6 +3530,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||
@@ -3548,6 +3555,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
|
||||
"render_widget_host", render_widget_host);
|
||||
created_widgets_.insert(render_widget_host);
|
||||
@@ -33,7 +33,18 @@ index 6f1581c517bf6..5c4004b963ef6 100644
|
||||
}
|
||||
|
||||
void WebContentsImpl::RenderWidgetDeleted(
|
||||
@@ -4279,6 +4289,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
@@ -3868,6 +3878,10 @@ void WebContentsImpl::SetWindowShowState(ui::WindowShowState state) {
|
||||
|
||||
ui::WindowShowState WebContentsImpl::GetWindowShowState() {
|
||||
aura::Window* window = GetTopLevelNativeWindow();
|
||||
+ if (!window) {
|
||||
+ // |window| will be nullptr with CEF windowless rendering.
|
||||
+ return ui::SHOW_STATE_DEFAULT;
|
||||
+ }
|
||||
return wm::GetWindowState(window);
|
||||
}
|
||||
#endif
|
||||
@@ -4335,6 +4349,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
create_params.picture_in_picture_options = *(params.pip_options);
|
||||
}
|
||||
|
||||
@@ -49,7 +60,7 @@ index 6f1581c517bf6..5c4004b963ef6 100644
|
||||
// Check whether there is an available prerendered page for this navigation if
|
||||
// this is not for guest. If it exists, take WebContents pre-created for
|
||||
// hosting the prerendered page instead of creating new WebContents.
|
||||
@@ -8286,6 +8305,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
@@ -8342,6 +8365,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
}
|
||||
|
||||
CloseListenerManager::DidChangeFocusedFrame(this);
|
||||
@@ -60,7 +71,7 @@ index 6f1581c517bf6..5c4004b963ef6 100644
|
||||
|
||||
void WebContentsImpl::DidCallFocus() {
|
||||
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
|
||||
index f02cd75e7ad4c..8a3761e505d2d 100644
|
||||
index d3d0b0aab60e9..79938331d05f1 100644
|
||||
--- content/public/browser/web_contents.h
|
||||
+++ content/public/browser/web_contents.h
|
||||
@@ -98,10 +98,12 @@ class BrowserContext;
|
||||
|
Reference in New Issue
Block a user