mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 121.0.6167.0 (#1233107)
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 eab88872f0cee..de1775aa46b7d 100644
|
||||
index be3b154fa5155..9887b0e3d0419 100644
|
||||
--- content/browser/web_contents/web_contents_impl.cc
|
||||
+++ content/browser/web_contents/web_contents_impl.cc
|
||||
@@ -3448,6 +3448,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3450,6 +3450,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 eab88872f0cee..de1775aa46b7d 100644
|
||||
std::unique_ptr<WebContentsViewDelegate> delegate =
|
||||
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
|
||||
|
||||
@@ -3458,6 +3464,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
@@ -3460,6 +3466,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
|
||||
view_ = CreateWebContentsView(this, std::move(delegate),
|
||||
&render_view_host_delegate_view_);
|
||||
}
|
||||
@@ -23,7 +23,7 @@ index eab88872f0cee..de1775aa46b7d 100644
|
||||
CHECK(render_view_host_delegate_view_);
|
||||
CHECK(view_.get());
|
||||
|
||||
@@ -3653,6 +3660,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||
@@ -3655,6 +3662,9 @@ void WebContentsImpl::RenderWidgetCreated(
|
||||
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
|
||||
"render_widget_host", render_widget_host);
|
||||
created_widgets_.insert(render_widget_host);
|
||||
@@ -33,18 +33,7 @@ index eab88872f0cee..de1775aa46b7d 100644
|
||||
}
|
||||
|
||||
void WebContentsImpl::RenderWidgetDeleted(
|
||||
@@ -3984,6 +3994,10 @@ void WebContentsImpl::Restore() {
|
||||
ui::WindowShowState WebContentsImpl::GetWindowShowState() {
|
||||
#if defined(USE_AURA)
|
||||
aura::Window* window = GetTopLevelNativeWindow();
|
||||
+ if (!window) {
|
||||
+ // |window| will be nullptr with CEF windowless rendering.
|
||||
+ return ui::SHOW_STATE_DEFAULT;
|
||||
+ }
|
||||
return wm::GetWindowState(window);
|
||||
#else
|
||||
// TODO(laurila, crbug.com/1466855): This API function currently works only on
|
||||
@@ -4451,6 +4465,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
@@ -4455,6 +4465,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
|
||||
create_params.picture_in_picture_options = *(params.pip_options);
|
||||
}
|
||||
|
||||
@@ -60,7 +49,7 @@ index eab88872f0cee..de1775aa46b7d 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.
|
||||
@@ -8599,6 +8622,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
@@ -8613,6 +8632,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
|
||||
}
|
||||
|
||||
CloseListenerManager::DidChangeFocusedFrame(this);
|
||||
@@ -71,10 +60,10 @@ index eab88872f0cee..de1775aa46b7d 100644
|
||||
|
||||
void WebContentsImpl::DidCallFocus() {
|
||||
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
|
||||
index 3707858d0af59..58f794f35608a 100644
|
||||
index 668d0802d8d9f..8fc7836524f42 100644
|
||||
--- content/public/browser/web_contents.h
|
||||
+++ content/public/browser/web_contents.h
|
||||
@@ -98,10 +98,12 @@ class BrowserContext;
|
||||
@@ -99,10 +99,12 @@ class BrowserContext;
|
||||
class BrowserPluginGuestDelegate;
|
||||
class RenderFrameHost;
|
||||
class RenderViewHost;
|
||||
@@ -87,7 +76,7 @@ index 3707858d0af59..58f794f35608a 100644
|
||||
class WebUI;
|
||||
struct DropData;
|
||||
struct MHTMLGenerationParams;
|
||||
@@ -244,6 +246,10 @@ class WebContents : public PageNavigator,
|
||||
@@ -249,6 +251,10 @@ class WebContents : public PageNavigator,
|
||||
network::mojom::WebSandboxFlags starting_sandbox_flags =
|
||||
network::mojom::WebSandboxFlags::kNone;
|
||||
|
||||
@@ -99,10 +88,10 @@ index 3707858d0af59..58f794f35608a 100644
|
||||
// the value that'll be returned by GetLastActiveTime(). If this is left
|
||||
// default initialized then the value is not passed on to the WebContents
|
||||
diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
|
||||
index a3da78805b9bc..982e63aee498b 100644
|
||||
index 4b32bf8ccc4ed..a0c43926070aa 100644
|
||||
--- content/public/browser/web_contents_delegate.h
|
||||
+++ content/public/browser/web_contents_delegate.h
|
||||
@@ -59,9 +59,11 @@ class EyeDropperListener;
|
||||
@@ -60,9 +60,11 @@ class EyeDropperListener;
|
||||
class FileSelectListener;
|
||||
class JavaScriptDialogManager;
|
||||
class RenderFrameHost;
|
||||
@@ -114,7 +103,7 @@ index a3da78805b9bc..982e63aee498b 100644
|
||||
struct ContextMenuParams;
|
||||
struct DropData;
|
||||
struct MediaPlayerWatchTime;
|
||||
@@ -344,6 +346,14 @@ class CONTENT_EXPORT WebContentsDelegate {
|
||||
@@ -345,6 +347,14 @@ class CONTENT_EXPORT WebContentsDelegate {
|
||||
const StoragePartitionConfig& partition_config,
|
||||
SessionStorageNamespace* session_storage_namespace);
|
||||
|
||||
@@ -130,7 +119,7 @@ index a3da78805b9bc..982e63aee498b 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 617b5a5609796..195d9026909a6 100644
|
||||
index a3b5e3b1ad2df..c85cb62b01cc2 100644
|
||||
--- content/public/browser/web_contents_observer.h
|
||||
+++ content/public/browser/web_contents_observer.h
|
||||
@@ -225,6 +225,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {
|
||||
@@ -143,7 +132,7 @@ index 617b5a5609796..195d9026909a6 100644
|
||||
// This method is invoked when the `blink::WebView` of the current
|
||||
// RenderViewHost is ready, e.g. because we recreated it after a crash.
|
||||
virtual void RenderViewReady() {}
|
||||
@@ -836,6 +839,10 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {
|
||||
@@ -840,6 +843,10 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {
|
||||
// WebContents has gained/lost focus.
|
||||
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}
|
||||
|
||||
|
Reference in New Issue
Block a user