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 112.0.5615.29

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-03-18 15:18:18 +00:00
committed by Marshall Greenblatt
parent 208a5f3499
commit aad7246e7f
9 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,6 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/112.0.5615.9', 'chromium_checkout': 'refs/tags/112.0.5615.29',
'depot_tools_checkout': '424814829a' 'depot_tools_checkout': '424814829a'
} }

6
patch/patches/browser_security_policy_1081397.patch
View File

@@ -20,10 +20,10 @@ index 4dbf8a2811c9e..917b6a2e7b56f 100644
// Make an exception to allow most visited tiles to commit in // Make an exception to allow most visited tiles to commit in
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index a02a6e4a5eb91..bd5ded3609b10 100644 index 05de1c051b9c5..cc54536c2237a 100644
--- content/browser/renderer_host/navigation_request.cc --- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc
@@ -6973,10 +6973,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( @@ -7002,10 +7002,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
bool use_opaque_origin = bool use_opaque_origin =
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
network::mojom::WebSandboxFlags::kOrigin; network::mojom::WebSandboxFlags::kOrigin;
@@ -47,7 +47,7 @@ index a02a6e4a5eb91..bd5ded3609b10 100644
} }
return origin_and_debug_info; return origin_and_debug_info;
@@ -7006,6 +7018,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { @@ -7035,6 +7047,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
SandboxFlagsToCommit()); SandboxFlagsToCommit());

8
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index b91b69e736d35..4bdfa6774c43c 100644 index d04103392bf00..fe8a89a40274f 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@@ -10,7 +10,7 @@ index b91b69e736d35..4bdfa6774c43c 100644
import("//chrome/browser/buildflags.gni") import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni") import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
@@ -1980,6 +1981,7 @@ static_library("browser") { @@ -1984,6 +1985,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags", "//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags", "//build/config/compiler:compiler_buildflags",
"//cc", "//cc",
@@ -18,7 +18,7 @@ index b91b69e736d35..4bdfa6774c43c 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2548,6 +2550,10 @@ static_library("browser") { @@ -2552,6 +2554,10 @@ static_library("browser") {
] ]
} }
@@ -29,7 +29,7 @@ index b91b69e736d35..4bdfa6774c43c 100644
if (is_android) { if (is_android) {
sources += [ sources += [
"after_startup_task_utils_android.cc", "after_startup_task_utils_android.cc",
@@ -6094,8 +6100,6 @@ static_library("browser") { @@ -6100,8 +6106,6 @@ static_library("browser") {
sources += [ sources += [
"enterprise/chrome_browser_main_extra_parts_enterprise.cc", "enterprise/chrome_browser_main_extra_parts_enterprise.cc",
"enterprise/chrome_browser_main_extra_parts_enterprise.h", "enterprise/chrome_browser_main_extra_parts_enterprise.h",

36
patch/patches/chrome_browser_browser.patch
View File

@@ -70,7 +70,7 @@ index 94f900fb2e05e..2d5719c3bc936 100644
] ]
} }
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index f800d1439fd03..0eda6648fa029 100644 index 8e86697ca27ec..7d2dd1dd23c24 100644
--- chrome/browser/ui/browser.cc --- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc
@@ -263,6 +263,25 @@ @@ -263,6 +263,25 @@
@@ -177,7 +177,7 @@ index f800d1439fd03..0eda6648fa029 100644
NavigateParams nav_params(this, params.url, params.transition); NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params); nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source; nav_params.source_contents = source;
@@ -1723,6 +1781,8 @@ void Browser::LoadingStateChanged(WebContents* source, @@ -1725,6 +1783,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) { bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui); UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@@ -186,7 +186,7 @@ index f800d1439fd03..0eda6648fa029 100644
} }
void Browser::CloseContents(WebContents* source) { void Browser::CloseContents(WebContents* source) {
@@ -1750,6 +1810,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { @@ -1752,6 +1812,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
} }
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -195,7 +195,7 @@ index f800d1439fd03..0eda6648fa029 100644
if (!GetStatusBubble()) if (!GetStatusBubble())
return; return;
@@ -1757,6 +1819,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -1759,6 +1821,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url); GetStatusBubble()->SetURL(url);
} }
@@ -213,7 +213,7 @@ index f800d1439fd03..0eda6648fa029 100644
void Browser::ContentsMouseEvent(WebContents* source, void Browser::ContentsMouseEvent(WebContents* source,
bool motion, bool motion,
bool exited) { bool exited) {
@@ -1781,6 +1854,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) { @@ -1783,6 +1856,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false; return false;
} }
@@ -233,7 +233,7 @@ index f800d1439fd03..0eda6648fa029 100644
void Browser::BeforeUnloadFired(WebContents* web_contents, void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed, bool proceed,
bool* proceed_to_fire_unload) { bool* proceed_to_fire_unload) {
@@ -1873,6 +1959,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, @@ -1875,6 +1961,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager. // Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents); task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -244,7 +244,7 @@ index f800d1439fd03..0eda6648fa029 100644
} }
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1984,11 +2074,15 @@ void Browser::EnterFullscreenModeForTab( @@ -1986,11 +2076,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) { const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id); requesting_frame, options.display_id);
@@ -260,7 +260,7 @@ index f800d1439fd03..0eda6648fa029 100644
} }
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2188,6 +2282,15 @@ void Browser::RequestMediaAccessPermission( @@ -2192,6 +2286,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents, content::WebContents* web_contents,
const content::MediaStreamRequest& request, const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) { content::MediaResponseCallback callback) {
@@ -276,7 +276,7 @@ index f800d1439fd03..0eda6648fa029 100644
const extensions::Extension* extension = const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin); GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2728,13 +2831,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { @@ -2732,13 +2835,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private): // Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() { StatusBubble* Browser::GetStatusBubble() {
@@ -298,7 +298,7 @@ index f800d1439fd03..0eda6648fa029 100644
return window_ ? window_->GetStatusBubble() : nullptr; return window_ ? window_->GetStatusBubble() : nullptr;
} }
@@ -2868,6 +2978,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { @@ -2872,6 +2982,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents); web_contents_collection_.StopObserving(web_contents);
} }
@@ -308,7 +308,7 @@ index f800d1439fd03..0eda6648fa029 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents, void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 486cff37b13ac..21a3a39f49247 100644 index b8c8af5f2bace..6a0bbc591ab78 100644
--- chrome/browser/ui/browser.h --- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@@ -319,7 +319,7 @@ index 486cff37b13ac..21a3a39f49247 100644
#include "chrome/browser/tab_contents/web_contents_collection.h" #include "chrome/browser/tab_contents/web_contents_collection.h"
#include "chrome/browser/themes/theme_service_observer.h" #include "chrome/browser/themes/theme_service_observer.h"
#include "chrome/browser/ui/bookmarks/bookmark_bar.h" #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
@@ -48,6 +49,10 @@ @@ -49,6 +50,10 @@
#include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect.h"
#include "ui/shell_dialogs/select_file_dialog.h" #include "ui/shell_dialogs/select_file_dialog.h"
@@ -330,7 +330,7 @@ index 486cff37b13ac..21a3a39f49247 100644
#if BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_ANDROID)
#error This file should only be included on desktop. #error This file should only be included on desktop.
#endif #endif
@@ -323,6 +328,11 @@ class Browser : public TabStripModelObserver, @@ -324,6 +329,11 @@ class Browser : public TabStripModelObserver,
double initial_aspect_ratio = 1.0; double initial_aspect_ratio = 1.0;
bool lock_aspect_ratio = false; bool lock_aspect_ratio = false;
@@ -342,7 +342,7 @@ index 486cff37b13ac..21a3a39f49247 100644
private: private:
friend class Browser; friend class Browser;
friend class WindowSizerChromeOSTest; friend class WindowSizerChromeOSTest;
@@ -398,6 +408,13 @@ class Browser : public TabStripModelObserver, @@ -399,6 +409,13 @@ class Browser : public TabStripModelObserver,
force_skip_warning_user_on_close_ = force_skip_warning_user_on_close; force_skip_warning_user_on_close_ = force_skip_warning_user_on_close;
} }
@@ -356,7 +356,7 @@ index 486cff37b13ac..21a3a39f49247 100644
// Accessors //////////////////////////////////////////////////////////////// // Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; } const CreateParams& create_params() const { return create_params_; }
@@ -471,6 +488,12 @@ class Browser : public TabStripModelObserver, @@ -472,6 +489,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr(); base::WeakPtr<Browser> AsWeakPtr();
@@ -369,7 +369,7 @@ index 486cff37b13ac..21a3a39f49247 100644
// Get the FindBarController for this browser, creating it if it does not // Get the FindBarController for this browser, creating it if it does not
// yet exist. // yet exist.
FindBarController* GetFindBarController(); FindBarController* GetFindBarController();
@@ -847,11 +870,19 @@ class Browser : public TabStripModelObserver, @@ -848,11 +871,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source, void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override; const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override; void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -389,7 +389,7 @@ index 486cff37b13ac..21a3a39f49247 100644
void BeforeUnloadFired(content::WebContents* source, void BeforeUnloadFired(content::WebContents* source,
bool proceed, bool proceed,
bool* proceed_to_fire_unload) override; bool* proceed_to_fire_unload) override;
@@ -1255,6 +1286,8 @@ class Browser : public TabStripModelObserver, @@ -1256,6 +1287,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_; const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_; bool initial_visible_on_all_workspaces_state_;
@@ -398,7 +398,7 @@ index 486cff37b13ac..21a3a39f49247 100644
CreationSource creation_source_ = CreationSource::kUnknown; CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_; UnloadController unload_controller_;
@@ -1319,6 +1352,10 @@ class Browser : public TabStripModelObserver, @@ -1320,6 +1353,10 @@ class Browser : public TabStripModelObserver,
extension_browser_window_helper_; extension_browser_window_helper_;
#endif #endif

8
patch/patches/chrome_browser_context_menus.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index e0d7724c3a341..40a25b08152a5 100644 index a56e3f1fb8e08..d1b230cd66c63 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc --- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -315,6 +315,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() { @@ -315,6 +315,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -55,7 +55,7 @@ index e0d7724c3a341..40a25b08152a5 100644
} }
Profile* RenderViewContextMenu::GetProfile() const { Profile* RenderViewContextMenu::GetProfile() const {
@@ -3130,6 +3155,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( @@ -3128,6 +3153,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb); execute_plugin_action_callback_ = std::move(cb);
} }
@@ -69,7 +69,7 @@ index e0d7724c3a341..40a25b08152a5 100644
RenderViewContextMenu::GetHandlersForLinkUrl() { RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers = custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index 19678cd892b6e..1e65a38e4cc69 100644 index dfafe093f5ec6..8af3aff4f8958 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h --- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h +++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -139,6 +139,12 @@ class RenderViewContextMenu @@ -139,6 +139,12 @@ class RenderViewContextMenu
@@ -85,7 +85,7 @@ index 19678cd892b6e..1e65a38e4cc69 100644
protected: protected:
Profile* GetProfile() const; Profile* GetProfile() const;
@@ -389,6 +395,9 @@ class RenderViewContextMenu @@ -384,6 +390,9 @@ class RenderViewContextMenu
// built. // built.
bool is_protocol_submenu_valid_ = false; bool is_protocol_submenu_valid_ = false;

6
patch/patches/chrome_runtime.patch
View File

@@ -337,7 +337,7 @@ index 7ecb90a89f1d7..c80ce831382db 100644
#endif #endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index ff57c231cc784..59ac71c36caa0 100644 index 3b9ce2a93d09d..049fd4e069aab 100644
--- chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@@ -359,7 +359,7 @@ index ff57c231cc784..59ac71c36caa0 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1305,6 +1310,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { @@ -1306,6 +1311,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// This is intentionally last. // This is intentionally last.
RegisterLocalStatePrefsForMigration(registry); RegisterLocalStatePrefsForMigration(registry);
@@ -371,7 +371,7 @@ index ff57c231cc784..59ac71c36caa0 100644
} }
// Register prefs applicable to all profiles. // Register prefs applicable to all profiles.
@@ -1704,6 +1714,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -1705,6 +1715,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) { const std::string& locale) {
RegisterProfilePrefs(registry, locale); RegisterProfilePrefs(registry, locale);

4
patch/patches/print_preview_123.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
index 6fe1ebe84e584..2500dac50ffe3 100644 index 4b7fcf619a55d..139fd5b4a2bd0 100644
--- chrome/browser/download/download_prefs.cc --- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@@ -21,7 +21,7 @@ index 6fe1ebe84e584..2500dac50ffe3 100644
using content::BrowserContext; using content::BrowserContext;
using content::BrowserThread; using content::BrowserThread;
using content::DownloadManager; using content::DownloadManager;
@@ -355,6 +360,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager( @@ -358,6 +363,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
// static // static
DownloadPrefs* DownloadPrefs::FromBrowserContext( DownloadPrefs* DownloadPrefs::FromBrowserContext(
content::BrowserContext* context) { content::BrowserContext* context) {

2
patch/patches/services_network_2718.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index c0a0fa84be58e..59543775a9c5b 100644 index e4c4ecda89e71..03b48a6e4c091 100644
--- content/browser/storage_partition_impl.cc --- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc
@@ -494,10 +494,6 @@ class LoginHandlerDelegate { @@ -494,10 +494,6 @@ class LoginHandlerDelegate {

18
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index 39e8934e0d54b..bbc9d78392973 100644 index b04b88882583c..845ed246b53e3 100644
--- content/browser/web_contents/web_contents_impl.cc --- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc
@@ -3175,6 +3175,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3165,6 +3165,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy, params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create()); base::UnguessableToken::Create());
@@ -15,7 +15,7 @@ index 39e8934e0d54b..bbc9d78392973 100644
std::unique_ptr<WebContentsViewDelegate> delegate = std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3185,6 +3191,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -3175,6 +3181,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate), view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_); &render_view_host_delegate_view_);
} }
@@ -23,7 +23,7 @@ index 39e8934e0d54b..bbc9d78392973 100644
CHECK(render_view_host_delegate_view_); CHECK(render_view_host_delegate_view_);
CHECK(view_.get()); CHECK(view_.get());
@@ -3365,6 +3372,9 @@ void WebContentsImpl::RenderWidgetCreated( @@ -3355,6 +3362,9 @@ void WebContentsImpl::RenderWidgetCreated(
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated", OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
"render_widget_host", render_widget_host); "render_widget_host", render_widget_host);
created_widgets_.insert(render_widget_host); created_widgets_.insert(render_widget_host);
@@ -33,7 +33,7 @@ index 39e8934e0d54b..bbc9d78392973 100644
} }
void WebContentsImpl::RenderWidgetDeleted( void WebContentsImpl::RenderWidgetDeleted(
@@ -4096,6 +4106,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( @@ -4086,6 +4096,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
create_params.picture_in_picture_options = *(params.pip_options); create_params.picture_in_picture_options = *(params.pip_options);
} }
@@ -49,7 +49,7 @@ index 39e8934e0d54b..bbc9d78392973 100644
// Check whether there is an available prerendered page for this navigation if // 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 // this is not for guest. If it exists, take WebContents pre-created for
// hosting the prerendered page instead of creating new WebContents. // hosting the prerendered page instead of creating new WebContents.
@@ -7999,6 +8018,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -7991,6 +8010,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames). // frames).
SetFocusedFrameTree(&node->frame_tree()); SetFocusedFrameTree(&node->frame_tree());
} }
@@ -88,10 +88,10 @@ index 5644b0efa9a3e..da63511c87213 100644
// the value that'll be returned by GetLastActiveTime(). If this is left // the value that'll be returned by GetLastActiveTime(). If this is left
// default initialized then the value is not passed on to the WebContents // 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 diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h
index b7325f818a264..d37cb4da81eb6 100644 index 5da6f93293bc5..349ae25c0af08 100644
--- content/public/browser/web_contents_delegate.h --- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h
@@ -58,9 +58,11 @@ class EyeDropperListener; @@ -59,9 +59,11 @@ class EyeDropperListener;
class FileSelectListener; class FileSelectListener;
class JavaScriptDialogManager; class JavaScriptDialogManager;
class RenderFrameHost; class RenderFrameHost;
@@ -103,7 +103,7 @@ index b7325f818a264..d37cb4da81eb6 100644
struct ContextMenuParams; struct ContextMenuParams;
struct DropData; struct DropData;
struct MediaPlayerWatchTime; struct MediaPlayerWatchTime;
@@ -342,6 +344,14 @@ class CONTENT_EXPORT WebContentsDelegate { @@ -343,6 +345,14 @@ class CONTENT_EXPORT WebContentsDelegate {
const StoragePartitionConfig& partition_config, const StoragePartitionConfig& partition_config,
SessionStorageNamespace* session_storage_namespace); SessionStorageNamespace* session_storage_namespace);