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 91.0.4472.19

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-04-23 17:52:43 -04:00
parent ae4f68f695
commit fef384b1fc
72 changed files with 320 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,6 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/91.0.4472.0' 'chromium_checkout': 'refs/tags/91.0.4472.19',
'depot_tools_checkout': '61bf6e8d69'
} }

6
patch/patches/base_sandbox_2743.patch
View File

@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn diff --git base/BUILD.gn base/BUILD.gn
index f9e098611a176..f956745c27fbe 100644 index f9e098611a17..f956745c27fb 100644
--- base/BUILD.gn --- base/BUILD.gn
+++ base/BUILD.gn +++ base/BUILD.gn
@@ -34,6 +34,7 @@ import("//build/config/ui.gni") @@ -34,6 +34,7 @@ import("//build/config/ui.gni")
@@ -37,7 +37,7 @@ index f9e098611a176..f956745c27fbe 100644
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
diff --git base/hash/md5.h base/hash/md5.h diff --git base/hash/md5.h base/hash/md5.h
index 8a49f08dcb04d..2f03d7a6d1b34 100644 index 8a49f08dcb04..2f03d7a6d1b3 100644
--- base/hash/md5.h --- base/hash/md5.h
+++ base/hash/md5.h +++ base/hash/md5.h
@@ -10,8 +10,9 @@ @@ -10,8 +10,9 @@
@@ -52,7 +52,7 @@ index 8a49f08dcb04d..2f03d7a6d1b34 100644
#else #else
#include "base/hash/md5_boringssl.h" #include "base/hash/md5_boringssl.h"
diff --git base/hash/sha1.h base/hash/sha1.h diff --git base/hash/sha1.h base/hash/sha1.h
index 5bb10fe069850..206344d0fd3b1 100644 index 5bb10fe06985..206344d0fd3b 100644
--- base/hash/sha1.h --- base/hash/sha1.h
+++ base/hash/sha1.h +++ base/hash/sha1.h
@@ -14,7 +14,9 @@ @@ -14,7 +14,9 @@

2
patch/patches/base_string_piece_1049498.patch
View File

@@ -1,5 +1,5 @@
diff --git base/strings/string_piece.h base/strings/string_piece.h diff --git base/strings/string_piece.h base/strings/string_piece.h
index f4f37ad5242b2..ddb9b3fd87474 100644 index f4f37ad5242b..ddb9b3fd8747 100644
--- base/strings/string_piece.h --- base/strings/string_piece.h
+++ base/strings/string_piece.h +++ base/strings/string_piece.h
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@

2
patch/patches/browser_scheduler.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
index 82801d316d76c..4616c1caf4934 100644 index 82801d316d76..4616c1caf493 100644
--- content/browser/scheduler/browser_task_executor.cc --- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc +++ content/browser/scheduler/browser_task_executor.cc
@@ -240,7 +240,7 @@ void BrowserTaskExecutor::PostFeatureListSetup() { @@ -240,7 +240,7 @@ void BrowserTaskExecutor::PostFeatureListSetup() {

6
patch/patches/browser_security_policy_1081397.patch
View File

@@ -1,8 +1,8 @@
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
index efb7c635e6885..cbbf37a092441 100644 index 51b159f1ab77..df64ef6cfa7e 100644
--- content/browser/child_process_security_policy_impl.cc --- content/browser/child_process_security_policy_impl.cc
+++ content/browser/child_process_security_policy_impl.cc +++ content/browser/child_process_security_policy_impl.cc
@@ -1728,6 +1728,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin( @@ -1719,6 +1719,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForOrigin(
// DeclarativeApiTest.PersistRules. // DeclarativeApiTest.PersistRules.
if (actual_process_lock.matches_scheme(url::kDataScheme)) if (actual_process_lock.matches_scheme(url::kDataScheme))
return true; return true;
@@ -20,7 +20,7 @@ index efb7c635e6885..cbbf37a092441 100644
// TODO(wjmaclean): We should update the ProcessLock comparison API // TODO(wjmaclean): We should update the ProcessLock comparison API
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 12132d0bc651a..4c4b7821d9131 100644 index 86ddb8ebaf45..126b2acc924d 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
@@ -5304,6 +5304,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() { @@ -5304,6 +5304,12 @@ url::Origin NavigationRequest::GetOriginForURLLoaderFactory() {

2
patch/patches/build.patch
View File

@@ -1,5 +1,5 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 72ea590d69681..0c34d20addfa8 100644 index 72ea590d6968..0c34d20addfa 100644
--- build/config/compiler/BUILD.gn --- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn +++ build/config/compiler/BUILD.gn
@@ -1834,8 +1834,6 @@ config("thin_archive") { @@ -1834,8 +1834,6 @@ config("thin_archive") {

6
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 c7970e581a976..045e18b4313b5 100644 index 2ae4ebab650f..f463b332115e 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -13,6 +13,7 @@ import("//build/config/features.gni") @@ -13,6 +13,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index c7970e581a976..045e18b4313b5 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")
@@ -1902,6 +1903,7 @@ static_library("browser") { @@ -1908,6 +1909,7 @@ static_library("browser") {
"//build:chromeos_buildflags", "//build:chromeos_buildflags",
"//build/config/compiler:compiler_buildflags", "//build/config/compiler:compiler_buildflags",
"//cc", "//cc",
@@ -18,7 +18,7 @@ index c7970e581a976..045e18b4313b5 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2450,6 +2452,10 @@ static_library("browser") { @@ -2456,6 +2458,10 @@ static_library("browser") {
] ]
} }

24
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm diff --git chrome/browser/app_controller_mac.mm chrome/browser/app_controller_mac.mm
index 3f0c080690084..52d0d8eb43c3e 100644 index 8fd9ba22110e..327c788df2d3 100644
--- chrome/browser/app_controller_mac.mm --- chrome/browser/app_controller_mac.mm
+++ chrome/browser/app_controller_mac.mm +++ chrome/browser/app_controller_mac.mm
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
@@ -26,7 +26,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
} }
// Same as |-commandDispatch:|, but executes commands using a disposition // Same as |-commandDispatch:|, but executes commands using a disposition
@@ -1606,6 +1609,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; @@ -1607,6 +1610,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit // TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
// tests which use the mock in place of the profile-initialized model. // tests which use the mock in place of the profile-initialized model.
@@ -34,7 +34,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
// Avoid breaking unit tests which have no profile. // Avoid breaking unit tests which have no profile.
if (profile) { if (profile) {
BackgroundApplicationListModel applications(profile); BackgroundApplicationListModel applications(profile);
@@ -1632,6 +1636,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; @@ -1633,6 +1637,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
} }
} }
} }
@@ -42,7 +42,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
return dockMenu; return dockMenu;
} }
@@ -1861,11 +1866,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session; @@ -1862,11 +1867,13 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
namespace { namespace {
void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) { void UpdateProfileInUse(Profile* profile, Profile::CreateStatus status) {
@@ -57,7 +57,7 @@ index 3f0c080690084..52d0d8eb43c3e 100644
} // namespace } // namespace
diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
index 3d634db18900a..96e44ad48e5e5 100644 index 3d634db18900..96e44ad48e5e 100644
--- chrome/browser/browser_process.h --- chrome/browser/browser_process.h
+++ chrome/browser/browser_process.h +++ chrome/browser/browser_process.h
@@ -197,9 +197,9 @@ class BrowserProcess { @@ -197,9 +197,9 @@ class BrowserProcess {
@@ -72,7 +72,7 @@ index 3d634db18900a..96e44ad48e5e5 100644
std::unique_ptr<BackgroundModeManager> manager) = 0; std::unique_ptr<BackgroundModeManager> manager) = 0;
#endif #endif
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index 89a682d5c9352..946ccbda587c7 100644 index 89a682d5c935..946ccbda587c 100644
--- chrome/browser/browser_process_impl.cc --- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc +++ chrome/browser/browser_process_impl.cc
@@ -947,18 +947,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() { @@ -947,18 +947,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -96,7 +96,7 @@ index 89a682d5c9352..946ccbda587c7 100644
std::unique_ptr<BackgroundModeManager> manager) { std::unique_ptr<BackgroundModeManager> manager) {
background_mode_manager_ = std::move(manager); background_mode_manager_ = std::move(manager);
diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
index b4ceefbccd083..7d60206c83b13 100644 index b4ceefbccd08..7d60206c83b1 100644
--- chrome/browser/browser_process_impl.h --- chrome/browser/browser_process_impl.h
+++ chrome/browser/browser_process_impl.h +++ chrome/browser/browser_process_impl.h
@@ -169,8 +169,8 @@ class BrowserProcessImpl : public BrowserProcess, @@ -169,8 +169,8 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -110,7 +110,7 @@ index b4ceefbccd083..7d60206c83b13 100644
std::unique_ptr<BackgroundModeManager> manager) override; std::unique_ptr<BackgroundModeManager> manager) override;
#endif #endif
diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
index e0cafee5eedd6..06ded156be3cc 100644 index e0cafee5eedd..06ded156be3c 100644
--- chrome/browser/lifetime/browser_close_manager.cc --- chrome/browser/lifetime/browser_close_manager.cc
+++ chrome/browser/lifetime/browser_close_manager.cc +++ chrome/browser/lifetime/browser_close_manager.cc
@@ -148,12 +148,14 @@ void BrowserCloseManager::CloseBrowsers() { @@ -148,12 +148,14 @@ void BrowserCloseManager::CloseBrowsers() {
@@ -129,10 +129,10 @@ index e0cafee5eedd6..06ded156be3cc 100644
// Make a copy of the BrowserList to simplify the case where we need to // Make a copy of the BrowserList to simplify the case where we need to
// destroy a Browser during the loop. // destroy a Browser during the loop.
diff --git chrome/browser/sessions/app_session_service.cc chrome/browser/sessions/app_session_service.cc diff --git chrome/browser/sessions/app_session_service.cc chrome/browser/sessions/app_session_service.cc
index 071884fe257bb..47160e3e47bdb 100644 index cb12e5b6e8d9..ae24f7ad5f5d 100644
--- chrome/browser/sessions/app_session_service.cc --- chrome/browser/sessions/app_session_service.cc
+++ chrome/browser/sessions/app_session_service.cc +++ chrome/browser/sessions/app_session_service.cc
@@ -90,8 +90,11 @@ void AppSessionService::MaybeDeleteSessionOnlyData() { @@ -165,8 +165,11 @@ void AppSessionService::MaybeDeleteSessionOnlyData() {
// Clear session data if the last window for a profile has been closed and // Clear session data if the last window for a profile has been closed and
// closing the last window would normally close Chrome, unless background mode // closing the last window would normally close Chrome, unless background mode
// is active. Tests don't have a background_mode_manager. // is active. Tests don't have a background_mode_manager.
@@ -147,10 +147,10 @@ index 071884fe257bb..47160e3e47bdb 100644
} }
diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc
index e5074800fbb00..e6c59d05ee204 100644 index 24a6b1a3634d..abcb36d783de 100644
--- chrome/browser/sessions/session_service.cc --- chrome/browser/sessions/session_service.cc
+++ chrome/browser/sessions/session_service.cc +++ chrome/browser/sessions/session_service.cc
@@ -553,12 +553,19 @@ void SessionService::MaybeDeleteSessionOnlyData() { @@ -516,12 +516,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
if (profile()->AsTestingProfile()) if (profile()->AsTestingProfile())
return; return;

36
patch/patches/chrome_browser_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
index ba0c5c3fc0446..b4df9af95ecd1 100644 index ba0c5c3fc044..b4df9af95ecd 100644
--- chrome/browser/browser_about_handler.cc --- chrome/browser/browser_about_handler.cc
+++ chrome/browser/browser_about_handler.cc +++ chrome/browser/browser_about_handler.cc
@@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) { @@ -70,6 +70,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
@@ -13,10 +13,10 @@ index ba0c5c3fc0446..b4df9af95ecd1 100644
return false; return false;
} }
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 37b121e2b667d..ae70272bf2764 100644 index 29d0321fae4c..287a95ff00de 100644
--- chrome/browser/ui/browser.cc --- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc
@@ -257,6 +257,20 @@ @@ -259,6 +259,20 @@
#include "components/captive_portal/content/captive_portal_tab_helper.h" #include "components/captive_portal/content/captive_portal_tab_helper.h"
#endif #endif
@@ -37,7 +37,7 @@ index 37b121e2b667d..ae70272bf2764 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h" #include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif #endif
@@ -481,6 +495,13 @@ Browser::Browser(const CreateParams& params) @@ -488,6 +502,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this); tab_strip_model_->AddObserver(this);
@@ -51,7 +51,7 @@ index 37b121e2b667d..ae70272bf2764 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>( location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars); location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1320,6 +1341,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent( @@ -1348,6 +1369,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event)) if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED; return content::KeyboardEventProcessingResult::HANDLED;
@@ -66,7 +66,7 @@ index 37b121e2b667d..ae70272bf2764 100644
return window()->PreHandleKeyboardEvent(event); return window()->PreHandleKeyboardEvent(event);
} }
@@ -1327,8 +1356,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source, @@ -1355,8 +1384,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) { const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window = DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source); DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -87,7 +87,7 @@ index 37b121e2b667d..ae70272bf2764 100644
} }
bool Browser::TabsNeedBeforeUnloadFired() { bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1549,6 +1588,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source, @@ -1577,6 +1616,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params); return window->OpenURLFromTab(source, params);
} }
@@ -102,7 +102,7 @@ index 37b121e2b667d..ae70272bf2764 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;
@@ -1648,6 +1695,15 @@ void Browser::AddNewContents(WebContents* source, @@ -1676,6 +1723,15 @@ void Browser::AddNewContents(WebContents* source,
source, disposition); source, disposition);
} }
@@ -118,7 +118,7 @@ index 37b121e2b667d..ae70272bf2764 100644
chrome::AddWebContents(this, source, std::move(new_contents), target_url, chrome::AddWebContents(this, source, std::move(new_contents), target_url,
disposition, initial_rect); disposition, initial_rect);
} }
@@ -1666,6 +1722,8 @@ void Browser::LoadingStateChanged(WebContents* source, @@ -1694,6 +1750,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool to_different_document) { bool to_different_document) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD); ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, to_different_document); UpdateWindowForLoadingStateChanged(source, to_different_document);
@@ -127,7 +127,7 @@ index 37b121e2b667d..ae70272bf2764 100644
} }
void Browser::CloseContents(WebContents* source) { void Browser::CloseContents(WebContents* source) {
@@ -1693,6 +1751,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) { @@ -1721,6 +1779,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) {
@@ -136,7 +136,7 @@ index 37b121e2b667d..ae70272bf2764 100644
if (!GetStatusBubble()) if (!GetStatusBubble())
return; return;
@@ -1700,6 +1760,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) { @@ -1728,6 +1788,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url); GetStatusBubble()->SetURL(url);
} }
@@ -154,7 +154,7 @@ index 37b121e2b667d..ae70272bf2764 100644
void Browser::ContentsMouseEvent(WebContents* source, void Browser::ContentsMouseEvent(WebContents* source,
bool motion, bool motion,
bool exited) { bool exited) {
@@ -1816,6 +1887,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, @@ -1844,6 +1915,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);
@@ -165,7 +165,7 @@ index 37b121e2b667d..ae70272bf2764 100644
} }
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1852,6 +1927,8 @@ void Browser::RendererResponsive( @@ -1880,6 +1955,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents()) if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -174,7 +174,7 @@ index 37b121e2b667d..ae70272bf2764 100644
} }
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager( content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1898,11 +1975,15 @@ void Browser::EnterFullscreenModeForTab( @@ -1926,11 +2003,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);
@@ -190,7 +190,7 @@ index 37b121e2b667d..ae70272bf2764 100644
} }
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2742,6 +2823,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { @@ -2775,6 +2856,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this); content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
} }
@@ -200,7 +200,7 @@ index 37b121e2b667d..ae70272bf2764 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 f1c66751bff73..886375f473b91 100644 index f1c66751bff7..886375f473b9 100644
--- chrome/browser/ui/browser.h --- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@@ -294,7 +294,7 @@ index f1c66751bff73..886375f473b91 100644
// The following factory is used for chrome update coalescing. // The following factory is used for chrome update coalescing.
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index a50d5b83afa2d..21c6ca8d7188f 100644 index a50d5b83afa2..21c6ca8d7188 100644
--- chrome/browser/ui/browser_navigator.cc --- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc +++ chrome/browser/ui/browser_navigator.cc
@@ -454,6 +454,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents( @@ -454,6 +454,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -312,7 +312,7 @@ index a50d5b83afa2d..21c6ca8d7188f 100644
// tab helpers, so the entire set of tab helpers needs to be set up // tab helpers, so the entire set of tab helpers needs to be set up
// immediately. // immediately.
diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc diff --git chrome/browser/ui/browser_tabstrip.cc chrome/browser/ui/browser_tabstrip.cc
index 899b0e532c451..2fad68ec3e513 100644 index 899b0e532c45..2fad68ec3e51 100644
--- chrome/browser/ui/browser_tabstrip.cc --- chrome/browser/ui/browser_tabstrip.cc
+++ chrome/browser/ui/browser_tabstrip.cc +++ chrome/browser/ui/browser_tabstrip.cc
@@ -30,9 +30,13 @@ void AddTabAt(Browser* browser, @@ -30,9 +30,13 @@ void AddTabAt(Browser* browser,

4
patch/patches/chrome_browser_content_settings.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index c1e6c77a57267..d3c41d3dac053 100644 index c1e6c77a5726..d3c41d3dac05 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc --- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc +++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@@ -54,7 +54,7 @@ index c1e6c77a57267..d3c41d3dac053 100644
#if BUILDFLAG(ENABLE_SUPERVISED_USERS) #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
SupervisedUserSettingsService* supervised_service = SupervisedUserSettingsService* supervised_service =
diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
index b6b38ab9a2513..048c6f8c544f1 100644 index b6b38ab9a251..048c6f8c544f 100644
--- components/content_settings/renderer/content_settings_agent_impl.cc --- components/content_settings/renderer/content_settings_agent_impl.cc
+++ components/content_settings/renderer/content_settings_agent_impl.cc +++ components/content_settings/renderer/content_settings_agent_impl.cc
@@ -172,7 +172,7 @@ ContentSetting GetContentSettingFromRulesImpl( @@ -172,7 +172,7 @@ ContentSetting GetContentSettingFromRulesImpl(

14
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 13ad2a7529bb1..0b003c26815e0 100644 index 13ad2a7529bb..0b003c26815e 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
@@ -254,6 +254,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() { @@ -254,6 +254,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -69,7 +69,7 @@ index 13ad2a7529bb1..0b003c26815e0 100644
RenderViewContextMenu::GetHandlersForLinkUrl() { RenderViewContextMenu::GetHandlersForLinkUrl() {
ProtocolHandlerRegistry::ProtocolHandlerList 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 5178db60ba644..845461049e54e 100644 index 5178db60ba64..845461049e54 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
@@ -91,6 +91,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { @@ -91,6 +91,12 @@ class RenderViewContextMenu : public RenderViewContextMenuBase {
@@ -96,7 +96,7 @@ index 5178db60ba644..845461049e54e 100644
// "Use enhanced spell check" items. // "Use enhanced spell check" items.
std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_; std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
index feec153dcc146..0959c1020bad9 100644 index feec153dcc14..0959c1020bad 100644
--- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc --- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
+++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc +++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent, @@ -136,6 +136,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
@@ -110,7 +110,7 @@ index feec153dcc146..0959c1020bad9 100644
// that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do. // that Ctrl+C, Ctrl+V, Ctrl+X, Ctrl-A, etc do what they normally do.
switch (command_id) { switch (command_id) {
diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc diff --git components/renderer_context_menu/render_view_context_menu_base.cc components/renderer_context_menu/render_view_context_menu_base.cc
index 62100403d27f0..54182e7d97e3c 100644 index 62100403d27f..54182e7d97e3 100644
--- components/renderer_context_menu/render_view_context_menu_base.cc --- components/renderer_context_menu/render_view_context_menu_base.cc
+++ components/renderer_context_menu/render_view_context_menu_base.cc +++ components/renderer_context_menu/render_view_context_menu_base.cc
@@ -375,6 +375,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const { @@ -375,6 +375,17 @@ bool RenderViewContextMenuBase::IsCommandIdChecked(int id) const {
@@ -132,7 +132,7 @@ index 62100403d27f0..54182e7d97e3c 100644
command_executed_ = true; command_executed_ = true;
RecordUsedItem(id); RecordUsedItem(id);
diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
index 52002b190fded..ce3277e9f9350 100644 index 52002b190fde..ce3277e9f935 100644
--- components/renderer_context_menu/render_view_context_menu_base.h --- components/renderer_context_menu/render_view_context_menu_base.h
+++ components/renderer_context_menu/render_view_context_menu_base.h +++ components/renderer_context_menu/render_view_context_menu_base.h
@@ -81,6 +81,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate, @@ -81,6 +81,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,
@@ -176,7 +176,7 @@ index 52002b190fded..ce3277e9f9350 100644
bool IsCustomItemEnabled(int id) const; bool IsCustomItemEnabled(int id) const;
diff --git components/renderer_context_menu/render_view_context_menu_observer.cc components/renderer_context_menu/render_view_context_menu_observer.cc diff --git components/renderer_context_menu/render_view_context_menu_observer.cc components/renderer_context_menu/render_view_context_menu_observer.cc
index 2e2d05f91c646..85b256b2be9bd 100644 index 2e2d05f91c64..85b256b2be9b 100644
--- components/renderer_context_menu/render_view_context_menu_observer.cc --- components/renderer_context_menu/render_view_context_menu_observer.cc
+++ components/renderer_context_menu/render_view_context_menu_observer.cc +++ components/renderer_context_menu/render_view_context_menu_observer.cc
@@ -15,3 +15,8 @@ bool RenderViewContextMenuObserver::IsCommandIdChecked(int command_id) { @@ -15,3 +15,8 @@ bool RenderViewContextMenuObserver::IsCommandIdChecked(int command_id) {
@@ -189,7 +189,7 @@ index 2e2d05f91c646..85b256b2be9bd 100644
+ return false; + return false;
+} +}
diff --git components/renderer_context_menu/render_view_context_menu_observer.h components/renderer_context_menu/render_view_context_menu_observer.h diff --git components/renderer_context_menu/render_view_context_menu_observer.h components/renderer_context_menu/render_view_context_menu_observer.h
index b360a8eb4e820..6f9023a629046 100644 index b360a8eb4e82..6f9023a62904 100644
--- components/renderer_context_menu/render_view_context_menu_observer.h --- components/renderer_context_menu/render_view_context_menu_observer.h
+++ components/renderer_context_menu/render_view_context_menu_observer.h +++ components/renderer_context_menu/render_view_context_menu_observer.h
@@ -11,6 +11,10 @@ namespace content { @@ -11,6 +11,10 @@ namespace content {

4
patch/patches/chrome_browser_net_export.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 94e40ecd52276..597810f96ba53 100644 index 5c150b1b020e..acd30a6f485d 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni") @@ -12,6 +12,7 @@ import("//build/config/features.gni")
@@ -38,7 +38,7 @@ index 94e40ecd52276..597810f96ba53 100644
"//components/reading_list/features:flags", "//components/reading_list/features:flags",
"//components/safe_browsing/core/common:safe_browsing_policy_handler", "//components/safe_browsing/core/common:safe_browsing_policy_handler",
diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
index a12ad7b5e7eb6..9dba0f6642313 100644 index a12ad7b5e7eb..9dba0f664231 100644
--- chrome/browser/ui/webui/net_export_ui.cc --- chrome/browser/ui/webui/net_export_ui.cc
+++ chrome/browser/ui/webui/net_export_ui.cc +++ chrome/browser/ui/webui/net_export_ui.cc
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@

6
patch/patches/chrome_browser_profile_menu.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc diff --git chrome/browser/profiles/profile_window.cc chrome/browser/profiles/profile_window.cc
index 69d6f442d1208..46f2be62e0466 100644 index 69d6f442d120..46f2be62e046 100644
--- chrome/browser/profiles/profile_window.cc --- chrome/browser/profiles/profile_window.cc
+++ chrome/browser/profiles/profile_window.cc +++ chrome/browser/profiles/profile_window.cc
@@ -262,7 +262,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode, @@ -262,7 +262,9 @@ void BubbleViewModeFromAvatarBubbleMode(BrowserWindow::AvatarBubbleMode mode,
@@ -14,7 +14,7 @@ index 69d6f442d1208..46f2be62e0466 100644
: profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER; : profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
} }
diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc diff --git chrome/browser/ui/views/profiles/incognito_menu_view.cc chrome/browser/ui/views/profiles/incognito_menu_view.cc
index b6ce61c8f4b03..dc5d111325b1f 100644 index b6ce61c8f4b0..dc5d111325b1 100644
--- chrome/browser/ui/views/profiles/incognito_menu_view.cc --- chrome/browser/ui/views/profiles/incognito_menu_view.cc
+++ chrome/browser/ui/views/profiles/incognito_menu_view.cc +++ chrome/browser/ui/views/profiles/incognito_menu_view.cc
@@ -37,7 +37,9 @@ @@ -37,7 +37,9 @@
@@ -29,7 +29,7 @@ index b6ce61c8f4b03..dc5d111325b1f 100644
chrome::RecordDialogCreation( chrome::RecordDialogCreation(
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
index 319404417dc43..795dccb655e07 100644 index 319404417dc4..795dccb655e0 100644
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc --- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -494,7 +494,9 @@ void ProfileMenuViewBase::ShowBubble( @@ -494,7 +494,9 @@ void ProfileMenuViewBase::ShowBubble(

16
patch/patches/chrome_browser_profiles.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
index 4e361cfd4ec86..bd156f6b76696 100644 index 4e361cfd4ec8..bd156f6b7669 100644
--- chrome/browser/profiles/off_the_record_profile_impl.cc --- chrome/browser/profiles/off_the_record_profile_impl.cc
+++ chrome/browser/profiles/off_the_record_profile_impl.cc +++ chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -644,7 +644,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile( @@ -644,7 +644,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
@@ -14,7 +14,7 @@ index 4e361cfd4ec86..bd156f6b76696 100644
} }
diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc diff --git chrome/browser/profiles/profile.cc chrome/browser/profiles/profile.cc
index 94aafe60eb458..ebc3ecc2585a3 100644 index 94aafe60eb45..ebc3ecc2585a 100644
--- chrome/browser/profiles/profile.cc --- chrome/browser/profiles/profile.cc
+++ chrome/browser/profiles/profile.cc +++ chrome/browser/profiles/profile.cc
@@ -81,6 +81,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky @@ -81,6 +81,7 @@ base::LazyInstance<std::set<content::BrowserContext*>>::Leaky
@@ -52,7 +52,7 @@ index 94aafe60eb458..ebc3ecc2585a3 100644
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() { Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
return CreateUnique(kDevToolsOTRProfileIDPrefix); return CreateUnique(kDevToolsOTRProfileIDPrefix);
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
index a2b145ece628e..41afec2cfa4cb 100644 index a2b145ece628..41afec2cfa4c 100644
--- chrome/browser/profiles/profile.h --- chrome/browser/profiles/profile.h
+++ chrome/browser/profiles/profile.h +++ chrome/browser/profiles/profile.h
@@ -120,6 +120,10 @@ class Profile : public content::BrowserContext { @@ -120,6 +120,10 @@ class Profile : public content::BrowserContext {
@@ -85,7 +85,7 @@ index a2b145ece628e..41afec2cfa4cb 100644
virtual bool IsSignedIn() = 0; virtual bool IsSignedIn() = 0;
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index 14417b3a65486..9f0fc4b5316bc 100644 index 14417b3a6548..9f0fc4b5316b 100644
--- chrome/browser/profiles/profile_impl.cc --- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc +++ chrome/browser/profiles/profile_impl.cc
@@ -979,7 +979,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id, @@ -979,7 +979,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@@ -100,10 +100,10 @@ index 14417b3a65486..9f0fc4b5316bc 100644
return raw_otr_profile; return raw_otr_profile;
} }
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index b470744df3fa1..8a4ecc623feab 100644 index d2a29e4e928c..676277932ac4 100644
--- chrome/browser/profiles/profile_manager.cc --- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc +++ chrome/browser/profiles/profile_manager.cc
@@ -435,7 +435,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -440,7 +440,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
base::Unretained(this))); base::Unretained(this)));
#endif #endif
@@ -113,7 +113,7 @@ index b470744df3fa1..8a4ecc623feab 100644
} }
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
index 88ee84697998c..40ba18c66127e 100644 index 88ee84697998..40ba18c66127 100644
--- chrome/browser/profiles/profile_manager.h --- chrome/browser/profiles/profile_manager.h
+++ chrome/browser/profiles/profile_manager.h +++ chrome/browser/profiles/profile_manager.h
@@ -116,7 +116,7 @@ class ProfileManager : public Profile::Delegate { @@ -116,7 +116,7 @@ class ProfileManager : public Profile::Delegate {
@@ -144,7 +144,7 @@ index 88ee84697998c..40ba18c66127e 100644
// Get the path of the last used profile, or if that's undefined, the default // Get the path of the last used profile, or if that's undefined, the default
// profile. // profile.
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
index 8920c217f0b26..f4864793c5a29 100644 index 8920c217f0b2..f4864793c5a2 100644
--- chrome/browser/profiles/renderer_updater.cc --- chrome/browser/profiles/renderer_updater.cc
+++ chrome/browser/profiles/renderer_updater.cc +++ chrome/browser/profiles/renderer_updater.cc
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@

2
patch/patches/chrome_browser_safe_browsing.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
index 825663c0ead5e..2029a401663f1 100644 index 825663c0ead5..2029a401663f 100644
--- chrome/browser/safe_browsing/BUILD.gn --- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn +++ chrome/browser/safe_browsing/BUILD.gn
@@ -27,6 +27,7 @@ static_library("safe_browsing") { @@ -27,6 +27,7 @@ static_library("safe_browsing") {

4
patch/patches/chrome_browser_sharesheet_1123388.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/sharesheet/sharesheet_service_delegate.cc chrome/browser/sharesheet/sharesheet_service_delegate.cc diff --git chrome/browser/sharesheet/sharesheet_service_delegate.cc chrome/browser/sharesheet/sharesheet_service_delegate.cc
index 3cb0c531e382e..a40b50e060483 100644 index 3cb0c531e382..a40b50e06048 100644
--- chrome/browser/sharesheet/sharesheet_service_delegate.cc --- chrome/browser/sharesheet/sharesheet_service_delegate.cc
+++ chrome/browser/sharesheet/sharesheet_service_delegate.cc +++ chrome/browser/sharesheet/sharesheet_service_delegate.cc
@@ -19,8 +19,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate( @@ -19,8 +19,10 @@ SharesheetServiceDelegate::SharesheetServiceDelegate(
@@ -71,7 +71,7 @@ index 3cb0c531e382e..a40b50e060483 100644
} // namespace sharesheet } // namespace sharesheet
diff --git chrome/browser/sharesheet/sharesheet_service_delegate.h chrome/browser/sharesheet/sharesheet_service_delegate.h diff --git chrome/browser/sharesheet/sharesheet_service_delegate.h chrome/browser/sharesheet/sharesheet_service_delegate.h
index cba3392d1057c..b307678693797 100644 index cba3392d1057..b30767869379 100644
--- chrome/browser/sharesheet/sharesheet_service_delegate.h --- chrome/browser/sharesheet/sharesheet_service_delegate.h
+++ chrome/browser/sharesheet/sharesheet_service_delegate.h +++ chrome/browser/sharesheet/sharesheet_service_delegate.h
@@ -72,7 +72,9 @@ class SharesheetServiceDelegate : public SharesheetController { @@ -72,7 +72,9 @@ class SharesheetServiceDelegate : public SharesheetController {

4
patch/patches/chrome_browser_themes.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
index e48400619537d..635959d7ba9a7 100644 index e48400619537..635959d7ba9a 100644
--- chrome/browser/themes/theme_service.cc --- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc +++ chrome/browser/themes/theme_service.cc
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@@ -42,7 +42,7 @@ index e48400619537d..635959d7ba9a7 100644
theme_syncable_service_ = theme_syncable_service_ =
std::make_unique<ThemeSyncableService>(profile_, this); std::make_unique<ThemeSyncableService>(profile_, this);
diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
index dc2350f0b2443..7f4b9283534f3 100644 index dc2350f0b244..7f4b9283534f 100644
--- chrome/browser/themes/theme_service_factory.cc --- chrome/browser/themes/theme_service_factory.cc
+++ chrome/browser/themes/theme_service_factory.cc +++ chrome/browser/themes/theme_service_factory.cc
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@

10
patch/patches/chrome_plugins.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc diff --git chrome/browser/plugins/plugin_info_host_impl.cc chrome/browser/plugins/plugin_info_host_impl.cc
index 168f980572c10..ffdc06beb2b77 100644 index 168f980572c1..ffdc06beb2b7 100644
--- chrome/browser/plugins/plugin_info_host_impl.cc --- chrome/browser/plugins/plugin_info_host_impl.cc
+++ chrome/browser/plugins/plugin_info_host_impl.cc +++ chrome/browser/plugins/plugin_info_host_impl.cc
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
@@ -115,7 +115,7 @@ index 168f980572c10..ffdc06beb2b77 100644
bool enabled = i < matching_plugins.size(); bool enabled = i < matching_plugins.size();
if (!enabled) { if (!enabled) {
diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc diff --git chrome/browser/plugins/plugin_utils.cc chrome/browser/plugins/plugin_utils.cc
index a0b3175223f3e..a1117001ad1fc 100644 index a0b3175223f3..a1117001ad1f 100644
--- chrome/browser/plugins/plugin_utils.cc --- chrome/browser/plugins/plugin_utils.cc
+++ chrome/browser/plugins/plugin_utils.cc +++ chrome/browser/plugins/plugin_utils.cc
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
@@ -151,7 +151,7 @@ index a0b3175223f3e..a1117001ad1fc 100644
Profile* profile = Profile::FromBrowserContext(browser_context); Profile* profile = Profile::FromBrowserContext(browser_context);
const std::vector<std::string>& allowlist = const std::vector<std::string>& allowlist =
diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc diff --git chrome/common/google_url_loader_throttle.cc chrome/common/google_url_loader_throttle.cc
index 6555dfc37d5ce..d54030b6f2368 100644 index 6555dfc37d5c..d54030b6f236 100644
--- chrome/common/google_url_loader_throttle.cc --- chrome/common/google_url_loader_throttle.cc
+++ chrome/common/google_url_loader_throttle.cc +++ chrome/common/google_url_loader_throttle.cc
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
@@ -186,7 +186,7 @@ index 6555dfc37d5ce..d54030b6f2368 100644
// that the X-Frame-Options protection mechanism is set to either DENY or // that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN. // SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index ceb29f83a9dc1..3f1601ae17931 100644 index ceb29f83a9dc..3f1601ae1793 100644
--- chrome/renderer/chrome_content_renderer_client.cc --- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc +++ chrome/renderer/chrome_content_renderer_client.cc
@@ -862,6 +862,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin( @@ -862,6 +862,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -238,7 +238,7 @@ index ceb29f83a9dc1..3f1601ae17931 100644
} }
} }
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
index cb6a2dfb9adcf..02f316d646cf7 100644 index cb6a2dfb9adc..02f316d646cf 100644
--- content/browser/browser_plugin/browser_plugin_guest.h --- content/browser/browser_plugin/browser_plugin_guest.h
+++ content/browser/browser_plugin/browser_plugin_guest.h +++ content/browser/browser_plugin/browser_plugin_guest.h
@@ -116,6 +116,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost, @@ -116,6 +116,8 @@ class CONTENT_EXPORT BrowserPluginGuest : public GuestHost,

2
patch/patches/chrome_pref_watcher.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/prefs/pref_watcher.h chrome/browser/ui/prefs/pref_watcher.h diff --git chrome/browser/ui/prefs/pref_watcher.h chrome/browser/ui/prefs/pref_watcher.h
index 78d5b763970c2..de98bd0b325b1 100644 index 78d5b763970c..de98bd0b325b 100644
--- chrome/browser/ui/prefs/pref_watcher.h --- chrome/browser/ui/prefs/pref_watcher.h
+++ chrome/browser/ui/prefs/pref_watcher.h +++ chrome/browser/ui/prefs/pref_watcher.h
@@ -29,10 +29,10 @@ class PrefWatcher : public KeyedService { @@ -29,10 +29,10 @@ class PrefWatcher : public KeyedService {

2
patch/patches/chrome_renderer.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index cd4395923de75..61069e6965057 100644 index cd4395923de7..61069e696505 100644
--- chrome/renderer/BUILD.gn --- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn +++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@

14
patch/patches/chrome_runtime.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 94e871ea16b08..69929718b2704 100644 index 94e871ea16b0..69929718b270 100644
--- chrome/app/chrome_main_delegate.cc --- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc +++ chrome/app/chrome_main_delegate.cc
@@ -29,6 +29,7 @@ @@ -29,6 +29,7 @@
@@ -78,7 +78,7 @@ index 94e871ea16b08..69929718b2704 100644
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) #endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index 86b9a324e5da5..b4e1bfebe1162 100644 index 86b9a324e5da..b4e1bfebe116 100644
--- chrome/browser/chrome_browser_main.cc --- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc +++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
@@ -118,7 +118,7 @@ index 86b9a324e5da5..b4e1bfebe1162 100644
// of lacros-chrome is complete. // of lacros-chrome is complete.
#if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #if defined(OS_WIN) || (defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
index 8a33ce57766c5..ca69a37eee22b 100644 index 8a33ce57766c..ca69a37eee22 100644
--- chrome/browser/chrome_browser_main_mac.mm --- chrome/browser/chrome_browser_main_mac.mm
+++ chrome/browser/chrome_browser_main_mac.mm +++ chrome/browser/chrome_browser_main_mac.mm
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@@ -156,7 +156,7 @@ index 8a33ce57766c5..ca69a37eee22b 100644
+#endif +#endif
} }
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 3f152fd798e8c..19346821464f5 100644 index 02b5855f9f95..1d25f15ec778 100644
--- chrome/browser/chrome_content_browser_client.cc --- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc
@@ -37,6 +37,7 @@ @@ -37,6 +37,7 @@
@@ -167,7 +167,7 @@ index 3f152fd798e8c..19346821464f5 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h" #include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h" #include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/accessibility/caption_util.h" #include "chrome/browser/accessibility/caption_util.h"
@@ -3643,9 +3644,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( @@ -3653,9 +3654,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite); &search::HandleNewTabURLReverseRewrite);
#endif // defined(OS_ANDROID) #endif // defined(OS_ANDROID)
@@ -180,7 +180,7 @@ index 3f152fd798e8c..19346821464f5 100644
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
diff --git chrome/browser/notifications/alert_dispatcher_xpc.mm chrome/browser/notifications/alert_dispatcher_xpc.mm diff --git chrome/browser/notifications/alert_dispatcher_xpc.mm chrome/browser/notifications/alert_dispatcher_xpc.mm
index d126ddd3a24dd..5e8c5ae7c093a 100644 index d126ddd3a24d..5e8c5ae7c093 100644
--- chrome/browser/notifications/alert_dispatcher_xpc.mm --- chrome/browser/notifications/alert_dispatcher_xpc.mm
+++ chrome/browser/notifications/alert_dispatcher_xpc.mm +++ chrome/browser/notifications/alert_dispatcher_xpc.mm
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@@ -205,7 +205,7 @@ index d126ddd3a24dd..5e8c5ae7c093a 100644
base::mac::ScopedMachSendRight exceptionPort( base::mac::ScopedMachSendRight exceptionPort(
crash_reporter::GetCrashpadClient().GetHandlerMachPort()); crash_reporter::GetCrashpadClient().GetHandlerMachPort());
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 7f814486ab674..512dbd488d752 100644 index 7f814486ab67..512dbd488d75 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
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@

18
patch/patches/chrome_runtime_views.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index b0bde494f7b6f..19b11ac5766d0 100644 index b0bde494f7b6..19b11ac5766d 100644
--- chrome/browser/ui/browser_command_controller.cc --- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc
@@ -354,8 +354,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -354,8 +354,10 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -31,7 +31,7 @@ index b0bde494f7b6f..19b11ac5766d0 100644
void BrowserCommandController::InitCommandState() { void BrowserCommandController::InitCommandState() {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 5aff6e51d2186..55a95564fb826 100644 index 5aff6e51d218..55a95564fb82 100644
--- chrome/browser/ui/views/frame/browser_frame.cc --- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc +++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -65,15 +65,23 @@ bool IsUsingGtkTheme(Profile* profile) { @@ -65,15 +65,23 @@ bool IsUsingGtkTheme(Profile* profile) {
@@ -106,7 +106,7 @@ index 5aff6e51d2186..55a95564fb826 100644
->UsingDefaultTheme()) { ->UsingDefaultTheme()) {
return ui::NativeTheme::GetInstanceForDarkUI(); return ui::NativeTheme::GetInstanceForDarkUI();
diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
index 050c0e05e4e3b..0bbcf4af9a92a 100644 index 050c0e05e4e3..0bbcf4af9a92 100644
--- chrome/browser/ui/views/frame/browser_frame.h --- chrome/browser/ui/views/frame/browser_frame.h
+++ chrome/browser/ui/views/frame/browser_frame.h +++ chrome/browser/ui/views/frame/browser_frame.h
@@ -53,7 +53,9 @@ enum class TabDragKind { @@ -53,7 +53,9 @@ enum class TabDragKind {
@@ -120,7 +120,7 @@ index 050c0e05e4e3b..0bbcf4af9a92a 100644
// Initialize the frame (creates the underlying native window). // Initialize the frame (creates the underlying native window).
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 7fc9e5493ca49..9cb598b648194 100644 index c33c4327974e..fe470132a090 100644
--- chrome/browser/ui/views/frame/browser_view.cc --- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc
@@ -576,11 +576,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver { @@ -576,11 +576,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
@@ -234,7 +234,7 @@ index 7fc9e5493ca49..9cb598b648194 100644
MaybeInitializeWebUITabStrip(); MaybeInitializeWebUITabStrip();
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 59ddc0ac10f94..d5f04bfd7ca5f 100644 index 59ddc0ac10f9..d5f04bfd7ca5 100644
--- chrome/browser/ui/views/frame/browser_view.h --- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h
@@ -112,7 +112,9 @@ class BrowserView : public BrowserWindow, @@ -112,7 +112,9 @@ class BrowserView : public BrowserWindow,
@@ -261,7 +261,7 @@ index 59ddc0ac10f94..d5f04bfd7ca5f 100644
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate // Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
// interface to keep these two classes decoupled and testable. // interface to keep these two classes decoupled and testable.
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
index 56ef53cf379d9..f0f1057896bdb 100644 index 56ef53cf379d..f0f1057896bd 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc --- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc +++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -415,6 +415,12 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) { @@ -415,6 +415,12 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
@@ -278,7 +278,7 @@ index 56ef53cf379d9..f0f1057896bdb 100644
bool toolbar_visible = delegate_->IsToolbarVisible(); bool toolbar_visible = delegate_->IsToolbarVisible();
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0; int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 9220245ea195d..90dd93503b570 100644 index 9220245ea195..90dd93503b57 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -571,37 +571,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( @@ -571,37 +571,53 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -336,7 +336,7 @@ index 9220245ea195d..90dd93503b570 100644
} }
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index 5f6e182d017d9..be85e6df707d1 100644 index 5f6e182d017d..be85e6df707d 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc --- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -156,12 +156,13 @@ auto& GetViewCommandMap() { @@ -156,12 +156,13 @@ auto& GetViewCommandMap() {
@@ -365,7 +365,7 @@ index 5f6e182d017d9..be85e6df707d1 100644
size_animation_.Reset(1); size_animation_.Reset(1);
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index 99358217419a6..425a0741b55a3 100644 index 99358217419a..425a0741b55a 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h --- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h +++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -87,7 +87,8 @@ class ToolbarView : public views::AccessiblePaneView, @@ -87,7 +87,8 @@ class ToolbarView : public views::AccessiblePaneView,

2
patch/patches/chrome_widevine.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn diff --git third_party/widevine/cdm/BUILD.gn third_party/widevine/cdm/BUILD.gn
index e5009f30f6f5a..8190a72bd450b 100644 index e5009f30f6f5..8190a72bd450 100644
--- third_party/widevine/cdm/BUILD.gn --- third_party/widevine/cdm/BUILD.gn
+++ third_party/widevine/cdm/BUILD.gn +++ third_party/widevine/cdm/BUILD.gn
@@ -7,6 +7,7 @@ import("//build/config/chrome_build.gni") @@ -7,6 +7,7 @@ import("//build/config/chrome_build.gni")

12
patch/patches/component_build.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
index d106889e860ff..af57383e609b8 100644 index d106889e860f..af57383e609b 100644
--- content/browser/devtools/devtools_instrumentation.h --- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h +++ content/browser/devtools/devtools_instrumentation.h
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@@ -20,7 +20,7 @@ index d106889e860ff..af57383e609b8 100644
bool is_navigation, bool is_navigation,
bool is_download, bool is_download,
diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h diff --git content/browser/renderer_host/input/synthetic_gesture_target_base.h content/browser/renderer_host/input/synthetic_gesture_target_base.h
index eef661b3e0950..6c0dacfa4bc3a 100644 index eef661b3e095..6c0dacfa4bc3 100644
--- content/browser/renderer_host/input/synthetic_gesture_target_base.h --- content/browser/renderer_host/input/synthetic_gesture_target_base.h
+++ content/browser/renderer_host/input/synthetic_gesture_target_base.h +++ content/browser/renderer_host/input/synthetic_gesture_target_base.h
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
@@ -42,7 +42,7 @@ index eef661b3e0950..6c0dacfa4bc3a 100644
explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host); explicit SyntheticGestureTargetBase(RenderWidgetHostImpl* host);
~SyntheticGestureTargetBase() override; ~SyntheticGestureTargetBase() override;
diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h diff --git content/common/content_switches_internal.h content/common/content_switches_internal.h
index 57072bf1263ae..0a93446e4d21c 100644 index 57072bf1263a..0a93446e4d21 100644
--- content/common/content_switches_internal.h --- content/common/content_switches_internal.h
+++ content/common/content_switches_internal.h +++ content/common/content_switches_internal.h
@@ -15,7 +15,7 @@ class CommandLine; @@ -15,7 +15,7 @@ class CommandLine;
@@ -55,7 +55,7 @@ index 57072bf1263ae..0a93446e4d21c 100644
blink::mojom::V8CacheOptions GetV8CacheOptions(); blink::mojom::V8CacheOptions GetV8CacheOptions();
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
index 8003cd409ff37..8ac3fefade6de 100644 index 8003cd409ff3..8ac3fefade6d 100644
--- third_party/blink/renderer/controller/BUILD.gn --- third_party/blink/renderer/controller/BUILD.gn
+++ third_party/blink/renderer/controller/BUILD.gn +++ third_party/blink/renderer/controller/BUILD.gn
@@ -29,6 +29,7 @@ component("controller") { @@ -29,6 +29,7 @@ component("controller") {
@@ -76,7 +76,7 @@ index 8003cd409ff37..8ac3fefade6de 100644
if (is_linux || is_chromeos) { if (is_linux || is_chromeos) {
diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn diff --git ui/events/keycodes/BUILD.gn ui/events/keycodes/BUILD.gn
index 86bbf620ff0d9..6c06b461c6da1 100644 index 86bbf620ff0d..6c06b461c6da 100644
--- ui/events/keycodes/BUILD.gn --- ui/events/keycodes/BUILD.gn
+++ ui/events/keycodes/BUILD.gn +++ ui/events/keycodes/BUILD.gn
@@ -19,6 +19,8 @@ source_set("xkb") { @@ -19,6 +19,8 @@ source_set("xkb") {
@@ -89,7 +89,7 @@ index 86bbf620ff0d9..6c06b461c6da1 100644
"//base", "//base",
"//build:chromeos_buildflags", "//build:chromeos_buildflags",
diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h diff --git ui/events/keycodes/keyboard_code_conversion_xkb.h ui/events/keycodes/keyboard_code_conversion_xkb.h
index 8f56878d4bb42..f0d2457f6a29d 100644 index 8f56878d4bb4..f0d2457f6a29 100644
--- ui/events/keycodes/keyboard_code_conversion_xkb.h --- ui/events/keycodes/keyboard_code_conversion_xkb.h
+++ ui/events/keycodes/keyboard_code_conversion_xkb.h +++ ui/events/keycodes/keyboard_code_conversion_xkb.h
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@

56
patch/patches/content_2015.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc diff --git chrome/browser/download/download_target_determiner.cc chrome/browser/download/download_target_determiner.cc
index f094105ac70c8..b5f4616ff821e 100644 index f094105ac70c..b5f4616ff821 100644
--- chrome/browser/download/download_target_determiner.cc --- chrome/browser/download/download_target_determiner.cc
+++ chrome/browser/download/download_target_determiner.cc +++ chrome/browser/download/download_target_determiner.cc
@@ -672,7 +672,7 @@ void IsHandledBySafePlugin(int render_process_id, @@ -672,7 +672,7 @@ void IsHandledBySafePlugin(int render_process_id,
@@ -12,7 +12,7 @@ index f094105ac70c8..b5f4616ff821e 100644
if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) { if (is_stale && stale_plugin_action == RETRY_IF_STALE_PLUGIN_LIST) {
// The GetPlugins call causes the plugin list to be refreshed. Once that's // The GetPlugins call causes the plugin list to be refreshed. Once that's
diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc diff --git chrome/browser/plugins/chrome_plugin_service_filter.cc chrome/browser/plugins/chrome_plugin_service_filter.cc
index c2bd9b8c3131e..d1283cf3d9b21 100644 index c2bd9b8c3131..d1283cf3d9b2 100644
--- chrome/browser/plugins/chrome_plugin_service_filter.cc --- chrome/browser/plugins/chrome_plugin_service_filter.cc
+++ chrome/browser/plugins/chrome_plugin_service_filter.cc +++ chrome/browser/plugins/chrome_plugin_service_filter.cc
@@ -132,6 +132,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable( @@ -132,6 +132,7 @@ bool ChromePluginServiceFilter::IsPluginAvailable(
@@ -24,7 +24,7 @@ index c2bd9b8c3131e..d1283cf3d9b21 100644
content::WebPluginInfo* plugin) { content::WebPluginInfo* plugin) {
base::AutoLock auto_lock(lock_); base::AutoLock auto_lock(lock_);
diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h diff --git chrome/browser/plugins/chrome_plugin_service_filter.h chrome/browser/plugins/chrome_plugin_service_filter.h
index 937d3d5bc84fd..ac327392dcf37 100644 index 937d3d5bc84f..ac327392dcf3 100644
--- chrome/browser/plugins/chrome_plugin_service_filter.h --- chrome/browser/plugins/chrome_plugin_service_filter.h
+++ chrome/browser/plugins/chrome_plugin_service_filter.h +++ chrome/browser/plugins/chrome_plugin_service_filter.h
@@ -64,6 +64,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter, @@ -64,6 +64,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
@@ -36,7 +36,7 @@ index 937d3d5bc84fd..ac327392dcf37 100644
content::WebPluginInfo* plugin) override; content::WebPluginInfo* plugin) override;
diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc diff --git chrome/browser/plugins/pdf_iframe_navigation_throttle.cc chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
index d0a5a12620bd3..a02e13bbd8154 100644 index d0a5a12620bd..a02e13bbd815 100644
--- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc --- chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
+++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc +++ chrome/browser/plugins/pdf_iframe_navigation_throttle.cc
@@ -65,7 +65,7 @@ bool IsPDFPluginEnabled(content::NavigationHandle* navigation_handle, @@ -65,7 +65,7 @@ bool IsPDFPluginEnabled(content::NavigationHandle* navigation_handle,
@@ -49,7 +49,7 @@ index d0a5a12620bd3..a02e13bbd8154 100644
false /* allow_wildcard */, is_stale, &plugin_info, false /* allow_wildcard */, is_stale, &plugin_info,
nullptr /* actual_mime_type */); nullptr /* actual_mime_type */);
diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc diff --git chrome/browser/ui/views/frame/browser_root_view.cc chrome/browser/ui/views/frame/browser_root_view.cc
index df02e848472f6..955edd0b7ff1f 100644 index df02e848472f..955edd0b7ff1 100644
--- chrome/browser/ui/views/frame/browser_root_view.cc --- chrome/browser/ui/views/frame/browser_root_view.cc
+++ chrome/browser/ui/views/frame/browser_root_view.cc +++ chrome/browser/ui/views/frame/browser_root_view.cc
@@ -81,7 +81,7 @@ void OnFindURLMimeType(const GURL& url, @@ -81,7 +81,7 @@ void OnFindURLMimeType(const GURL& url,
@@ -62,7 +62,7 @@ index df02e848472f6..955edd0b7ff1f 100644
#endif #endif
diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc diff --git content/browser/devtools/devtools_http_handler.cc content/browser/devtools/devtools_http_handler.cc
index 7df791af69af7..6005886106e58 100644 index 7df791af69af..6005886106e5 100644
--- content/browser/devtools/devtools_http_handler.cc --- content/browser/devtools/devtools_http_handler.cc
+++ content/browser/devtools/devtools_http_handler.cc +++ content/browser/devtools/devtools_http_handler.cc
@@ -574,7 +574,7 @@ void DevToolsHttpHandler::OnJsonRequest( @@ -574,7 +574,7 @@ void DevToolsHttpHandler::OnJsonRequest(
@@ -75,7 +75,7 @@ index 7df791af69af7..6005886106e58 100644
GetContentClient()->browser()->GetUserAgent()); GetContentClient()->browser()->GetUserAgent());
version.SetString("V8-Version", V8_VERSION_STRING); version.SetString("V8-Version", V8_VERSION_STRING);
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index a46dbf3c52abe..2d83757cef53a 100644 index a46dbf3c52ab..2d83757cef53 100644
--- content/browser/loader/navigation_url_loader_impl.cc --- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc
@@ -639,6 +639,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest( @@ -639,6 +639,13 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest(
@@ -102,7 +102,7 @@ index a46dbf3c52abe..2d83757cef53a 100644
if (stale) { if (stale) {
diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc diff --git content/browser/plugin_service_impl.cc content/browser/plugin_service_impl.cc
index 12e48ad8e3e31..1fd51c85ad6fb 100644 index 12e48ad8e3e3..1fd51c85ad6f 100644
--- content/browser/plugin_service_impl.cc --- content/browser/plugin_service_impl.cc
+++ content/browser/plugin_service_impl.cc +++ content/browser/plugin_service_impl.cc
@@ -269,6 +269,7 @@ bool PluginServiceImpl::GetPluginInfoArray( @@ -269,6 +269,7 @@ bool PluginServiceImpl::GetPluginInfoArray(
@@ -124,7 +124,7 @@ index 12e48ad8e3e31..1fd51c85ad6fb 100644
if (actual_mime_type) if (actual_mime_type)
*actual_mime_type = mime_types[i]; *actual_mime_type = mime_types[i];
diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h diff --git content/browser/plugin_service_impl.h content/browser/plugin_service_impl.h
index 3ce3ad55eef18..77674a7224551 100644 index 3ce3ad55eef1..77674a722455 100644
--- content/browser/plugin_service_impl.h --- content/browser/plugin_service_impl.h
+++ content/browser/plugin_service_impl.h +++ content/browser/plugin_service_impl.h
@@ -54,6 +54,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService { @@ -54,6 +54,7 @@ class CONTENT_EXPORT PluginServiceImpl : public PluginService {
@@ -136,7 +136,7 @@ index 3ce3ad55eef18..77674a7224551 100644
const std::string& mime_type, const std::string& mime_type,
bool allow_wildcard, bool allow_wildcard,
diff --git content/browser/renderer_host/plugin_registry_impl.cc content/browser/renderer_host/plugin_registry_impl.cc diff --git content/browser/renderer_host/plugin_registry_impl.cc content/browser/renderer_host/plugin_registry_impl.cc
index a6d6188fb1390..7ac57de6fd55a 100644 index a6d6188fb139..7ac57de6fd55 100644
--- content/browser/renderer_host/plugin_registry_impl.cc --- content/browser/renderer_host/plugin_registry_impl.cc
+++ content/browser/renderer_host/plugin_registry_impl.cc +++ content/browser/renderer_host/plugin_registry_impl.cc
@@ -29,6 +29,7 @@ void PluginRegistryImpl::Bind( @@ -29,6 +29,7 @@ void PluginRegistryImpl::Bind(
@@ -169,7 +169,7 @@ index a6d6188fb1390..7ac57de6fd55a 100644
auto plugin_blink = blink::mojom::PluginInfo::New(); auto plugin_blink = blink::mojom::PluginInfo::New();
plugin_blink->name = plugin.name; plugin_blink->name = plugin.name;
diff --git content/browser/renderer_host/plugin_registry_impl.h content/browser/renderer_host/plugin_registry_impl.h diff --git content/browser/renderer_host/plugin_registry_impl.h content/browser/renderer_host/plugin_registry_impl.h
index 632ae86c6fd69..55b749ec12421 100644 index 632ae86c6fd6..55b749ec1242 100644
--- content/browser/renderer_host/plugin_registry_impl.h --- content/browser/renderer_host/plugin_registry_impl.h
+++ content/browser/renderer_host/plugin_registry_impl.h +++ content/browser/renderer_host/plugin_registry_impl.h
@@ -24,11 +24,13 @@ class PluginRegistryImpl : public blink::mojom::PluginRegistry { @@ -24,11 +24,13 @@ class PluginRegistryImpl : public blink::mojom::PluginRegistry {
@@ -188,7 +188,7 @@ index 632ae86c6fd69..55b749ec12421 100644
const std::vector<WebPluginInfo>& all_plugins); const std::vector<WebPluginInfo>& all_plugins);
diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc
index e5b9d4722ff48..e15707aa31976 100644 index 08a3eb686360..010f22ef2b06 100644
--- content/browser/renderer_host/render_frame_host_impl.cc --- content/browser/renderer_host/render_frame_host_impl.cc
+++ content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc
@@ -10749,6 +10749,7 @@ void RenderFrameHostImpl::BindHungDetectorHost( @@ -10749,6 +10749,7 @@ void RenderFrameHostImpl::BindHungDetectorHost(
@@ -210,10 +210,10 @@ index e5b9d4722ff48..e15707aa31976 100644
std::move(callback).Run(found, info, actual_mime_type); std::move(callback).Run(found, info, actual_mime_type);
} }
diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h diff --git content/browser/renderer_host/render_frame_host_impl.h content/browser/renderer_host/render_frame_host_impl.h
index d8d7676dc885c..0cf11c7de7454 100644 index d4a16dbf87ad..ee946606eb14 100644
--- content/browser/renderer_host/render_frame_host_impl.h --- content/browser/renderer_host/render_frame_host_impl.h
+++ content/browser/renderer_host/render_frame_host_impl.h +++ content/browser/renderer_host/render_frame_host_impl.h
@@ -2338,6 +2338,7 @@ class CONTENT_EXPORT RenderFrameHostImpl @@ -2339,6 +2339,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
int32_t plugin_child_id, int32_t plugin_child_id,
const base::FilePath& path) override; const base::FilePath& path) override;
void GetPluginInfo(const GURL& url, void GetPluginInfo(const GURL& url,
@@ -222,7 +222,7 @@ index d8d7676dc885c..0cf11c7de7454 100644
const std::string& mime_type, const std::string& mime_type,
GetPluginInfoCallback callback) override; GetPluginInfoCallback callback) override;
diff --git content/common/pepper_plugin.mojom content/common/pepper_plugin.mojom diff --git content/common/pepper_plugin.mojom content/common/pepper_plugin.mojom
index a544bfed7ed85..60aad01350c2f 100644 index a544bfed7ed8..60aad01350c2 100644
--- content/common/pepper_plugin.mojom --- content/common/pepper_plugin.mojom
+++ content/common/pepper_plugin.mojom +++ content/common/pepper_plugin.mojom
@@ -29,6 +29,7 @@ interface PepperHost { @@ -29,6 +29,7 @@ interface PepperHost {
@@ -234,7 +234,7 @@ index a544bfed7ed85..60aad01350c2f 100644
string mime_type) => string mime_type) =>
(bool found, (bool found,
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 0fadf2a320b0c..8c491e3b48064 100644 index 0fadf2a320b0..8c491e3b4806 100644
--- content/public/browser/content_browser_client.cc --- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
@@ -247,7 +247,7 @@ index 0fadf2a320b0c..8c491e3b48064 100644
#include <utility> #include <utility>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index b031e69e4fe09..8c91423f8c140 100644 index b031e69e4fe0..8c91423f8c14 100644
--- content/public/browser/content_browser_client.h --- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
@@ -285,7 +285,7 @@ index b031e69e4fe09..8c91423f8c140 100644
virtual std::string GetUserAgent(); virtual std::string GetUserAgent();
diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h diff --git content/public/browser/plugin_service.h content/public/browser/plugin_service.h
index 90fb0fcfa822b..d48e64b1573ca 100644 index 90fb0fcfa822..d48e64b1573c 100644
--- content/public/browser/plugin_service.h --- content/public/browser/plugin_service.h
+++ content/public/browser/plugin_service.h +++ content/public/browser/plugin_service.h
@@ -73,6 +73,7 @@ class CONTENT_EXPORT PluginService { @@ -73,6 +73,7 @@ class CONTENT_EXPORT PluginService {
@@ -297,7 +297,7 @@ index 90fb0fcfa822b..d48e64b1573ca 100644
const std::string& mime_type, const std::string& mime_type,
bool allow_wildcard, bool allow_wildcard,
diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h diff --git content/public/browser/plugin_service_filter.h content/public/browser/plugin_service_filter.h
index 98c59005599e4..69752184745d3 100644 index 98c59005599e..69752184745d 100644
--- content/public/browser/plugin_service_filter.h --- content/public/browser/plugin_service_filter.h
+++ content/public/browser/plugin_service_filter.h +++ content/public/browser/plugin_service_filter.h
@@ -32,6 +32,7 @@ class PluginServiceFilter { @@ -32,6 +32,7 @@ class PluginServiceFilter {
@@ -309,7 +309,7 @@ index 98c59005599e4..69752184745d3 100644
WebPluginInfo* plugin) = 0; WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index f84df6e581606..38e5eeef558b6 100644 index f84df6e58160..38e5eeef558b 100644
--- content/public/renderer/content_renderer_client.h --- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h +++ content/public/renderer/content_renderer_client.h
@@ -82,6 +82,9 @@ class CONTENT_EXPORT ContentRendererClient { @@ -82,6 +82,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -334,7 +334,7 @@ index f84df6e581606..38e5eeef558b6 100644
// started. // started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {} virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 580974507f1a3..86a0514c8b558 100644 index 580974507f1a..86a0514c8b55 100644
--- content/renderer/render_frame_impl.cc --- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc +++ content/renderer/render_frame_impl.cc
@@ -3548,7 +3548,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -3548,7 +3548,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -348,7 +348,7 @@ index 580974507f1a3..86a0514c8b558 100644
&mime_type); &mime_type);
if (!found) if (!found)
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 36365398f8fae..b2d3fa8798563 100644 index ed9d15a2832c..7603a77eb945 100644
--- content/renderer/render_thread_impl.cc --- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc +++ content/renderer/render_thread_impl.cc
@@ -618,6 +618,8 @@ void RenderThreadImpl::Init() { @@ -618,6 +618,8 @@ void RenderThreadImpl::Init() {
@@ -361,7 +361,7 @@ index 36365398f8fae..b2d3fa8798563 100644
&RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this))); &RenderThreadImpl::OnRendererInterfaceReceiver, base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index 7aec578843ce5..f631601f1bb1e 100644 index 7aec578843ce..f631601f1bb1 100644
--- content/renderer/renderer_blink_platform_impl.cc --- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc +++ content/renderer/renderer_blink_platform_impl.cc
@@ -1022,6 +1022,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() { @@ -1022,6 +1022,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -381,7 +381,7 @@ index 7aec578843ce5..f631601f1bb1e 100644
if (!code_cache_host_) { if (!code_cache_host_) {
code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>( code_cache_host_ = mojo::SharedRemote<blink::mojom::CodeCacheHost>(
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 7a836b82ee155..8e026751ce350 100644 index 7a836b82ee15..8e026751ce35 100644
--- content/renderer/renderer_blink_platform_impl.h --- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h +++ content/renderer/renderer_blink_platform_impl.h
@@ -220,6 +220,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -220,6 +220,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -395,7 +395,7 @@ index 7a836b82ee155..8e026751ce350 100644
// plus eTLD+1, such as https://google.com), or to a more specific origin. // plus eTLD+1, such as https://google.com), or to a more specific origin.
void SetIsLockedToSite(); void SetIsLockedToSite();
diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc diff --git content/shell/browser/shell_plugin_service_filter.cc content/shell/browser/shell_plugin_service_filter.cc
index c25b7d1a18432..7e007d964f1a1 100644 index c25b7d1a1843..7e007d964f1a 100644
--- content/shell/browser/shell_plugin_service_filter.cc --- content/shell/browser/shell_plugin_service_filter.cc
+++ content/shell/browser/shell_plugin_service_filter.cc +++ content/shell/browser/shell_plugin_service_filter.cc
@@ -17,6 +17,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable( @@ -17,6 +17,7 @@ bool ShellPluginServiceFilter::IsPluginAvailable(
@@ -407,7 +407,7 @@ index c25b7d1a18432..7e007d964f1a1 100644
WebPluginInfo* plugin) { WebPluginInfo* plugin) {
return plugin->name == u"Blink Test Plugin" || return plugin->name == u"Blink Test Plugin" ||
diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h diff --git content/shell/browser/shell_plugin_service_filter.h content/shell/browser/shell_plugin_service_filter.h
index 337b4b0653fe2..107ab4c9d8a85 100644 index 337b4b0653fe..107ab4c9d8a8 100644
--- content/shell/browser/shell_plugin_service_filter.h --- content/shell/browser/shell_plugin_service_filter.h
+++ content/shell/browser/shell_plugin_service_filter.h +++ content/shell/browser/shell_plugin_service_filter.h
@@ -20,6 +20,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter { @@ -20,6 +20,7 @@ class ShellPluginServiceFilter : public PluginServiceFilter {
@@ -419,7 +419,7 @@ index 337b4b0653fe2..107ab4c9d8a85 100644
WebPluginInfo* plugin) override; WebPluginInfo* plugin) override;
diff --git content/test/fake_plugin_service.cc content/test/fake_plugin_service.cc diff --git content/test/fake_plugin_service.cc content/test/fake_plugin_service.cc
index f816fe5382c7e..7846e2b908675 100644 index f816fe5382c7..7846e2b90867 100644
--- content/test/fake_plugin_service.cc --- content/test/fake_plugin_service.cc
+++ content/test/fake_plugin_service.cc +++ content/test/fake_plugin_service.cc
@@ -28,6 +28,7 @@ bool FakePluginService::GetPluginInfoArray( @@ -28,6 +28,7 @@ bool FakePluginService::GetPluginInfoArray(
@@ -431,7 +431,7 @@ index f816fe5382c7e..7846e2b908675 100644
const std::string& mime_type, const std::string& mime_type,
bool allow_wildcard, bool allow_wildcard,
diff --git content/test/fake_plugin_service.h content/test/fake_plugin_service.h diff --git content/test/fake_plugin_service.h content/test/fake_plugin_service.h
index e5f53ee41161e..b9d73ebee4ec8 100644 index e5f53ee41161..b9d73ebee4ec 100644
--- content/test/fake_plugin_service.h --- content/test/fake_plugin_service.h
+++ content/test/fake_plugin_service.h +++ content/test/fake_plugin_service.h
@@ -29,6 +29,7 @@ class FakePluginService : public PluginService { @@ -29,6 +29,7 @@ class FakePluginService : public PluginService {

10
patch/patches/content_main_654986.patch
View File

@@ -1,5 +1,5 @@
diff --git content/app/content_main.cc content/app/content_main.cc diff --git content/app/content_main.cc content/app/content_main.cc
index 2aba28d210db9..00edc202e2c46 100644 index 2aba28d210db..00edc202e2c4 100644
--- content/app/content_main.cc --- content/app/content_main.cc
+++ content/app/content_main.cc +++ content/app/content_main.cc
@@ -205,15 +205,10 @@ void InitializeMojo(mojo::core::Configuration* config) { @@ -205,15 +205,10 @@ void InitializeMojo(mojo::core::Configuration* config) {
@@ -111,7 +111,7 @@ index 2aba28d210db9..00edc202e2c46 100644
return RunContentProcess(params, runner.get()); return RunContentProcess(params, runner.get());
} }
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index 81e48e33cad43..84eabf287b0e9 100644 index 81e48e33cad4..84eabf287b0e 100644
--- content/app/content_main_runner_impl.cc --- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc +++ content/app/content_main_runner_impl.cc
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
@@ -135,7 +135,7 @@ index 81e48e33cad43..84eabf287b0e9 100644
std::unique_ptr<ContentMainRunner> ContentMainRunner::Create() { std::unique_ptr<ContentMainRunner> ContentMainRunner::Create() {
return ContentMainRunnerImpl::Create(); return ContentMainRunnerImpl::Create();
diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h
index 86c624e53cf99..090171f7db228 100644 index 86c624e53cf9..090171f7db22 100644
--- content/app/content_main_runner_impl.h --- content/app/content_main_runner_impl.h
+++ content/app/content_main_runner_impl.h +++ content/app/content_main_runner_impl.h
@@ -39,7 +39,7 @@ class ContentMainDelegate; @@ -39,7 +39,7 @@ class ContentMainDelegate;
@@ -157,7 +157,7 @@ index 86c624e53cf99..090171f7db228 100644
int RunBrowser(MainFunctionParams& main_function_params, int RunBrowser(MainFunctionParams& main_function_params,
bool start_minimal_browser); bool start_minimal_browser);
diff --git content/common/set_process_title.cc content/common/set_process_title.cc diff --git content/common/set_process_title.cc content/common/set_process_title.cc
index 8b829a4887739..a69a088697287 100644 index 8b829a488773..a69a08869728 100644
--- content/common/set_process_title.cc --- content/common/set_process_title.cc
+++ content/common/set_process_title.cc +++ content/common/set_process_title.cc
@@ -54,7 +54,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) { @@ -54,7 +54,7 @@ void SetProcessTitleFromCommandLine(const char** main_argv) {
@@ -170,7 +170,7 @@ index 8b829a4887739..a69a088697287 100644
if (main_argv) if (main_argv)
setproctitle_init(main_argv); setproctitle_init(main_argv);
diff --git content/public/app/content_main.h content/public/app/content_main.h diff --git content/public/app/content_main.h content/public/app/content_main.h
index 97aac3d0c7584..fc795ae0287f9 100644 index 97aac3d0c758..fc795ae0287f 100644
--- content/public/app/content_main.h --- content/public/app/content_main.h
+++ content/public/app/content_main.h +++ content/public/app/content_main.h
@@ -68,7 +68,16 @@ struct ContentMainParams { @@ -68,7 +68,16 @@ struct ContentMainParams {

22
patch/patches/crashpad_1995.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
index 9b08e23e921b0..49182504ae361 100644 index 9b08e23e921b..49182504ae36 100644
--- chrome/chrome_elf/BUILD.gn --- chrome/chrome_elf/BUILD.gn
+++ chrome/chrome_elf/BUILD.gn +++ chrome/chrome_elf/BUILD.gn
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
@@ -47,7 +47,7 @@ index 9b08e23e921b0..49182504ae361 100644
source_set("dll_hash") { source_set("dll_hash") {
diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc
index 886372e114899..ad3bc2242883b 100644 index 886372e11489..ad3bc2242883 100644
--- chrome/chrome_elf/crash/crash_helper.cc --- chrome/chrome_elf/crash/crash_helper.cc
+++ chrome/chrome_elf/crash/crash_helper.cc +++ chrome/chrome_elf/crash/crash_helper.cc
@@ -11,12 +11,17 @@ @@ -11,12 +11,17 @@
@@ -81,7 +81,7 @@ index 886372e114899..ad3bc2242883b 100644
g_crash_helper_enabled = true; g_crash_helper_enabled = true;
return true; return true;
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
index b84f727c9dc64..817df167e5a6b 100644 index b84f727c9dc6..817df167e5a6 100644
--- chrome/common/crash_keys.cc --- chrome/common/crash_keys.cc
+++ chrome/common/crash_keys.cc +++ chrome/common/crash_keys.cc
@@ -4,6 +4,8 @@ @@ -4,6 +4,8 @@
@@ -112,7 +112,7 @@ index b84f727c9dc64..817df167e5a6b 100644
void SetActiveExtensions(const std::set<std::string>& extensions) { void SetActiveExtensions(const std::set<std::string>& extensions) {
diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h diff --git chrome/common/crash_keys.h chrome/common/crash_keys.h
index bcf172e645a23..f879aa745adfc 100644 index bcf172e645a2..f879aa745adf 100644
--- chrome/common/crash_keys.h --- chrome/common/crash_keys.h
+++ chrome/common/crash_keys.h +++ chrome/common/crash_keys.h
@@ -17,6 +17,10 @@ class CommandLine; @@ -17,6 +17,10 @@ class CommandLine;
@@ -127,7 +127,7 @@ index bcf172e645a23..f879aa745adfc 100644
// on the given |command_line|. // on the given |command_line|.
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line); void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc
index 00009dacdc2b0..e6454d5b1a23d 100644 index 00009dacdc2b..e6454d5b1a23 100644
--- components/crash/core/app/breakpad_linux.cc --- components/crash/core/app/breakpad_linux.cc
+++ components/crash/core/app/breakpad_linux.cc +++ components/crash/core/app/breakpad_linux.cc
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
@@ -203,7 +203,7 @@ index 00009dacdc2b0..e6454d5b1a23d 100644
writer.Flush(); writer.Flush();
} }
diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h
index 9ea80370a842c..3043f7d32f33d 100644 index 9ea80370a842..3043f7d32f33 100644
--- components/crash/core/app/breakpad_linux.h --- components/crash/core/app/breakpad_linux.h
+++ components/crash/core/app/breakpad_linux.h +++ components/crash/core/app/breakpad_linux.h
@@ -20,6 +20,9 @@ extern void InitCrashReporter(const std::string& process_type); @@ -20,6 +20,9 @@ extern void InitCrashReporter(const std::string& process_type);
@@ -217,7 +217,7 @@ index 9ea80370a842c..3043f7d32f33d 100644
extern void InitCrashKeysForTesting(); extern void InitCrashKeysForTesting();
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
index 89b4bfccd5d32..7cb0a85470d2f 100644 index 89b4bfccd5d3..7cb0a85470d2 100644
--- components/crash/core/app/crash_reporter_client.cc --- components/crash/core/app/crash_reporter_client.cc
+++ components/crash/core/app/crash_reporter_client.cc +++ components/crash/core/app/crash_reporter_client.cc
@@ -87,7 +87,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() { @@ -87,7 +87,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
@@ -290,7 +290,7 @@ index 89b4bfccd5d32..7cb0a85470d2f 100644
} // namespace crash_reporter } // namespace crash_reporter
diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
index 39557cce47443..236806090021a 100644 index 39557cce4744..236806090021 100644
--- components/crash/core/app/crash_reporter_client.h --- components/crash/core/app/crash_reporter_client.h
+++ components/crash/core/app/crash_reporter_client.h +++ components/crash/core/app/crash_reporter_client.h
@@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
@@ -357,7 +357,7 @@ index 39557cce47443..236806090021a 100644
} // namespace crash_reporter } // namespace crash_reporter
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
index 27f5504d544a3..fd901ccd5b759 100644 index 27f5504d544a..fd901ccd5b75 100644
--- components/crash/core/app/crashpad.cc --- components/crash/core/app/crashpad.cc
+++ components/crash/core/app/crashpad.cc +++ components/crash/core/app/crashpad.cc
@@ -152,7 +152,8 @@ void InitializeCrashpadImpl(bool initial_client, @@ -152,7 +152,8 @@ void InitializeCrashpadImpl(bool initial_client,
@@ -371,7 +371,7 @@ index 27f5504d544a3..fd901ccd5b759 100644
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled); ->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
} }
diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
index 2be2fd857bc5f..04ebef6442af2 100644 index 2be2fd857bc5..04ebef6442af 100644
--- components/crash/core/app/crashpad_mac.mm --- components/crash/core/app/crashpad_mac.mm
+++ components/crash/core/app/crashpad_mac.mm +++ components/crash/core/app/crashpad_mac.mm
@@ -16,12 +16,15 @@ @@ -16,12 +16,15 @@
@@ -475,7 +475,7 @@ index 2be2fd857bc5f..04ebef6442af2 100644
handler_path, database_path, metrics_path, url, handler_path, database_path, metrics_path, url,
GetProcessSimpleAnnotations(), arguments, true, false); GetProcessSimpleAnnotations(), arguments, true, false);
diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
index 686be7964d77d..6059aab2b69a7 100644 index 686be7964d77..6059aab2b69a 100644
--- components/crash/core/app/crashpad_win.cc --- components/crash/core/app/crashpad_win.cc
+++ components/crash/core/app/crashpad_win.cc +++ components/crash/core/app/crashpad_win.cc
@@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations( @@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(

16
patch/patches/crashpad_tp_1995.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc
index 492d466239d1a..a1df635870ede 100644 index 492d466239d1..a1df635870ed 100644
--- third_party/crashpad/crashpad/client/prune_crash_reports.cc --- third_party/crashpad/crashpad/client/prune_crash_reports.cc
+++ third_party/crashpad/crashpad/client/prune_crash_reports.cc +++ third_party/crashpad/crashpad/client/prune_crash_reports.cc
@@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database, @@ -73,13 +73,19 @@ size_t PruneCrashReportDatabase(CrashReportDatabase* database,
@@ -26,7 +26,7 @@ index 492d466239d1a..a1df635870ede 100644
static const time_t kSecondsInDay = 60 * 60 * 24; static const time_t kSecondsInDay = 60 * 60 * 24;
diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h
index 07a70980f12af..ddf7f17325fed 100644 index 07a70980f12a..ddf7f17325fe 100644
--- third_party/crashpad/crashpad/client/prune_crash_reports.h --- third_party/crashpad/crashpad/client/prune_crash_reports.h
+++ third_party/crashpad/crashpad/client/prune_crash_reports.h +++ third_party/crashpad/crashpad/client/prune_crash_reports.h
@@ -59,7 +59,8 @@ class PruneCondition { @@ -59,7 +59,8 @@ class PruneCondition {
@@ -40,7 +40,7 @@ index 07a70980f12af..ddf7f17325fed 100644
virtual ~PruneCondition() {} virtual ~PruneCondition() {}
diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
index 0aa525f1b4c00..2ddb73e7dd0cb 100644 index 0aa525f1b4c0..2ddb73e7dd0c 100644
--- third_party/crashpad/crashpad/client/settings.cc --- third_party/crashpad/crashpad/client/settings.cc
+++ third_party/crashpad/crashpad/client/settings.cc +++ third_party/crashpad/crashpad/client/settings.cc
@@ -86,7 +86,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) { @@ -86,7 +86,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
@@ -130,7 +130,7 @@ index 0aa525f1b4c00..2ddb73e7dd0cb 100644
Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle( Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
FileHandle file, FileHandle file,
diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
index 5761c6b965b5c..aee4e6c96033e 100644 index 5761c6b965b5..aee4e6c96033 100644
--- third_party/crashpad/crashpad/client/settings.h --- third_party/crashpad/crashpad/client/settings.h
+++ third_party/crashpad/crashpad/client/settings.h +++ third_party/crashpad/crashpad/client/settings.h
@@ -115,6 +115,11 @@ class Settings { @@ -115,6 +115,11 @@ class Settings {
@@ -146,7 +146,7 @@ index 5761c6b965b5c..aee4e6c96033e 100644
struct Data; struct Data;
diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
index 1d5951e8fc00c..599dde825883e 100644 index 1d5951e8fc00..599dde825883 100644
--- third_party/crashpad/crashpad/handler/BUILD.gn --- third_party/crashpad/crashpad/handler/BUILD.gn
+++ third_party/crashpad/crashpad/handler/BUILD.gn +++ third_party/crashpad/crashpad/handler/BUILD.gn
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@@ -184,7 +184,7 @@ index 1d5951e8fc00c..599dde825883e 100644
if (crashpad_is_win) { if (crashpad_is_win) {
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
index b7e445fd9f3ed..c5f1a3c3ceee7 100644 index b7e445fd9f3e..c5f1a3c3ceee 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -263,6 +263,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport( @@ -263,6 +263,8 @@ CrashReportUploadThread::UploadResult CrashReportUploadThread::UploadReport(
@@ -197,7 +197,7 @@ index b7e445fd9f3ed..c5f1a3c3ceee7 100644
if (!reader->SeekSet(start_offset)) { if (!reader->SeekSet(start_offset)) {
diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
index 2ec1147d2620d..8ff9a72e0bd79 100644 index 2ec1147d2620..8ff9a72e0bd7 100644
--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h --- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h +++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
@@ -248,7 +248,7 @@ index 2ec1147d2620d..8ff9a72e0bd79 100644
//! \brief Calls ProcessPendingReports() in response to ReportPending() having //! \brief Calls ProcessPendingReports() in response to ReportPending() having
//! been called on any thread, as well as periodically on a timer. //! been called on any thread, as well as periodically on a timer.
diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
index 737ee4e09f676..f5a8727f7e6b1 100644 index 737ee4e09f67..f5a8727f7e6b 100644
--- third_party/crashpad/crashpad/handler/handler_main.cc --- third_party/crashpad/crashpad/handler/handler_main.cc
+++ third_party/crashpad/crashpad/handler/handler_main.cc +++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@

2
patch/patches/embedder_product_override.patch
View File

@@ -1,5 +1,5 @@
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
index 569518f209aeb..a4944e7060570 100644 index 569518f209ae..a4944e706057 100644
--- components/embedder_support/user_agent_utils.cc --- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc +++ components/embedder_support/user_agent_utils.cc
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@

10
patch/patches/extensions_1947.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc diff --git chrome/browser/extensions/api/streams_private/streams_private_api.cc chrome/browser/extensions/api/streams_private/streams_private_api.cc
index 5c903a13a14ed..d385c6c0c95c4 100644 index 5c903a13a14e..d385c6c0c95c 100644
--- chrome/browser/extensions/api/streams_private/streams_private_api.cc --- chrome/browser/extensions/api/streams_private/streams_private_api.cc
+++ chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
@@ -27,7 +27,7 @@ index 5c903a13a14ed..d385c6c0c95c4 100644
auto* browser_context = web_contents->GetBrowserContext(); auto* browser_context = web_contents->GetBrowserContext();
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 231a3b6c8ce1d..14776d981f506 100644 index 231a3b6c8ce1..14776d981f50 100644
--- extensions/browser/extension_host.cc --- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc +++ extensions/browser/extension_host.cc
@@ -63,11 +63,12 @@ ExtensionHost::ExtensionHost(const Extension* extension, @@ -63,11 +63,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@@ -92,7 +92,7 @@ index 231a3b6c8ce1d..14776d981f506 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this); ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index 305726557f2ea..caa4b798a013e 100644 index 305726557f2e..caa4b798a013 100644
--- extensions/browser/extension_host.h --- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h +++ extensions/browser/extension_host.h
@@ -53,13 +53,19 @@ class ExtensionHost : public DeferredStartRenderHost, @@ -53,13 +53,19 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -127,7 +127,7 @@ index 305726557f2ea..caa4b798a013e 100644
// A pointer to the current or speculative main frame in `host_contents_`. We // 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 // 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 diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index 7eb3d073c7b79..3844a9c6033a5 100644 index 7eb3d073c7b7..3844a9c6033a 100644
--- extensions/browser/extensions_browser_client.h --- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h +++ extensions/browser/extensions_browser_client.h
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
@@ -162,7 +162,7 @@ index 7eb3d073c7b79..3844a9c6033a5 100644
// once each time the extensions system is loaded per browser_context. The // once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current // implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index 26bff09c646be..830ff12c5fc9c 100644 index 26bff09c646b..830ff12c5fc9 100644
--- extensions/browser/process_manager.cc --- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc +++ extensions/browser/process_manager.cc
@@ -392,9 +392,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension, @@ -392,9 +392,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,

2
patch/patches/font_family_cache_1501.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
index 0e5573a7326a2..28eb26fb7af55 100644 index 0e5573a7326a..28eb26fb7af5 100644
--- chrome/browser/font_family_cache.h --- chrome/browser/font_family_cache.h
+++ chrome/browser/font_family_cache.h +++ chrome/browser/font_family_cache.h
@@ -19,6 +19,8 @@ class Profile; @@ -19,6 +19,8 @@ class Profile;

16
patch/patches/gn_config.patch
View File

@@ -1,5 +1,5 @@
diff --git .gn .gn diff --git .gn .gn
index 5b010cc8b0147..6f7dce7dd8e4b 100644 index 5b010cc8b014..6f7dce7dd8e4 100644
--- .gn --- .gn
+++ .gn +++ .gn
@@ -184,6 +184,8 @@ exec_script_whitelist = @@ -184,6 +184,8 @@ exec_script_whitelist =
@@ -12,7 +12,7 @@ index 5b010cc8b0147..6f7dce7dd8e4b 100644
# https://crbug.com/474506. # https://crbug.com/474506.
"//clank/java/BUILD.gn", "//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn diff --git BUILD.gn BUILD.gn
index 106e853ef8179..2d2fa6b9c284f 100644 index 106e853ef817..2d2fa6b9c284 100644
--- BUILD.gn --- BUILD.gn
+++ BUILD.gn +++ BUILD.gn
@@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni") @@ -16,6 +16,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@@ -34,7 +34,7 @@ index 106e853ef8179..2d2fa6b9c284f 100644
deps += [ deps += [
"//ios:all", "//ios:all",
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
index 982fbe8d3f0d0..e757be4688f10 100644 index 982fbe8d3f0d..e757be4688f1 100644
--- build/config/win/visual_studio_version.gni --- build/config/win/visual_studio_version.gni
+++ build/config/win/visual_studio_version.gni +++ build/config/win/visual_studio_version.gni
@@ -12,9 +12,8 @@ declare_args() { @@ -12,9 +12,8 @@ declare_args() {
@@ -66,7 +66,7 @@ index 982fbe8d3f0d0..e757be4688f10 100644
+ "studio path") + "studio path")
} }
diff --git chrome/app/framework.order chrome/app/framework.order diff --git chrome/app/framework.order chrome/app/framework.order
index 839144aa1e9bd..29c8ab32398a7 100644 index 839144aa1e9b..29c8ab32398a 100644
--- chrome/app/framework.order --- chrome/app/framework.order
+++ chrome/app/framework.order +++ chrome/app/framework.order
@@ -28,3 +28,8 @@ _ChromeMain @@ -28,3 +28,8 @@ _ChromeMain
@@ -79,7 +79,7 @@ index 839144aa1e9bd..29c8ab32398a7 100644
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow +_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+ +
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 8e17878f175bf..3d8fc8848fe9c 100644 index 8e17878f175b..3d8fc8848fe9 100644
--- chrome/chrome_paks.gni --- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni +++ chrome/chrome_paks.gni
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
@@ -102,7 +102,7 @@ index 8e17878f175bf..3d8fc8848fe9c 100644
sources += [ sources += [
"$root_gen_dir/chrome/extensions_resources.pak", "$root_gen_dir/chrome/extensions_resources.pak",
diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni diff --git chrome/chrome_repack_locales.gni chrome/chrome_repack_locales.gni
index a64a23560460a..b08eee1f789a7 100644 index a64a23560460..b08eee1f789a 100644
--- chrome/chrome_repack_locales.gni --- chrome/chrome_repack_locales.gni
+++ chrome/chrome_repack_locales.gni +++ chrome/chrome_repack_locales.gni
@@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni") @@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni")
@@ -125,7 +125,7 @@ index a64a23560460a..b08eee1f789a7 100644
source_patterns += source_patterns +=
[ "${root_gen_dir}/extensions/strings/extensions_strings_" ] [ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
index ae43217ef2075..2f0b956872631 100644 index ae43217ef207..2f0b95687263 100644
--- chrome/installer/mini_installer/BUILD.gn --- chrome/installer/mini_installer/BUILD.gn
+++ chrome/installer/mini_installer/BUILD.gn +++ chrome/installer/mini_installer/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni") @@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni")
@@ -152,7 +152,7 @@ index ae43217ef2075..2f0b956872631 100644
outputs = [ outputs = [
# See also chrome.packed.7z conditionally added below. # See also chrome.packed.7z conditionally added below.
diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni diff --git tools/grit/grit_defines.gni tools/grit/grit_defines.gni
index 5b92d7a6cd920..ceb274146131c 100644 index 5b92d7a6cd92..ceb274146131 100644
--- tools/grit/grit_defines.gni --- tools/grit/grit_defines.gni
+++ tools/grit/grit_defines.gni +++ tools/grit/grit_defines.gni
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@

2
patch/patches/gritsettings.patch
View File

@@ -1,5 +1,5 @@
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
index 1d3809cbdc35c..f5206f1c96c32 100644 index 1d3809cbdc35..f5206f1c96c3 100644
--- tools/gritsettings/resource_ids.spec --- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec +++ tools/gritsettings/resource_ids.spec
@@ -750,4 +750,13 @@ @@ -750,4 +750,13 @@

2
patch/patches/ime_1610.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc diff --git ui/base/ime/win/input_method_win_base.cc ui/base/ime/win/input_method_win_base.cc
index bc80f95a6892a..43a87836ebd3e 100644 index bc80f95a6892..43a87836ebd3 100644
--- ui/base/ime/win/input_method_win_base.cc --- ui/base/ime/win/input_method_win_base.cc
+++ ui/base/ime/win/input_method_win_base.cc +++ ui/base/ime/win/input_method_win_base.cc
@@ -262,8 +262,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const { @@ -262,8 +262,9 @@ bool InputMethodWinBase::IsWindowFocused(const TextInputClient* client) const {

2
patch/patches/libxml_visibility.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn diff --git third_party/libxml/BUILD.gn third_party/libxml/BUILD.gn
index 8068e573cbd48..2fc10cf03bc50 100644 index 8068e573cbd4..2fc10cf03bc5 100644
--- third_party/libxml/BUILD.gn --- third_party/libxml/BUILD.gn
+++ third_party/libxml/BUILD.gn +++ third_party/libxml/BUILD.gn
@@ -142,6 +142,7 @@ static_library("libxml") { @@ -142,6 +142,7 @@ static_library("libxml") {

6
patch/patches/linux_assets_path_1936.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc diff --git content/browser/child_process_launcher_helper_linux.cc content/browser/child_process_launcher_helper_linux.cc
index f3d40b628ec20..7efc41048b3c1 100644 index f3d40b628ec2..7efc41048b3c 100644
--- content/browser/child_process_launcher_helper_linux.cc --- content/browser/child_process_launcher_helper_linux.cc
+++ content/browser/child_process_launcher_helper_linux.cc +++ content/browser/child_process_launcher_helper_linux.cc
@@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread( @@ -162,7 +162,7 @@ void ChildProcessLauncherHelper::SetProcessPriorityOnLauncherThread(
@@ -12,7 +12,7 @@ index f3d40b628ec20..7efc41048b3c1 100644
base::File file(exe_dir.Append(path), base::File file(exe_dir.Append(path),
base::File::FLAG_OPEN | base::File::FLAG_READ); base::File::FLAG_OPEN | base::File::FLAG_READ);
diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc diff --git sandbox/linux/suid/client/setuid_sandbox_host.cc sandbox/linux/suid/client/setuid_sandbox_host.cc
index 0aaed76c1dda2..517c3d8b57725 100644 index 0aaed76c1dda..517c3d8b5772 100644
--- sandbox/linux/suid/client/setuid_sandbox_host.cc --- sandbox/linux/suid/client/setuid_sandbox_host.cc
+++ sandbox/linux/suid/client/setuid_sandbox_host.cc +++ sandbox/linux/suid/client/setuid_sandbox_host.cc
@@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() { @@ -120,7 +120,7 @@ bool SetuidSandboxHost::IsDisabledViaEnvironment() {
@@ -25,7 +25,7 @@ index 0aaed76c1dda2..517c3d8b57725 100644
if (base::PathExists(sandbox_candidate)) if (base::PathExists(sandbox_candidate))
sandbox_binary = sandbox_candidate; sandbox_binary = sandbox_candidate;
diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc diff --git ui/gl/init/gl_initializer_linux_x11.cc ui/gl/init/gl_initializer_linux_x11.cc
index 016046d6caa4f..116e4919cda08 100644 index 016046d6caa4..116e4919cda0 100644
--- ui/gl/init/gl_initializer_linux_x11.cc --- ui/gl/init/gl_initializer_linux_x11.cc
+++ ui/gl/init/gl_initializer_linux_x11.cc +++ ui/gl/init/gl_initializer_linux_x11.cc
@@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) { @@ -82,7 +82,7 @@ bool InitializeStaticEGLInternalFromLibrary(GLImplementation implementation) {

4
patch/patches/linux_atk_1123214.patch
View File

@@ -1,5 +1,5 @@
diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn diff --git build/config/linux/atk/BUILD.gn build/config/linux/atk/BUILD.gn
index bc8e27894732a..5d06ce988f25f 100644 index bc8e27894732..5d06ce988f25 100644
--- build/config/linux/atk/BUILD.gn --- build/config/linux/atk/BUILD.gn
+++ build/config/linux/atk/BUILD.gn +++ build/config/linux/atk/BUILD.gn
@@ -12,7 +12,7 @@ import("//build/config/ui.gni") @@ -12,7 +12,7 @@ import("//build/config/ui.gni")
@@ -12,7 +12,7 @@ index bc8e27894732a..5d06ce988f25f 100644
if (use_atk) { if (use_atk) {
assert(use_glib, "use_atk=true requires that use_glib=true") assert(use_glib, "use_atk=true requires that use_glib=true")
diff --git build/config/linux/atspi2/BUILD.gn build/config/linux/atspi2/BUILD.gn diff --git build/config/linux/atspi2/BUILD.gn build/config/linux/atspi2/BUILD.gn
index 988a995681361..1791ea607550e 100644 index 988a99568136..1791ea607550 100644
--- build/config/linux/atspi2/BUILD.gn --- build/config/linux/atspi2/BUILD.gn
+++ build/config/linux/atspi2/BUILD.gn +++ build/config/linux/atspi2/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni") @@ -6,7 +6,7 @@ import("//build/config/linux/pkg_config.gni")

2
patch/patches/linux_chrome_page_info_1099927.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/ui/page_info/chrome_page_info_client.cc chrome/browser/ui/page_info/chrome_page_info_client.cc diff --git chrome/browser/ui/page_info/chrome_page_info_client.cc chrome/browser/ui/page_info/chrome_page_info_client.cc
index e2972da9e548d..2f356616ed97c 100644 index e2972da9e548..2f356616ed97 100644
--- chrome/browser/ui/page_info/chrome_page_info_client.cc --- chrome/browser/ui/page_info/chrome_page_info_client.cc
+++ chrome/browser/ui/page_info/chrome_page_info_client.cc +++ chrome/browser/ui/page_info/chrome_page_info_client.cc
@@ -17,5 +17,9 @@ std::unique_ptr<PageInfoDelegate> ChromePageInfoClient::CreatePageInfoDelegate( @@ -17,5 +17,9 @@ std::unique_ptr<PageInfoDelegate> ChromePageInfoClient::CreatePageInfoDelegate(

2
patch/patches/linux_poll_2466.patch
View File

@@ -1,5 +1,5 @@
diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc diff --git base/files/file_path_watcher_linux.cc base/files/file_path_watcher_linux.cc
index 713444ccb2d3e..6759f454d1563 100644 index 713444ccb2d3..6759f454d156 100644
--- base/files/file_path_watcher_linux.cc --- base/files/file_path_watcher_linux.cc
+++ base/files/file_path_watcher_linux.cc +++ base/files/file_path_watcher_linux.cc
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@

2
patch/patches/mac_event_observer_2539.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm
index 7cb3238e97edb..ae800739b6863 100644 index 7cb3238e97ed..ae800739b686 100644
--- content/browser/scheduler/responsiveness/native_event_observer_mac.mm --- content/browser/scheduler/responsiveness/native_event_observer_mac.mm
+++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm +++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm
@@ -12,13 +12,15 @@ namespace content { @@ -12,13 +12,15 @@ namespace content {

2
patch/patches/mac_fling_scheduler_2540.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm
index f10c5d161dd13..92a751dd984e5 100644 index f10c5d161dd1..92a751dd984e 100644
--- content/browser/renderer_host/input/fling_scheduler_mac.mm --- content/browser/renderer_host/input/fling_scheduler_mac.mm
+++ content/browser/renderer_host/input/fling_scheduler_mac.mm +++ content/browser/renderer_host/input/fling_scheduler_mac.mm
@@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() { @@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {

2
patch/patches/mac_gpu.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc diff --git ui/gl/init/gl_initializer_mac.cc ui/gl/init/gl_initializer_mac.cc
index 98f3c5a43da3b..55bef97cfc336 100644 index 98f3c5a43da3..55bef97cfc33 100644
--- ui/gl/init/gl_initializer_mac.cc --- ui/gl/init/gl_initializer_mac.cc
+++ ui/gl/init/gl_initializer_mac.cc +++ ui/gl/init/gl_initializer_mac.cc
@@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() { @@ -46,11 +46,8 @@ bool InitializeOneOffForSandbox() {

6
patch/patches/message_loop.patch
View File

@@ -1,5 +1,5 @@
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
index 0a3f329f4a524..9546c5add9c8c 100644 index 0a3f329f4a52..9546c5add9c8 100644
--- base/message_loop/message_pump_win.cc --- base/message_loop/message_pump_win.cc
+++ base/message_loop/message_pump_win.cc +++ base/message_loop/message_pump_win.cc
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
@@ -30,7 +30,7 @@ index 0a3f329f4a524..9546c5add9c8c 100644
} }
if (has_msg) if (has_msg)
diff --git base/task/current_thread.cc base/task/current_thread.cc diff --git base/task/current_thread.cc base/task/current_thread.cc
index 9641285fde742..51cc852fcc165 100644 index 9641285fde74..51cc852fcc16 100644
--- base/task/current_thread.cc --- base/task/current_thread.cc
+++ base/task/current_thread.cc +++ base/task/current_thread.cc
@@ -48,6 +48,8 @@ void CurrentThread::AddDestructionObserver( @@ -48,6 +48,8 @@ void CurrentThread::AddDestructionObserver(
@@ -43,7 +43,7 @@ index 9641285fde742..51cc852fcc165 100644
current_->RemoveDestructionObserver(destruction_observer); current_->RemoveDestructionObserver(destruction_observer);
} }
diff --git base/task/current_thread.h base/task/current_thread.h diff --git base/task/current_thread.h base/task/current_thread.h
index bdcd661bfa282..823a1d02ca858 100644 index bdcd661bfa28..823a1d02ca85 100644
--- base/task/current_thread.h --- base/task/current_thread.h
+++ base/task/current_thread.h +++ base/task/current_thread.h
@@ -127,6 +127,12 @@ class BASE_EXPORT CurrentThread { @@ -127,6 +127,12 @@ class BASE_EXPORT CurrentThread {

2
patch/patches/message_pump_mac_2495.patch
View File

@@ -1,5 +1,5 @@
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
index 5846dcf03078b..b8d8d9e684161 100644 index 5846dcf03078..b8d8d9e68416 100644
--- base/message_loop/message_pump_mac.mm --- base/message_loop/message_pump_mac.mm
+++ base/message_loop/message_pump_mac.mm +++ base/message_loop/message_pump_mac.mm
@@ -670,7 +670,8 @@ void MessagePumpUIApplication::Detach() { @@ -670,7 +670,8 @@ void MessagePumpUIApplication::Detach() {

8
patch/patches/mime_handler_view_guest_1565_2727.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
index cdbc0273838e5..ee2809a0bb98a 100644 index cdbc0273838e..ee2809a0bb98 100644
--- content/browser/web_contents/web_contents_view.h --- content/browser/web_contents/web_contents_view.h
+++ content/browser/web_contents/web_contents_view.h +++ content/browser/web_contents/web_contents_view.h
@@ -22,7 +22,7 @@ struct DropData; @@ -22,7 +22,7 @@ struct DropData;
@@ -12,7 +12,7 @@ index cdbc0273838e5..ee2809a0bb98a 100644
virtual ~WebContentsView() {} virtual ~WebContentsView() {}
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index e2b5240255bfd..fc0037f552ec1 100644 index e2b5240255bf..fc0037f552ec 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -205,6 +205,8 @@ void MimeHandlerViewGuest::CreateWebContents( @@ -205,6 +205,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -47,7 +47,7 @@ index e2b5240255bfd..fc0037f552ec1 100644
WebContents* source, WebContents* source,
const content::OpenURLParams& params) { const content::OpenURLParams& params) {
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index 7d27e12c4e9a7..55c307b5e86ae 100644 index 7d27e12c4e9a..55c307b5e86a 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -130,6 +130,7 @@ class MimeHandlerViewGuest @@ -130,6 +130,7 @@ class MimeHandlerViewGuest
@@ -59,7 +59,7 @@ index 7d27e12c4e9a7..55c307b5e86ae 100644
// WebContentsDelegate implementation. // WebContentsDelegate implementation.
content::WebContents* OpenURLFromTab( content::WebContents* OpenURLFromTab(
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
index 98689e2614604..a1b08274f4556 100644 index 98689e261460..a1b08274f455 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
@@ -8,9 +8,9 @@ @@ -8,9 +8,9 @@

6
patch/patches/net_cookie_flags.patch
View File

@@ -1,5 +1,5 @@
diff --git net/base/load_flags_list.h net/base/load_flags_list.h diff --git net/base/load_flags_list.h net/base/load_flags_list.h
index 96d1a51ec1078..e8120a818b1f2 100644 index 96d1a51ec107..e8120a818b1f 100644
--- net/base/load_flags_list.h --- net/base/load_flags_list.h
+++ net/base/load_flags_list.h +++ net/base/load_flags_list.h
@@ -101,3 +101,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15) @@ -101,3 +101,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15)
@@ -10,7 +10,7 @@ index 96d1a51ec1078..e8120a818b1f2 100644
+// This load will not send any cookies. For CEF usage. +// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17) +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index 393b89a5624a3..ba6e79471c7ba 100644 index 393b89a5624a..ba6e79471c7b 100644
--- net/url_request/url_request_http_job.cc --- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc
@@ -549,7 +549,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { @@ -549,7 +549,8 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() {
@@ -24,7 +24,7 @@ index 393b89a5624a3..ba6e79471c7ba 100644
request_->force_ignore_site_for_cookies(); request_->force_ignore_site_for_cookies();
if (cookie_store->cookie_access_delegate() && if (cookie_store->cookie_access_delegate() &&
diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
index f1bc5816aad10..dfe54f1169e8e 100644 index f1bc5816aad1..dfe54f1169e8 100644
--- services/network/public/cpp/resource_request.cc --- services/network/public/cpp/resource_request.cc
+++ services/network/public/cpp/resource_request.cc +++ services/network/public/cpp/resource_request.cc
@@ -233,7 +233,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const { @@ -233,7 +233,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {

8
patch/patches/osr_fling_2745.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/input/fling_scheduler.cc content/browser/renderer_host/input/fling_scheduler.cc diff --git content/browser/renderer_host/input/fling_scheduler.cc content/browser/renderer_host/input/fling_scheduler.cc
index c7a4f1f0c3d00..7e6e3b4e56d42 100644 index c7a4f1f0c3d0..7e6e3b4e56d4 100644
--- content/browser/renderer_host/input/fling_scheduler.cc --- content/browser/renderer_host/input/fling_scheduler.cc
+++ content/browser/renderer_host/input/fling_scheduler.cc +++ content/browser/renderer_host/input/fling_scheduler.cc
@@ -68,6 +68,9 @@ void FlingScheduler::ProgressFlingOnBeginFrameIfneeded( @@ -68,6 +68,9 @@ void FlingScheduler::ProgressFlingOnBeginFrameIfneeded(
@@ -13,7 +13,7 @@ index c7a4f1f0c3d00..7e6e3b4e56d42 100644
if (host_->GetView() && host_->GetView()->GetNativeView() && if (host_->GetView() && host_->GetView()->GetNativeView() &&
host_->GetView()->GetNativeView()->GetHost() && host_->GetView()->GetNativeView()->GetHost() &&
diff --git content/browser/renderer_host/input/fling_scheduler_base.h content/browser/renderer_host/input/fling_scheduler_base.h diff --git content/browser/renderer_host/input/fling_scheduler_base.h content/browser/renderer_host/input/fling_scheduler_base.h
index cc4b13a7b9c67..84f3b9ed7cf49 100644 index cc4b13a7b9c6..84f3b9ed7cf4 100644
--- content/browser/renderer_host/input/fling_scheduler_base.h --- content/browser/renderer_host/input/fling_scheduler_base.h
+++ content/browser/renderer_host/input/fling_scheduler_base.h +++ content/browser/renderer_host/input/fling_scheduler_base.h
@@ -7,12 +7,23 @@ @@ -7,12 +7,23 @@
@@ -41,7 +41,7 @@ index cc4b13a7b9c67..84f3b9ed7cf49 100644
} // namespace content } // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index a0e7d4a24f658..e1dec578df6bd 100644 index a0e7d4a24f65..e1dec578df6b 100644
--- content/browser/renderer_host/render_widget_host_impl.cc --- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc +++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3042,6 +3042,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() { @@ -3042,6 +3042,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -57,7 +57,7 @@ index a0e7d4a24f658..e1dec578df6bd 100644
const WebInputEvent& event) { const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled( if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index 7b2ea5e91a29a..5fda523b778de 100644 index 7b2ea5e91a29..5fda523b778d 100644
--- content/browser/renderer_host/render_widget_host_impl.h --- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h +++ content/browser/renderer_host/render_widget_host_impl.h
@@ -756,6 +756,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl @@ -756,6 +756,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl

22
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 a95103026c8c3..ae6c676defcc6 100644 index a95103026c8c..ae6c676defcc 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 @@
@@ -34,7 +34,7 @@ index a95103026c8c3..ae6c676defcc6 100644
} }
diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
index 74536431f6649..3fc69b6560298 100644 index 74536431f664..3fc69b656029 100644
--- chrome/browser/printing/print_preview_dialog_controller.cc --- chrome/browser/printing/print_preview_dialog_controller.cc
+++ chrome/browser/printing/print_preview_dialog_controller.cc +++ chrome/browser/printing/print_preview_dialog_controller.cc
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
@@ -58,7 +58,7 @@ index 74536431f6649..3fc69b6560298 100644
// Add an entry to the map. // Add an entry to the map.
preview_dialog_map_[preview_dialog] = initiator; preview_dialog_map_[preview_dialog] = initiator;
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
index 9aa99b764ad86..c45424d20315a 100644 index 9aa99b764ad8..c45424d20315 100644
--- chrome/browser/printing/print_view_manager_base.cc --- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc +++ chrome/browser/printing/print_view_manager_base.cc
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@@ -97,7 +97,7 @@ index 9aa99b764ad86..c45424d20315a 100644
void NotifySystemDialogCancelled(int render_process_id, int routing_id) { void NotifySystemDialogCancelled(int render_process_id, int routing_id) {
diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h diff --git chrome/browser/printing/print_view_manager_base.h chrome/browser/printing/print_view_manager_base.h
index a96e5a33643e4..def5bced1c965 100644 index a96e5a33643e..def5bced1c96 100644
--- chrome/browser/printing/print_view_manager_base.h --- chrome/browser/printing/print_view_manager_base.h
+++ chrome/browser/printing/print_view_manager_base.h +++ chrome/browser/printing/print_view_manager_base.h
@@ -122,9 +122,6 @@ class PrintViewManagerBase : public content::NotificationObserver, @@ -122,9 +122,6 @@ class PrintViewManagerBase : public content::NotificationObserver,
@@ -111,7 +111,7 @@ index a96e5a33643e4..def5bced1c965 100644
void Observe(int type, void Observe(int type,
const content::NotificationSource& source, const content::NotificationSource& source,
diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html
index df858712d3be8..cd146ea0f26b4 100644 index df858712d3be..cd146ea0f26b 100644
--- chrome/browser/resources/print_preview/ui/destination_dialog.html --- chrome/browser/resources/print_preview/ui/destination_dialog.html
+++ chrome/browser/resources/print_preview/ui/destination_dialog.html +++ chrome/browser/resources/print_preview/ui/destination_dialog.html
@@ -25,10 +25,7 @@ @@ -25,10 +25,7 @@
@@ -127,7 +127,7 @@ index df858712d3be8..cd146ea0f26b4 100644
$i18n{cancel} $i18n{cancel}
</cr-button> </cr-button>
diff --git chrome/browser/resources/print_preview/ui/destination_select.html chrome/browser/resources/print_preview/ui/destination_select.html diff --git chrome/browser/resources/print_preview/ui/destination_select.html chrome/browser/resources/print_preview/ui/destination_select.html
index 6d3d49c902e7b..4769176b9550c 100644 index 6d3d49c902e7..4769176b9550 100644
--- chrome/browser/resources/print_preview/ui/destination_select.html --- chrome/browser/resources/print_preview/ui/destination_select.html
+++ chrome/browser/resources/print_preview/ui/destination_select.html +++ chrome/browser/resources/print_preview/ui/destination_select.html
@@ -20,10 +20,6 @@ @@ -20,10 +20,6 @@
@@ -142,7 +142,7 @@ index 6d3d49c902e7b..4769176b9550c 100644
hidden$="[[!noDestinations]]" selected$="[[noDestinations]]"> hidden$="[[!noDestinations]]" selected$="[[noDestinations]]">
$i18n{noDestinationsMessage} $i18n{noDestinationsMessage}
diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc diff --git chrome/browser/ui/webui/constrained_web_dialog_ui.cc chrome/browser/ui/webui/constrained_web_dialog_ui.cc
index 3d415a60d4361..807ab41ee6ef1 100644 index 3d415a60d436..807ab41ee6ef 100644
--- chrome/browser/ui/webui/constrained_web_dialog_ui.cc --- chrome/browser/ui/webui/constrained_web_dialog_ui.cc
+++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc +++ chrome/browser/ui/webui/constrained_web_dialog_ui.cc
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
@@ -166,7 +166,7 @@ index 3d415a60d4361..807ab41ee6ef1 100644
ConstrainedWebDialogUI::~ConstrainedWebDialogUI() { ConstrainedWebDialogUI::~ConstrainedWebDialogUI() {
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
index 6c43d5381f7c8..d5373865c9850 100644 index 6c43d5381f7c..d5373865c985 100644
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
+++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@@ -268,7 +268,7 @@ index 6c43d5381f7c8..d5373865c9850 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
drive::DriveIntegrationService* drive_service = drive::DriveIntegrationService* drive_service =
diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.h chrome/browser/ui/webui/print_preview/pdf_printer_handler.h diff --git chrome/browser/ui/webui/print_preview/pdf_printer_handler.h chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
index 9730721279eff..cd3ec0c7e0af6 100644 index 9730721279ef..cd3ec0c7e0af 100644
--- chrome/browser/ui/webui/print_preview/pdf_printer_handler.h --- chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
+++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.h +++ chrome/browser/ui/webui/print_preview/pdf_printer_handler.h
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@@ -296,7 +296,7 @@ index 9730721279eff..cd3ec0c7e0af6 100644
base::FilePath GetSaveLocation() const; base::FilePath GetSaveLocation() const;
diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc diff --git chrome/browser/ui/webui/print_preview/print_preview_handler.cc chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index 5c8ae1be08334..e7074994d89d0 100644 index 5c8ae1be0833..e7074994d89d 100644
--- chrome/browser/ui/webui/print_preview/print_preview_handler.cc --- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc +++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
@@ -343,7 +343,7 @@ index 5c8ae1be08334..e7074994d89d0 100644
void PrintPreviewHandler::UnregisterForGaiaCookieChanges() { void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index eb353375b0549..45b14ee354677 100644 index eb353375b054..45b14ee35467 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc --- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@

4
patch/patches/printing_context_2196.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc diff --git chrome/browser/printing/print_job_worker.cc chrome/browser/printing/print_job_worker.cc
index 91edb6e296fd9..bcb84f308df69 100644 index 91edb6e296fd..bcb84f308df6 100644
--- chrome/browser/printing/print_job_worker.cc --- chrome/browser/printing/print_job_worker.cc
+++ chrome/browser/printing/print_job_worker.cc +++ chrome/browser/printing/print_job_worker.cc
@@ -135,6 +135,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id) @@ -135,6 +135,7 @@ PrintJobWorker::PrintJobWorker(int render_process_id, int render_frame_id)
@@ -11,7 +11,7 @@ index 91edb6e296fd9..bcb84f308df69 100644
PrintJobWorker::~PrintJobWorker() { PrintJobWorker::~PrintJobWorker() {
diff --git printing/printing_context.h printing/printing_context.h diff --git printing/printing_context.h printing/printing_context.h
index 0a9bf2b3a6c1f..7bc8b8b1d1548 100644 index 0a9bf2b3a6c1..7bc8b8b1d154 100644
--- printing/printing_context.h --- printing/printing_context.h
+++ printing/printing_context.h +++ printing/printing_context.h
@@ -133,6 +133,13 @@ class PRINTING_EXPORT PrintingContext { @@ -133,6 +133,13 @@ class PRINTING_EXPORT PrintingContext {

2
patch/patches/renderer_host_1070713.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index 00644aa7553c8..2b99e7d84b3f2 100644 index 00644aa7553c..2b99e7d84b3f 100644
--- content/browser/renderer_host/render_view_host_impl.cc --- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc +++ content/browser/renderer_host/render_view_host_impl.cc
@@ -606,6 +606,8 @@ bool RenderViewHostImpl::IsRenderViewLive() { @@ -606,6 +606,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {

6
patch/patches/renderer_preferences_util_545103.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
index 794160f870d4b..9caa8b6df3416 100644 index 2ed4404e2fcd..fcd3606dba8d 100644
--- chrome/browser/renderer_preferences_util.cc --- chrome/browser/renderer_preferences_util.cc
+++ chrome/browser/renderer_preferences_util.cc +++ chrome/browser/renderer_preferences_util.cc
@@ -38,7 +38,8 @@ @@ -42,7 +42,8 @@
#include "ui/base/cocoa/defaults_utils.h" #include "ui/base/cocoa/defaults_utils.h"
#endif #endif
@@ -12,7 +12,7 @@ index 794160f870d4b..9caa8b6df3416 100644
#include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/themes/theme_service_factory.h"
#include "ui/views/linux_ui/linux_ui.h" #include "ui/views/linux_ui/linux_ui.h"
@@ -167,7 +168,8 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs, @@ -171,7 +172,8 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
prefs->caret_blink_interval = interval; prefs->caret_blink_interval = interval;
#endif #endif

4
patch/patches/resource_bundle_2512.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index bb1381fd20f96..cb593885166cb 100644 index bb1381fd20f9..cb593885166c 100644
--- ui/base/resource/resource_bundle.cc --- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc +++ ui/base/resource/resource_bundle.cc
@@ -832,6 +832,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate) @@ -832,6 +832,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@@ -28,7 +28,7 @@ index bb1381fd20f96..cb593885166cb 100644
void ResourceBundle::InitSharedInstance(Delegate* delegate) { void ResourceBundle::InitSharedInstance(Delegate* delegate) {
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice"; DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
index 9487fbaa237b1..26c42332fa3d6 100644 index 9487fbaa237b..26c42332fa3d 100644
--- ui/base/resource/resource_bundle.h --- ui/base/resource/resource_bundle.h
+++ ui/base/resource/resource_bundle.h +++ ui/base/resource/resource_bundle.h
@@ -191,6 +191,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle { @@ -191,6 +191,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {

4
patch/patches/runhooks.patch
View File

@@ -1,5 +1,5 @@
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index f66de0aa63c9e..98a510a6a2440 100644 index f66de0aa63c9..98a510a6a244 100644
--- build/toolchain/win/setup_toolchain.py --- build/toolchain/win/setup_toolchain.py
+++ build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py
@@ -154,13 +154,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store): @@ -154,13 +154,17 @@ def _LoadToolchainEnv(cpu, toolchain_root, sdk_dir, target_store):
@@ -26,7 +26,7 @@ index f66de0aa63c9e..98a510a6a2440 100644
if (cpu != 'x64'): if (cpu != 'x64'):
# x64 is default target CPU thus any other CPU requires a target set # x64 is default target CPU thus any other CPU requires a target set
diff --git build/vs_toolchain.py build/vs_toolchain.py diff --git build/vs_toolchain.py build/vs_toolchain.py
index c3b1182b75b4f..04a472b149d42 100755 index c3b1182b75b4..04a472b149d4 100755
--- build/vs_toolchain.py --- build/vs_toolchain.py
+++ build/vs_toolchain.py +++ build/vs_toolchain.py
@@ -102,9 +102,16 @@ def SetEnvironmentAndGetRuntimeDllDirs(): @@ -102,9 +102,16 @@ def SetEnvironmentAndGetRuntimeDllDirs():

2
patch/patches/rwh_background_color_1984.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index 9b474bb0f927e..febee0f9afa6e 100644 index 9b474bb0f927..febee0f9afa6 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc --- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc +++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -648,10 +648,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { @@ -648,10 +648,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {

16
patch/patches/services_network_2622.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index b41fe282dea38..c5fc618d2fe89 100644 index b41fe282dea3..c5fc618d2fe8 100644
--- chrome/browser/net/profile_network_context_service.cc --- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc +++ chrome/browser/net/profile_network_context_service.cc
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@@ -42,7 +42,7 @@ index b41fe282dea38..c5fc618d2fe89 100644
// change. // change.
network_context_params->http_server_properties_path = network_context_params->http_server_properties_path =
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index dd1ff2e34abc6..755c3ac5441f2 100644 index dd1ff2e34abc..755c3ac5441f 100644
--- net/cookies/cookie_monster.cc --- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc +++ net/cookies/cookie_monster.cc
@@ -495,6 +495,25 @@ void CookieMonster::SetCookieableSchemes( @@ -495,6 +495,25 @@ void CookieMonster::SetCookieableSchemes(
@@ -72,7 +72,7 @@ index dd1ff2e34abc6..755c3ac5441f2 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) { void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(thread_checker_.CalledOnValidThread());
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 00446acaabc1f..78235cfc1ed37 100644 index 00446acaabc1..78235cfc1ed3 100644
--- net/cookies/cookie_monster.h --- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h +++ net/cookies/cookie_monster.h
@@ -180,6 +180,8 @@ class NET_EXPORT CookieMonster : public CookieStore { @@ -180,6 +180,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@@ -85,7 +85,7 @@ index 00446acaabc1f..78235cfc1ed37 100644
// Enables writing session cookies into the cookie database. If this this // Enables writing session cookies into the cookie database. If this this
// method is called, it must be called before first use of the instance // method is called, it must be called before first use of the instance
diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h diff --git net/cookies/cookie_store.h net/cookies/cookie_store.h
index 5ffbe648343da..3d9a0f2e828f6 100644 index 5ffbe648343d..3d9a0f2e828f 100644
--- net/cookies/cookie_store.h --- net/cookies/cookie_store.h
+++ net/cookies/cookie_store.h +++ net/cookies/cookie_store.h
@@ -149,6 +149,11 @@ class NET_EXPORT CookieStore { @@ -149,6 +149,11 @@ class NET_EXPORT CookieStore {
@@ -101,7 +101,7 @@ index 5ffbe648343da..3d9a0f2e828f6 100644
virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd, virtual void DumpMemoryStats(base::trace_event::ProcessMemoryDump* pmd,
const std::string& parent_absolute_name) const; const std::string& parent_absolute_name) const;
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index f91ffe61dba5a..f3482e68cd114 100644 index f91ffe61dba5..f3482e68cd11 100644
--- services/network/cookie_manager.cc --- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc +++ services/network/cookie_manager.cc
@@ -230,14 +230,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) { @@ -230,14 +230,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
@@ -123,10 +123,10 @@ index f91ffe61dba5a..f3482e68cd114 100644
void CookieManager::SetForceKeepSessionState() { void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc diff --git services/network/network_context.cc services/network/network_context.cc
index 8f70586b27c92..4c59ca3c452ec 100644 index 1532b031db2c..066f68f38fd8 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -2000,16 +2000,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2001,16 +2001,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator()); network_service_->network_quality_estimator());
} }
@@ -157,7 +157,7 @@ index 8f70586b27c92..4c59ca3c452ec 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>(); trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index ee27133a56df4..3da7932bac49c 100644 index ee27133a56df..3da7932bac49 100644
--- services/network/public/mojom/network_context.mojom --- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom
@@ -252,6 +252,9 @@ struct NetworkContextParams { @@ -252,6 +252,9 @@ struct NetworkContextParams {

10
patch/patches/services_network_2718.patch
View File

@@ -1,8 +1,8 @@
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 2a08f566a353e..d361989b60567 100644 index c2f073c62d9f..e5c9ba1577bf 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
@@ -489,10 +489,6 @@ class LoginHandlerDelegate { @@ -490,10 +490,6 @@ class LoginHandlerDelegate {
} }
WebContents* web_contents = web_contents_getter_.Run(); WebContents* web_contents = web_contents_getter_.Run();
@@ -13,7 +13,7 @@ index 2a08f566a353e..d361989b60567 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled. // WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true; creating_login_delegate_ = true;
@@ -545,12 +541,6 @@ void OnAuthRequiredContinuation( @@ -546,12 +542,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder> mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder, auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) { base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@@ -26,7 +26,7 @@ index 2a08f566a353e..d361989b60567 100644
new LoginHandlerDelegate(std::move(auth_challenge_responder), new LoginHandlerDelegate(std::move(auth_challenge_responder),
std::move(web_contents_getter), auth_info, std::move(web_contents_getter), auth_info,
is_request_for_main_frame, process_id, routing_id, is_request_for_main_frame, process_id, routing_id,
@@ -2502,8 +2492,12 @@ void StoragePartitionImpl::GetQuotaSettings( @@ -2521,8 +2511,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return; return;
} }
@@ -40,7 +40,7 @@ index 2a08f566a353e..d361989b60567 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback)); storage::GetDefaultDeviceInfoHelper(), std::move(callback));
} }
@@ -2516,6 +2510,11 @@ void StoragePartitionImpl::InitNetworkContext() { @@ -2535,6 +2529,11 @@ void StoragePartitionImpl::InitNetworkContext() {
GetContentClient()->browser()->ConfigureNetworkContextParams( GetContentClient()->browser()->ConfigureNetworkContextParams(
browser_context_, is_in_memory_, relative_partition_path_, browser_context_, is_in_memory_, relative_partition_path_,
context_params.get(), cert_verifier_creation_params.get()); context_params.get(), cert_verifier_creation_params.get());

8
patch/patches/set_resize_background_color.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc
index 52f9b871022de..4cad419a8e373 100644 index 52f9b871022d..4cad419a8e37 100644
--- ui/views/controls/native/native_view_host.cc --- ui/views/controls/native/native_view_host.cc
+++ ui/views/controls/native/native_view_host.cc +++ ui/views/controls/native/native_view_host.cc
@@ -161,7 +161,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) { @@ -161,7 +161,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
@@ -12,7 +12,7 @@ index 52f9b871022de..4cad419a8e373 100644
void NativeViewHost::VisibilityChanged(View* starting_from, bool is_visible) { void NativeViewHost::VisibilityChanged(View* starting_from, bool is_visible) {
diff --git ui/views/controls/native/native_view_host.h ui/views/controls/native/native_view_host.h diff --git ui/views/controls/native/native_view_host.h ui/views/controls/native/native_view_host.h
index ab2371857a00a..8dccc190fa896 100644 index ab2371857a00..8dccc190fa89 100644
--- ui/views/controls/native/native_view_host.h --- ui/views/controls/native/native_view_host.h
+++ ui/views/controls/native/native_view_host.h +++ ui/views/controls/native/native_view_host.h
@@ -95,6 +95,12 @@ class VIEWS_EXPORT NativeViewHost : public View { @@ -95,6 +95,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
@@ -39,7 +39,7 @@ index ab2371857a00a..8dccc190fa896 100644
}; };
diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
index 9cb29421a3df9..a5ed399820a81 100644 index 9cb29421a3df..a5ed399820a8 100644
--- ui/views/controls/webview/webview.cc --- ui/views/controls/webview/webview.cc
+++ ui/views/controls/webview/webview.cc +++ ui/views/controls/webview/webview.cc
@@ -130,6 +130,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size, @@ -130,6 +130,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
@@ -54,7 +54,7 @@ index 9cb29421a3df9..a5ed399820a81 100644
if (crashed_overlay_view_ == crashed_overlay_view) if (crashed_overlay_view_ == crashed_overlay_view)
return; return;
diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
index 1bb2399d0d139..5bb1fcde4e3bc 100644 index 1bb2399d0d13..5bb1fcde4e3b 100644
--- ui/views/controls/webview/webview.h --- ui/views/controls/webview/webview.h
+++ ui/views/controls/webview/webview.h +++ ui/views/controls/webview/webview.h
@@ -78,6 +78,10 @@ class WEBVIEW_EXPORT WebView : public View, @@ -78,6 +78,10 @@ class WEBVIEW_EXPORT WebView : public View,

8
patch/patches/storage_incognito_2289.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc diff --git content/browser/blob_storage/chrome_blob_storage_context.cc content/browser/blob_storage/chrome_blob_storage_context.cc
index 676c2cc22baca..e6f9642e1cba5 100644 index 676c2cc22bac..e6f9642e1cba 100644
--- content/browser/blob_storage/chrome_blob_storage_context.cc --- content/browser/blob_storage/chrome_blob_storage_context.cc
+++ content/browser/blob_storage/chrome_blob_storage_context.cc +++ content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor( @@ -120,7 +120,8 @@ ChromeBlobStorageContext* ChromeBlobStorageContext::GetFor(
@@ -13,7 +13,7 @@ index 676c2cc22baca..e6f9642e1cba5 100644
{base::MayBlock(), base::TaskPriority::USER_VISIBLE, {base::MayBlock(), base::TaskPriority::USER_VISIBLE,
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}); base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
diff --git content/browser/browser_context.cc content/browser/browser_context.cc diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index eb88768c1e1c2..2c6c143d4660e 100644 index eb88768c1e1c..2c6c143d4660 100644
--- content/browser/browser_context.cc --- content/browser/browser_context.cc
+++ content/browser/browser_context.cc +++ content/browser/browser_context.cc
@@ -152,7 +152,7 @@ StoragePartition* BrowserContext::GetStoragePartition( @@ -152,7 +152,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
@@ -36,7 +36,7 @@ index eb88768c1e1c2..2c6c143d4660e 100644
std::unique_ptr<media::VideoDecodeStatsDB> stats_db; std::unique_ptr<media::VideoDecodeStatsDB> stats_db;
if (use_in_memory_db) { if (use_in_memory_db) {
diff --git content/public/browser/storage_partition_config.cc content/public/browser/storage_partition_config.cc diff --git content/public/browser/storage_partition_config.cc content/public/browser/storage_partition_config.cc
index 9d87aa95e9300..ae82242746e45 100644 index 9d87aa95e930..ae82242746e4 100644
--- content/public/browser/storage_partition_config.cc --- content/public/browser/storage_partition_config.cc
+++ content/public/browser/storage_partition_config.cc +++ content/public/browser/storage_partition_config.cc
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
@@ -58,7 +58,7 @@ index 9d87aa95e9300..ae82242746e45 100644
// static // static
diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc
index 806e42d494176..1f16adce58383 100644 index 806e42d49417..1f16adce5838 100644
--- storage/browser/database/database_tracker.cc --- storage/browser/database/database_tracker.cc
+++ storage/browser/database/database_tracker.cc +++ storage/browser/database/database_tracker.cc
@@ -494,7 +494,7 @@ bool DatabaseTracker::LazyInit() { @@ -494,7 +494,7 @@ bool DatabaseTracker::LazyInit() {

2
patch/patches/trace_event.patch
View File

@@ -1,5 +1,5 @@
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
index c697f7ced74e8..0982cd85150bc 100644 index c697f7ced74e..0982cd85150b 100644
--- base/trace_event/builtin_categories.h --- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h +++ base/trace_event/builtin_categories.h
@@ -59,6 +59,8 @@ @@ -59,6 +59,8 @@

2
patch/patches/ui_dragdrop_355390.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc diff --git ui/base/x/x11_os_exchange_data_provider.cc ui/base/x/x11_os_exchange_data_provider.cc
index cbf6e7f50b83a..2786d99a8b936 100644 index cbf6e7f50b83..2786d99a8b93 100644
--- ui/base/x/x11_os_exchange_data_provider.cc --- ui/base/x/x11_os_exchange_data_provider.cc
+++ ui/base/x/x11_os_exchange_data_provider.cc +++ ui/base/x/x11_os_exchange_data_provider.cc
@@ -122,7 +122,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url, @@ -122,7 +122,8 @@ void XOSExchangeDataProvider::SetURL(const GURL& url,

2
patch/patches/underlay_1051.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h
index ec1c6c972ee8d..9f73342051325 100644 index ec1c6c972ee8..9f7334205132 100644
--- ui/base/cocoa/underlay_opengl_hosting_window.h --- ui/base/cocoa/underlay_opengl_hosting_window.h
+++ ui/base/cocoa/underlay_opengl_hosting_window.h +++ ui/base/cocoa/underlay_opengl_hosting_window.h
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@

32
patch/patches/views_1749_2102.patch
View File

@@ -1,5 +1,5 @@
diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h diff --git ui/base/models/menu_model.h ui/base/models/menu_model.h
index 2f8dd2c08a95b..e2ca02b74ffba 100644 index 2f8dd2c08a95..e2ca02b74ffb 100644
--- ui/base/models/menu_model.h --- ui/base/models/menu_model.h
+++ ui/base/models/menu_model.h +++ ui/base/models/menu_model.h
@@ -13,8 +13,11 @@ @@ -13,8 +13,11 @@
@@ -43,7 +43,7 @@ index 2f8dd2c08a95b..e2ca02b74ffba 100644
virtual void MenuWillShow() {} virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index c80c92f084177..609a2681a4c6d 100644 index c80c92f08417..609a2681a4c6 100644
--- ui/gfx/render_text.cc --- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc +++ ui/gfx/render_text.cc
@@ -623,6 +623,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) { @@ -623,6 +623,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
@@ -82,7 +82,7 @@ index c80c92f084177..609a2681a4c6d 100644
} }
diff --git ui/gfx/render_text.h ui/gfx/render_text.h diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index b4e825ddfb6bd..3b894beade251 100644 index b4e825ddfb6b..3b894beade25 100644
--- ui/gfx/render_text.h --- ui/gfx/render_text.h
+++ ui/gfx/render_text.h +++ ui/gfx/render_text.h
@@ -345,6 +345,10 @@ class GFX_EXPORT RenderText { @@ -345,6 +345,10 @@ class GFX_EXPORT RenderText {
@@ -106,7 +106,7 @@ index b4e825ddfb6bd..3b894beade251 100644
}; };
diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h diff --git ui/views/animation/ink_drop_host_view.h ui/views/animation/ink_drop_host_view.h
index 8c8f77fc26db3..0a9f50df07c1d 100644 index 8c8f77fc26db..0a9f50df07c1 100644
--- ui/views/animation/ink_drop_host_view.h --- ui/views/animation/ink_drop_host_view.h
+++ ui/views/animation/ink_drop_host_view.h +++ ui/views/animation/ink_drop_host_view.h
@@ -142,6 +142,8 @@ class VIEWS_EXPORT InkDropHostView : public View { @@ -142,6 +142,8 @@ class VIEWS_EXPORT InkDropHostView : public View {
@@ -119,7 +119,7 @@ index 8c8f77fc26db3..0a9f50df07c1d 100644
// Size used for the default SquareInkDropRipple. // Size used for the default SquareInkDropRipple.
static constexpr gfx::Size kDefaultInkDropSize = gfx::Size(24, 24); static constexpr gfx::Size kDefaultInkDropSize = gfx::Size(24, 24);
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
index 7e744be3c39e2..0150a0e347111 100644 index 7e744be3c39e..0150a0e34711 100644
--- ui/views/controls/button/label_button.cc --- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc +++ ui/views/controls/button/label_button.cc
@@ -498,6 +498,12 @@ void LabelButton::OnThemeChanged() { @@ -498,6 +498,12 @@ void LabelButton::OnThemeChanged() {
@@ -136,7 +136,7 @@ index 7e744be3c39e2..0150a0e347111 100644
Button::StateChanged(old_state); Button::StateChanged(old_state);
ResetLabelEnabledColor(); ResetLabelEnabledColor();
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
index 1ad627bb786b8..624061e6ba3c7 100644 index 1ad627bb786b..624061e6ba3c 100644
--- ui/views/controls/button/label_button.h --- ui/views/controls/button/label_button.h
+++ ui/views/controls/button/label_button.h +++ ui/views/controls/button/label_button.h
@@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate { @@ -133,6 +133,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -150,7 +150,7 @@ index 1ad627bb786b8..624061e6ba3c7 100644
ImageView* image() const { return image_; } ImageView* image() const { return image_; }
Label* label() const { return label_; } Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 382b0ea115a5c..32d213250c938 100644 index 382b0ea115a5..32d213250c93 100644
--- ui/views/controls/label.cc --- ui/views/controls/label.cc
+++ ui/views/controls/label.cc +++ ui/views/controls/label.cc
@@ -49,12 +49,27 @@ enum LabelPropertyKey { @@ -49,12 +49,27 @@ enum LabelPropertyKey {
@@ -215,7 +215,7 @@ index 382b0ea115a5c..32d213250c938 100644
} }
diff --git ui/views/controls/label.h ui/views/controls/label.h diff --git ui/views/controls/label.h ui/views/controls/label.h
index 269425ed7c04a..5dea3a3dbd652 100644 index 269425ed7c04..5dea3a3dbd65 100644
--- ui/views/controls/label.h --- ui/views/controls/label.h
+++ ui/views/controls/label.h +++ ui/views/controls/label.h
@@ -225,6 +225,10 @@ class VIEWS_EXPORT Label : public View, @@ -225,6 +225,10 @@ class VIEWS_EXPORT Label : public View,
@@ -238,7 +238,7 @@ index 269425ed7c04a..5dea3a3dbd652 100644
std::unique_ptr<SelectionController> selection_controller_; std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 7c081b7d8a4e1..36c5bb5e8f93a 100644 index 7c081b7d8a4e..36c5bb5e8f93 100644
--- ui/views/controls/menu/menu_controller.cc --- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc +++ ui/views/controls/menu/menu_controller.cc
@@ -2748,8 +2748,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem( @@ -2748,8 +2748,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -269,7 +269,7 @@ index 7c081b7d8a4e1..36c5bb5e8f93a 100644
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY); SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
else if (item->GetParentMenuItem()->GetParentMenuItem()) else if (item->GetParentMenuItem()->GetParentMenuItem())
diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h diff --git ui/views/controls/menu/menu_delegate.h ui/views/controls/menu/menu_delegate.h
index a280e9d74016e..59a8eda9b1d84 100644 index a280e9d74016..59a8eda9b1d8 100644
--- ui/views/controls/menu/menu_delegate.h --- ui/views/controls/menu/menu_delegate.h
+++ ui/views/controls/menu/menu_delegate.h +++ ui/views/controls/menu/menu_delegate.h
@@ -79,6 +79,22 @@ class VIEWS_EXPORT MenuDelegate { @@ -79,6 +79,22 @@ class VIEWS_EXPORT MenuDelegate {
@@ -308,7 +308,7 @@ index a280e9d74016e..59a8eda9b1d84 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu); virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index e12fe2ac6ad80..347174b8c21a3 100644 index e12fe2ac6ad8..347174b8c21a 100644
--- ui/views/controls/menu/menu_item_view.cc --- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc +++ ui/views/controls/menu/menu_item_view.cc
@@ -1087,6 +1087,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas, @@ -1087,6 +1087,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -342,7 +342,7 @@ index e12fe2ac6ad80..347174b8c21a3 100644
GetMenuController() && GetMenuController()->use_touchable_layout() GetMenuController() && GetMenuController()->use_touchable_layout()
? style::CONTEXT_TOUCH_MENU ? style::CONTEXT_TOUCH_MENU
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
index fbd30c4914bbe..851d03a9d45e8 100644 index fbd30c4914bb..851d03a9d45e 100644
--- ui/views/controls/menu/menu_model_adapter.cc --- ui/views/controls/menu/menu_model_adapter.cc
+++ ui/views/controls/menu/menu_model_adapter.cc +++ ui/views/controls/menu/menu_model_adapter.cc
@@ -242,6 +242,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const { @@ -242,6 +242,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
@@ -424,7 +424,7 @@ index fbd30c4914bbe..851d03a9d45e8 100644
// Look up the menu model for this menu. // Look up the menu model for this menu.
const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator = const std::map<MenuItemView*, ui::MenuModel*>::const_iterator map_iterator =
diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h diff --git ui/views/controls/menu/menu_model_adapter.h ui/views/controls/menu/menu_model_adapter.h
index c7aaf7286b74d..2ba3a9c10fe03 100644 index c7aaf7286b74..2ba3a9c10fe0 100644
--- ui/views/controls/menu/menu_model_adapter.h --- ui/views/controls/menu/menu_model_adapter.h
+++ ui/views/controls/menu/menu_model_adapter.h +++ ui/views/controls/menu/menu_model_adapter.h
@@ -84,6 +84,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate, @@ -84,6 +84,20 @@ class VIEWS_EXPORT MenuModelAdapter : public MenuDelegate,
@@ -449,7 +449,7 @@ index c7aaf7286b74d..2ba3a9c10fe03 100644
void WillHideMenu(MenuItemView* menu) override; void WillHideMenu(MenuItemView* menu) override;
void OnMenuClosed(MenuItemView* menu) override; void OnMenuClosed(MenuItemView* menu) override;
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
index 3f9f76315def1..9f0e0c791eb0e 100644 index 3f9f76315def..9f0e0c791eb0 100644
--- ui/views/controls/menu/menu_scroll_view_container.cc --- ui/views/controls/menu/menu_scroll_view_container.cc
+++ ui/views/controls/menu/menu_scroll_view_container.cc +++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -234,6 +234,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) @@ -234,6 +234,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -465,7 +465,7 @@ index 3f9f76315def1..9f0e0c791eb0e 100644
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition()); content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
diff --git ui/views/test/ui_controls_factory_desktop_aurax11.cc ui/views/test/ui_controls_factory_desktop_aurax11.cc diff --git ui/views/test/ui_controls_factory_desktop_aurax11.cc ui/views/test/ui_controls_factory_desktop_aurax11.cc
index 64e09ff4359a8..714e8e9ff6610 100644 index 64e09ff4359a..714e8e9ff661 100644
--- ui/views/test/ui_controls_factory_desktop_aurax11.cc --- ui/views/test/ui_controls_factory_desktop_aurax11.cc
+++ ui/views/test/ui_controls_factory_desktop_aurax11.cc +++ ui/views/test/ui_controls_factory_desktop_aurax11.cc
@@ -89,10 +89,6 @@ class UIControlsDesktopX11 : public UIControlsAura { @@ -89,10 +89,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
@@ -480,7 +480,7 @@ index 64e09ff4359a8..714e8e9ff6610 100644
x11_ui_controls_test_helper_.ButtonDownMask() == 0) { x11_ui_controls_test_helper_.ButtonDownMask() == 0) {
// Move the cursor because EnterNotify/LeaveNotify are generated with the // Move the cursor because EnterNotify/LeaveNotify are generated with the
diff --git ui/views/view.h ui/views/view.h diff --git ui/views/view.h ui/views/view.h
index b13e80f12a5c1..5c19ea1854e65 100644 index b13e80f12a5c..5c19ea1854e6 100644
--- ui/views/view.h --- ui/views/view.h
+++ ui/views/view.h +++ ui/views/view.h
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@

30
patch/patches/views_widget.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index cb85ae32d6f0d..530375718eb09 100644 index cb85ae32d6f0..530375718eb0 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc --- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc +++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -561,6 +561,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() { @@ -561,6 +561,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
@@ -18,7 +18,7 @@ index cb85ae32d6f0d..530375718eb09 100644
if (!GetMouseWheelPhaseHandler()) if (!GetMouseWheelPhaseHandler())
return; return;
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index b9d5c2bba2a9f..b4de628ddaacc 100644 index b9d5c2bba2a9..b4de628ddaac 100644
--- content/browser/renderer_host/render_widget_host_view_base.h --- content/browser/renderer_host/render_widget_host_view_base.h
+++ content/browser/renderer_host/render_widget_host_view_base.h +++ content/browser/renderer_host/render_widget_host_view_base.h
@@ -65,6 +65,7 @@ class CursorManager; @@ -65,6 +65,7 @@ class CursorManager;
@@ -63,7 +63,7 @@ index b9d5c2bba2a9f..b4de628ddaacc 100644
FRIEND_TEST_ALL_PREFIXES( FRIEND_TEST_ALL_PREFIXES(
BrowserSideFlingBrowserTest, BrowserSideFlingBrowserTest,
diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
index b18cbdf6cd352..b28104e40ccc7 100644 index b18cbdf6cd35..b28104e40ccc 100644
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc --- content/browser/renderer_host/render_widget_host_view_event_handler.cc
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc +++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -37,6 +37,10 @@ @@ -37,6 +37,10 @@
@@ -111,7 +111,7 @@ index b18cbdf6cd352..b28104e40ccc7 100644
if (host_ && set_focus_on_mouse_down_or_key_event_) { if (host_ && set_focus_on_mouse_down_or_key_event_) {
set_focus_on_mouse_down_or_key_event_ = false; set_focus_on_mouse_down_or_key_event_ = false;
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index 12761b4460f00..3263598db64f8 100644 index 12761b4460f0..3263598db64f 100644
--- content/public/browser/render_widget_host_view.h --- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h +++ content/public/browser/render_widget_host_view.h
@@ -249,6 +249,14 @@ class CONTENT_EXPORT RenderWidgetHostView { @@ -249,6 +249,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -130,7 +130,7 @@ index 12761b4460f00..3263598db64f8 100644
// Set the view's active state (i.e., tint state of controls). // Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0; virtual void SetActive(bool active) = 0;
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index 37649f7f332fc..4a77ed9229d53 100644 index 37649f7f332f..4a77ed9229d5 100644
--- ui/platform_window/x11/x11_window.cc --- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc +++ ui/platform_window/x11/x11_window.cc
@@ -1610,7 +1610,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties, @@ -1610,7 +1610,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties,
@@ -144,7 +144,7 @@ index 37649f7f332fc..4a77ed9229d53 100644
req.y = bounds_in_pixels_.y(); req.y = bounds_in_pixels_.y();
req.width = bounds_in_pixels_.width(); req.width = bounds_in_pixels_.width();
diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc diff --git ui/views/widget/desktop_aura/desktop_screen_win.cc ui/views/widget/desktop_aura/desktop_screen_win.cc
index 91c516429c2a4..762a108fedf69 100644 index 91c516429c2a..762a108fedf6 100644
--- ui/views/widget/desktop_aura/desktop_screen_win.cc --- ui/views/widget/desktop_aura/desktop_screen_win.cc
+++ ui/views/widget/desktop_aura/desktop_screen_win.cc +++ ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -18,6 +18,8 @@ DesktopScreenWin::~DesktopScreenWin() { @@ -18,6 +18,8 @@ DesktopScreenWin::~DesktopScreenWin() {
@@ -157,7 +157,7 @@ index 91c516429c2a4..762a108fedf69 100644
return host ? host->GetAcceleratedWidget() : nullptr; return host ? host->GetAcceleratedWidget() : nullptr;
} }
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
index 1493ae74f478d..f793ddb33c288 100644 index 1493ae74f478..f793ddb33c28 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -187,6 +187,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop( @@ -187,6 +187,18 @@ Widget::MoveLoopResult DesktopWindowTreeHostLinux::RunMoveLoop(
@@ -189,7 +189,7 @@ index 1493ae74f478d..f793ddb33c288 100644
properties->x11_extension_delegate = this; properties->x11_extension_delegate = this;
} }
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
index e0339379e1a85..b31f4ac179f69 100644 index e0339379e1a8..b31f4ac179f6 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h --- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h
@@ -66,6 +66,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux @@ -66,6 +66,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostLinux
@@ -221,7 +221,7 @@ index e0339379e1a85..b31f4ac179f69 100644
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this}; base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index c8c26cfacffb6..703fe69604b59 100644 index c8c26cfacffb..703fe69604b5 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -140,8 +140,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) { @@ -140,8 +140,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -257,7 +257,7 @@ index c8c26cfacffb6..703fe69604b59 100644
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) { bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.h ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
index 5642a689cb3f0..126184e619cc7 100644 index 5642a689cb3f..126184e619cc 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h --- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h +++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -292,6 +292,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin @@ -292,6 +292,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@@ -272,7 +272,7 @@ index 5642a689cb3f0..126184e619cc7 100644
// a reference. // a reference.
corewm::TooltipWin* tooltip_; corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 59f7da0e3c1a1..3c3b03767a97f 100644 index 59f7da0e3c1a..3c3b03767a97 100644
--- ui/views/widget/widget.cc --- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc +++ ui/views/widget/widget.cc
@@ -314,7 +314,8 @@ void Widget::Init(InitParams params) { @@ -314,7 +314,8 @@ void Widget::Init(InitParams params) {
@@ -317,7 +317,7 @@ index 59f7da0e3c1a1..3c3b03767a97f 100644
} }
diff --git ui/views/widget/widget.h ui/views/widget/widget.h diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index dde160f1a382f..f04bc2b4f98a5 100644 index dde160f1a382..f04bc2b4f98a 100644
--- ui/views/widget/widget.h --- ui/views/widget/widget.h
+++ ui/views/widget/widget.h +++ ui/views/widget/widget.h
@@ -322,6 +322,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate, @@ -322,6 +322,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -330,7 +330,7 @@ index dde160f1a382f..f04bc2b4f98a5 100644
// the NativeWidget may specify a default size. If the parent is specified, // the NativeWidget may specify a default size. If the parent is specified,
// |bounds| is in the parent's coordinate system. If the parent is not // |bounds| is in the parent's coordinate system. If the parent is not
diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h
index eba8040b8e1b9..27bc5a210fc1a 100644 index eba8040b8e1b..27bc5a210fc1 100644
--- ui/views/widget/widget_delegate.h --- ui/views/widget/widget_delegate.h
+++ ui/views/widget/widget_delegate.h +++ ui/views/widget/widget_delegate.h
@@ -385,6 +385,10 @@ class VIEWS_EXPORT WidgetDelegate { @@ -385,6 +385,10 @@ class VIEWS_EXPORT WidgetDelegate {
@@ -345,7 +345,7 @@ index eba8040b8e1b9..27bc5a210fc1a 100644
bool enable_arrow_key_traversal() const { bool enable_arrow_key_traversal() const {
return params_.enable_arrow_key_traversal; return params_.enable_arrow_key_traversal;
diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc diff --git ui/views/widget/widget_hwnd_utils.cc ui/views/widget/widget_hwnd_utils.cc
index 89f5b62f95dfe..8f6971929a12e 100644 index 89f5b62f95df..8f6971929a12 100644
--- ui/views/widget/widget_hwnd_utils.cc --- ui/views/widget/widget_hwnd_utils.cc
+++ ui/views/widget/widget_hwnd_utils.cc +++ ui/views/widget/widget_hwnd_utils.cc
@@ -67,7 +67,7 @@ void CalculateWindowStylesFromInitParams( @@ -67,7 +67,7 @@ void CalculateWindowStylesFromInitParams(
@@ -358,7 +358,7 @@ index 89f5b62f95dfe..8f6971929a12e 100644
if (native_widget_delegate->IsDialogBox()) { if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME; *style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 8bcb03a45d2fa..bc8062171c818 100644 index 8bcb03a45d2f..bc8062171c81 100644
--- ui/views/win/hwnd_message_handler.cc --- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc +++ ui/views/win/hwnd_message_handler.cc
@@ -3108,10 +3108,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, @@ -3108,10 +3108,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,

24
patch/patches/viz_osr_2575.patch
View File

@@ -1,5 +1,5 @@
diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc diff --git components/viz/host/host_display_client.cc components/viz/host/host_display_client.cc
index 3b00759e513dc..90fe332d59f5b 100644 index 3b00759e513d..90fe332d59f5 100644
--- components/viz/host/host_display_client.cc --- components/viz/host/host_display_client.cc
+++ components/viz/host/host_display_client.cc +++ components/viz/host/host_display_client.cc
@@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams( @@ -45,9 +45,14 @@ void HostDisplayClient::OnDisplayReceivedCALayerParams(
@@ -29,7 +29,7 @@ index 3b00759e513dc..90fe332d59f5b 100644
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h diff --git components/viz/host/host_display_client.h components/viz/host/host_display_client.h
index 5e260e13762f6..1ccff27f2fdbe 100644 index 5e260e13762f..1ccff27f2fdb 100644
--- components/viz/host/host_display_client.h --- components/viz/host/host_display_client.h
+++ components/viz/host/host_display_client.h +++ components/viz/host/host_display_client.h
@@ -32,17 +32,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient { @@ -32,17 +32,17 @@ class VIZ_HOST_EXPORT HostDisplayClient : public mojom::DisplayClient {
@@ -54,7 +54,7 @@ index 5e260e13762f6..1ccff27f2fdbe 100644
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete. // of lacros-chrome is complete.
diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc diff --git components/viz/host/layered_window_updater_impl.cc components/viz/host/layered_window_updater_impl.cc
index b04f654fe820f..131977a36591d 100644 index b04f654fe820..131977a36591 100644
--- components/viz/host/layered_window_updater_impl.cc --- components/viz/host/layered_window_updater_impl.cc
+++ components/viz/host/layered_window_updater_impl.cc +++ components/viz/host/layered_window_updater_impl.cc
@@ -44,7 +44,7 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory( @@ -44,7 +44,7 @@ void LayeredWindowUpdaterImpl::OnAllocatedSharedMemory(
@@ -67,7 +67,7 @@ index b04f654fe820f..131977a36591d 100644
if (!canvas_) { if (!canvas_) {
diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h diff --git components/viz/host/layered_window_updater_impl.h components/viz/host/layered_window_updater_impl.h
index 1026b739d283f..fe562ab60ce98 100644 index 1026b739d283..fe562ab60ce9 100644
--- components/viz/host/layered_window_updater_impl.h --- components/viz/host/layered_window_updater_impl.h
+++ components/viz/host/layered_window_updater_impl.h +++ components/viz/host/layered_window_updater_impl.h
@@ -35,7 +35,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl @@ -35,7 +35,7 @@ class VIZ_HOST_EXPORT LayeredWindowUpdaterImpl
@@ -80,7 +80,7 @@ index 1026b739d283f..fe562ab60ce98 100644
private: private:
const HWND hwnd_; const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index 159fa9efa79fd..b430e2385a5b1 100644 index 159fa9efa79f..b430e2385a5b 100644
--- components/viz/service/BUILD.gn --- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn +++ components/viz/service/BUILD.gn
@@ -202,6 +202,8 @@ viz_component("service") { @@ -202,6 +202,8 @@ viz_component("service") {
@@ -93,7 +93,7 @@ index 159fa9efa79fd..b430e2385a5b1 100644
defines = [ "VIZ_SERVICE_IMPLEMENTATION" ] defines = [ "VIZ_SERVICE_IMPLEMENTATION" ]
diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc diff --git components/viz/service/display_embedder/output_surface_provider_impl.cc components/viz/service/display_embedder/output_surface_provider_impl.cc
index 79c800e77a160..c1593b5973253 100644 index 79c800e77a16..c1593b597325 100644
--- components/viz/service/display_embedder/output_surface_provider_impl.cc --- components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ components/viz/service/display_embedder/output_surface_provider_impl.cc +++ components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@@ -126,7 +126,7 @@ index 79c800e77a160..c1593b5973253 100644
return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_, return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
display_client); display_client);
diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc
index 599b06c1765ef..e8ae98b0b1320 100644 index 599b06c1765e..e8ae98b0b132 100644
--- components/viz/service/display_embedder/software_output_device_win.cc --- components/viz/service/display_embedder/software_output_device_win.cc
+++ components/viz/service/display_embedder/software_output_device_win.cc +++ components/viz/service/display_embedder/software_output_device_win.cc
@@ -191,8 +191,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated( @@ -191,8 +191,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
@@ -142,7 +142,7 @@ index 599b06c1765ef..e8ae98b0b1320 100644
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this); TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
index 2d80f84280b5a..41e45223367f0 100644 index 2d80f84280b5..41e45223367f 100644
--- content/browser/compositor/viz_process_transport_factory.cc --- content/browser/compositor/viz_process_transport_factory.cc
+++ content/browser/compositor/viz_process_transport_factory.cc +++ content/browser/compositor/viz_process_transport_factory.cc
@@ -418,8 +418,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel( @@ -418,8 +418,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -162,7 +162,7 @@ index 2d80f84280b5a..41e45223367f0 100644
compositor_data.display_client->GetBoundRemote(resize_task_runner_); compositor_data.display_client->GetBoundRemote(resize_task_runner_);
diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h diff --git mojo/public/cpp/bindings/sync_call_restrictions.h mojo/public/cpp/bindings/sync_call_restrictions.h
index b6b7ef090eaaf..a892bd4583d7e 100644 index b6b7ef090eaa..a892bd4583d7 100644
--- mojo/public/cpp/bindings/sync_call_restrictions.h --- mojo/public/cpp/bindings/sync_call_restrictions.h
+++ mojo/public/cpp/bindings/sync_call_restrictions.h +++ mojo/public/cpp/bindings/sync_call_restrictions.h
@@ -34,6 +34,7 @@ class Compositor; @@ -34,6 +34,7 @@ class Compositor;
@@ -183,7 +183,7 @@ index b6b7ef090eaaf..a892bd4583d7e 100644
// running in the same process, so it won't block anything. // running in the same process, so it won't block anything.
// TODO(159346933) Remove once the origin isolation logic is moved outside of // TODO(159346933) Remove once the origin isolation logic is moved outside of
diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom
index cd26a3dcf99e0..282c5d55c7df3 100644 index cd26a3dcf99e..282c5d55c7df 100644
--- services/viz/privileged/mojom/compositing/display_private.mojom --- services/viz/privileged/mojom/compositing/display_private.mojom
+++ services/viz/privileged/mojom/compositing/display_private.mojom +++ services/viz/privileged/mojom/compositing/display_private.mojom
@@ -85,12 +85,14 @@ interface DisplayPrivate { @@ -85,12 +85,14 @@ interface DisplayPrivate {
@@ -203,7 +203,7 @@ index cd26a3dcf99e0..282c5d55c7df3 100644
// Notifies that a swap has occurred and provides information about the pixel // Notifies that a swap has occurred and provides information about the pixel
diff --git services/viz/privileged/mojom/compositing/layered_window_updater.mojom services/viz/privileged/mojom/compositing/layered_window_updater.mojom diff --git services/viz/privileged/mojom/compositing/layered_window_updater.mojom services/viz/privileged/mojom/compositing/layered_window_updater.mojom
index 6b7fbb6cf13dc..e2af75168cb91 100644 index 6b7fbb6cf13d..e2af75168cb9 100644
--- services/viz/privileged/mojom/compositing/layered_window_updater.mojom --- services/viz/privileged/mojom/compositing/layered_window_updater.mojom
+++ services/viz/privileged/mojom/compositing/layered_window_updater.mojom +++ services/viz/privileged/mojom/compositing/layered_window_updater.mojom
@@ -26,5 +26,5 @@ interface LayeredWindowUpdater { @@ -26,5 +26,5 @@ interface LayeredWindowUpdater {
@@ -214,7 +214,7 @@ index 6b7fbb6cf13dc..e2af75168cb91 100644
+ Draw(gfx.mojom.Rect damage_rect) => (); + Draw(gfx.mojom.Rect damage_rect) => ();
}; };
diff --git ui/compositor/compositor.h ui/compositor/compositor.h diff --git ui/compositor/compositor.h ui/compositor/compositor.h
index e4ff4cb0a2ec2..5023c6139f4eb 100644 index e4ff4cb0a2ec..5023c6139f4e 100644
--- ui/compositor/compositor.h --- ui/compositor/compositor.h
+++ ui/compositor/compositor.h +++ ui/compositor/compositor.h
@@ -28,7 +28,9 @@ @@ -28,7 +28,9 @@

14
patch/patches/web_contents_1257_1565.patch
View File

@@ -1,5 +1,5 @@
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 b7e32f44573be..11e64de06065b 100644 index 77cd0e129e6d..5276cf79c605 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
@@ -2739,6 +2739,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2739,6 +2739,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -39,7 +39,7 @@ index b7e32f44573be..11e64de06065b 100644
std::unique_ptr<WebContentsImpl> new_contents; std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) { if (!is_guest) {
create_params.context = view_->GetNativeView(); create_params.context = view_->GetNativeView();
@@ -7270,6 +7286,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -7268,6 +7284,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents. // This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary(); SetAsFocusedWebContentsIfNecessary();
} }
@@ -50,7 +50,7 @@ index b7e32f44573be..11e64de06065b 100644
void WebContentsImpl::DidCallFocus() { void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc diff --git content/public/browser/web_contents.cc content/public/browser/web_contents.cc
index f1dcf53ea481b..192f7c0ddd04f 100644 index f1dcf53ea481..192f7c0ddd04 100644
--- content/public/browser/web_contents.cc --- content/public/browser/web_contents.cc
+++ content/public/browser/web_contents.cc +++ content/public/browser/web_contents.cc
@@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context, @@ -29,6 +29,7 @@ WebContents::CreateParams::CreateParams(BrowserContext* context,
@@ -62,7 +62,7 @@ index f1dcf53ea481b..192f7c0ddd04f 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default; WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index fe5bc4ade5cdb..266a37c66001d 100644 index fe5bc4ade5cd..266a37c66001 100644
--- content/public/browser/web_contents.h --- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h +++ content/public/browser/web_contents.h
@@ -88,8 +88,10 @@ class BrowserContext; @@ -88,8 +88,10 @@ class BrowserContext;
@@ -88,7 +88,7 @@ index fe5bc4ade5cdb..266a37c66001d 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 96c3b9e9b7e10..087a717df3680 100644 index 96c3b9e9b7e1..087a717df368 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
@@ -59,10 +59,12 @@ class EyeDropperListener; @@ -59,10 +59,12 @@ class EyeDropperListener;
@@ -120,10 +120,10 @@ index 96c3b9e9b7e10..087a717df3680 100644
// typically happens when popups are created. // typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents, virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index 7ee27742d3c05..0998a74a5ec0f 100644 index 5217a3a513d8..4d63c24eb30f 100644
--- content/public/browser/web_contents_observer.h --- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h
@@ -648,6 +648,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener { @@ -649,6 +649,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// WebContents has gained/lost focus. // WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {} virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

2
patch/patches/web_url_loader_cancel_1617042.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h diff --git third_party/blink/public/platform/web_url_loader.h third_party/blink/public/platform/web_url_loader.h
index 48b95a412fe0a..569e8c750e0a7 100644 index 48b95a412fe0..569e8c750e0a 100644
--- third_party/blink/public/platform/web_url_loader.h --- third_party/blink/public/platform/web_url_loader.h
+++ third_party/blink/public/platform/web_url_loader.h +++ third_party/blink/public/platform/web_url_loader.h
@@ -161,12 +161,14 @@ class BLINK_PLATFORM_EXPORT WebURLLoader { @@ -161,12 +161,14 @@ class BLINK_PLATFORM_EXPORT WebURLLoader {

18
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom diff --git third_party/blink/public/mojom/plugins/plugin_registry.mojom third_party/blink/public/mojom/plugins/plugin_registry.mojom
index ff7a8ed89e94a..77f44956ff22f 100644 index ff7a8ed89e94..77f44956ff22 100644
--- third_party/blink/public/mojom/plugins/plugin_registry.mojom --- third_party/blink/public/mojom/plugins/plugin_registry.mojom
+++ third_party/blink/public/mojom/plugins/plugin_registry.mojom +++ third_party/blink/public/mojom/plugins/plugin_registry.mojom
@@ -36,5 +36,5 @@ interface PluginRegistry { @@ -36,5 +36,5 @@ interface PluginRegistry {
@@ -10,7 +10,7 @@ index ff7a8ed89e94a..77f44956ff22f 100644
+ GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins); + GetPlugins(bool refresh, bool is_main_frame, url.mojom.Origin main_frame_origin) => (array<PluginInfo> plugins);
}; };
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index b5904a748f70b..a936bd95229b7 100644 index b5904a748f70..a936bd95229b 100644
--- third_party/blink/public/platform/platform.h --- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h +++ third_party/blink/public/platform/platform.h
@@ -774,6 +774,11 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -774,6 +774,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -26,7 +26,7 @@ index b5904a748f70b..a936bd95229b7 100644
static void InitializeMainThreadCommon(Platform* platform, static void InitializeMainThreadCommon(Platform* platform,
std::unique_ptr<Thread> main_thread); std::unique_ptr<Thread> main_thread);
diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc diff --git third_party/blink/renderer/core/dom/document_init.cc third_party/blink/renderer/core/dom/document_init.cc
index a43dcce78e486..46bbd086516f8 100644 index a43dcce78e48..46bbd086516f 100644
--- third_party/blink/renderer/core/dom/document_init.cc --- third_party/blink/renderer/core/dom/document_init.cc
+++ third_party/blink/renderer/core/dom/document_init.cc +++ third_party/blink/renderer/core/dom/document_init.cc
@@ -185,11 +185,11 @@ PluginData* DocumentInit::GetPluginData(LocalFrame* frame, const KURL& url) { @@ -185,11 +185,11 @@ PluginData* DocumentInit::GetPluginData(LocalFrame* frame, const KURL& url) {
@@ -44,7 +44,7 @@ index a43dcce78e486..46bbd086516f8 100644
DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) { DocumentInit& DocumentInit::WithTypeFrom(const String& mime_type) {
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index 4da1c9cbfdbf6..acd69b393cfc0 100644 index a70c5d861a9a..c22ebf03751c 100644
--- third_party/blink/renderer/core/frame/local_frame.cc --- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc +++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1967,7 +1967,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() { @@ -1967,7 +1967,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -57,7 +57,7 @@ index 4da1c9cbfdbf6..acd69b393cfc0 100644
} }
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
index 242653b4e7237..385e4b4d3f075 100644 index 242653b4e723..385e4b4d3f07 100644
--- third_party/blink/renderer/core/inspector/devtools_session.cc --- third_party/blink/renderer/core/inspector/devtools_session.cc
+++ third_party/blink/renderer/core/inspector/devtools_session.cc +++ third_party/blink/renderer/core/inspector/devtools_session.cc
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@@ -85,7 +85,7 @@ index 242653b4e7237..385e4b4d3f075 100644
void DevToolsSession::DispatchProtocolCommand( void DevToolsSession::DispatchProtocolCommand(
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index 415b29342170a..5aebc6d6379a5 100644 index 415b29342170..5aebc6d6379a 100644
--- third_party/blink/renderer/core/page/page.cc --- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc +++ third_party/blink/renderer/core/page/page.cc
@@ -210,7 +210,8 @@ Page::Page(PageClients& page_clients, @@ -210,7 +210,8 @@ Page::Page(PageClients& page_clients,
@@ -160,7 +160,7 @@ index 415b29342170a..5aebc6d6379a5 100644
visitor->Trace(plugins_changed_observers_); visitor->Trace(plugins_changed_observers_);
visitor->Trace(next_related_page_); visitor->Trace(next_related_page_);
diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
index d2efc89d1305e..4934e23c3b085 100644 index d2efc89d1305..4934e23c3b08 100644
--- third_party/blink/renderer/core/page/page.h --- third_party/blink/renderer/core/page/page.h
+++ third_party/blink/renderer/core/page/page.h +++ third_party/blink/renderer/core/page/page.h
@@ -156,7 +156,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>, @@ -156,7 +156,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,
@@ -184,7 +184,7 @@ index d2efc89d1305e..4934e23c3b085 100644
Member<ValidationMessageClient> validation_message_client_; Member<ValidationMessageClient> validation_message_client_;
diff --git third_party/blink/renderer/core/page/plugin_data.cc third_party/blink/renderer/core/page/plugin_data.cc diff --git third_party/blink/renderer/core/page/plugin_data.cc third_party/blink/renderer/core/page/plugin_data.cc
index 89beb74dae8a9..63bfa84b45b72 100644 index 89beb74dae8a..63bfa84b45b7 100644
--- third_party/blink/renderer/core/page/plugin_data.cc --- third_party/blink/renderer/core/page/plugin_data.cc
+++ third_party/blink/renderer/core/page/plugin_data.cc +++ third_party/blink/renderer/core/page/plugin_data.cc
@@ -91,10 +91,12 @@ void PluginData::RefreshBrowserSidePluginCache() { @@ -91,10 +91,12 @@ void PluginData::RefreshBrowserSidePluginCache() {
@@ -212,7 +212,7 @@ index 89beb74dae8a9..63bfa84b45b72 100644
auto* plugin_info = MakeGarbageCollected<PluginInfo>( auto* plugin_info = MakeGarbageCollected<PluginInfo>(
plugin->name, FilePathToWebString(plugin->filename), plugin->name, FilePathToWebString(plugin->filename),
diff --git third_party/blink/renderer/core/page/plugin_data.h third_party/blink/renderer/core/page/plugin_data.h diff --git third_party/blink/renderer/core/page/plugin_data.h third_party/blink/renderer/core/page/plugin_data.h
index fe5aa20243d89..c2b3540d3bb54 100644 index fe5aa20243d8..c2b3540d3bb5 100644
--- third_party/blink/renderer/core/page/plugin_data.h --- third_party/blink/renderer/core/page/plugin_data.h
+++ third_party/blink/renderer/core/page/plugin_data.h +++ third_party/blink/renderer/core/page/plugin_data.h
@@ -97,7 +97,8 @@ class CORE_EXPORT PluginData final : public GarbageCollected<PluginData> { @@ -97,7 +97,8 @@ class CORE_EXPORT PluginData final : public GarbageCollected<PluginData> {

24
patch/patches/webkit_popups_and_background.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/common/web_preferences/web_preferences.cc third_party/blink/common/web_preferences/web_preferences.cc diff --git third_party/blink/common/web_preferences/web_preferences.cc third_party/blink/common/web_preferences/web_preferences.cc
index 1363ee73abdfb..dca6c5b9bf66f 100644 index 1363ee73abdf..dca6c5b9bf66 100644
--- third_party/blink/common/web_preferences/web_preferences.cc --- third_party/blink/common/web_preferences/web_preferences.cc
+++ third_party/blink/common/web_preferences/web_preferences.cc +++ third_party/blink/common/web_preferences/web_preferences.cc
@@ -153,6 +153,7 @@ WebPreferences::WebPreferences() @@ -153,6 +153,7 @@ WebPreferences::WebPreferences()
@@ -11,7 +11,7 @@ index 1363ee73abdfb..dca6c5b9bf66f 100644
text_track_margin_percentage(0.0f), text_track_margin_percentage(0.0f),
immersive_mode_enabled(false), immersive_mode_enabled(false),
diff --git third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc diff --git third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
index 7fa49dd367b28..af16c09d0b85f 100644 index 7fa49dd367b2..af16c09d0b85 100644
--- third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc --- third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
+++ third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc +++ third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
@@ -159,6 +159,7 @@ bool StructTraits<blink::mojom::WebPreferencesDataView, @@ -159,6 +159,7 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -23,7 +23,7 @@ index 7fa49dd367b28..af16c09d0b85f 100644
out->text_track_margin_percentage = data.text_track_margin_percentage(); out->text_track_margin_percentage = data.text_track_margin_percentage();
out->immersive_mode_enabled = data.immersive_mode_enabled(); out->immersive_mode_enabled = data.immersive_mode_enabled();
diff --git third_party/blink/public/common/web_preferences/web_preferences.h third_party/blink/public/common/web_preferences/web_preferences.h diff --git third_party/blink/public/common/web_preferences/web_preferences.h third_party/blink/public/common/web_preferences/web_preferences.h
index c457698eba5dc..5e1e6b80cee3c 100644 index c457698eba5d..5e1e6b80cee3 100644
--- third_party/blink/public/common/web_preferences/web_preferences.h --- third_party/blink/public/common/web_preferences/web_preferences.h
+++ third_party/blink/public/common/web_preferences/web_preferences.h +++ third_party/blink/public/common/web_preferences/web_preferences.h
@@ -177,6 +177,8 @@ struct BLINK_COMMON_EXPORT WebPreferences { @@ -177,6 +177,8 @@ struct BLINK_COMMON_EXPORT WebPreferences {
@@ -36,7 +36,7 @@ index c457698eba5dc..5e1e6b80cee3c 100644
// These fields specify the foreground and background color for WebVTT text // These fields specify the foreground and background color for WebVTT text
diff --git third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h diff --git third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
index e35980e72f5d7..92f222bb29d06 100644 index e35980e72f5d..92f222bb29d0 100644
--- third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h --- third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
+++ third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h +++ third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -465,6 +465,11 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView, @@ -465,6 +465,11 @@ struct BLINK_COMMON_EXPORT StructTraits<blink::mojom::WebPreferencesDataView,
@@ -52,7 +52,7 @@ index e35980e72f5d7..92f222bb29d06 100644
return r.text_tracks_enabled; return r.text_tracks_enabled;
} }
diff --git third_party/blink/public/mojom/webpreferences/web_preferences.mojom third_party/blink/public/mojom/webpreferences/web_preferences.mojom diff --git third_party/blink/public/mojom/webpreferences/web_preferences.mojom third_party/blink/public/mojom/webpreferences/web_preferences.mojom
index 3e2aae1d92b1c..2c0ed243eedec 100644 index 3e2aae1d92b1..2c0ed243eede 100644
--- third_party/blink/public/mojom/webpreferences/web_preferences.mojom --- third_party/blink/public/mojom/webpreferences/web_preferences.mojom
+++ third_party/blink/public/mojom/webpreferences/web_preferences.mojom +++ third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -227,6 +227,8 @@ struct WebPreferences { @@ -227,6 +227,8 @@ struct WebPreferences {
@@ -65,7 +65,7 @@ index 3e2aae1d92b1c..2c0ed243eedec 100644
// These fields specify the foreground and background color for WebVTT text // These fields specify the foreground and background color for WebVTT text
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index 209067240ccce..55d642f88ad30 100644 index 209067240ccc..55d642f88ad3 100644
--- third_party/blink/public/web/web_view.h --- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h +++ third_party/blink/public/web/web_view.h
@@ -315,6 +315,7 @@ class WebView { @@ -315,6 +315,7 @@ class WebView {
@@ -77,10 +77,10 @@ index 209067240ccce..55d642f88ad30 100644
// Cancels and hides the current popup (datetime, select...) if any. // Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0; virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index f8ac3ecb711fa..eb59f73583dca 100644 index 4b7adb536a28..92ccace351db 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc --- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc +++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -241,8 +241,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) { @@ -242,8 +242,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus; g_should_use_external_popup_menus = use_external_popup_menus;
} }
@@ -96,7 +96,7 @@ index f8ac3ecb711fa..eb59f73583dca 100644
} }
namespace { namespace {
@@ -551,6 +556,7 @@ WebViewImpl::WebViewImpl( @@ -552,6 +557,7 @@ WebViewImpl::WebViewImpl(
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)), chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)), minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)), maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@@ -104,7 +104,7 @@ index f8ac3ecb711fa..eb59f73583dca 100644
does_composite_(does_composite), does_composite_(does_composite),
fullscreen_controller_(std::make_unique<FullscreenController>(this)), fullscreen_controller_(std::make_unique<FullscreenController>(this)),
receiver_(this, receiver_(this,
@@ -1769,6 +1775,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs, @@ -1770,6 +1776,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
RuntimeEnabledFeatures::SetTranslateServiceEnabled( RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available); prefs.translate_service_available);
@@ -114,7 +114,7 @@ index f8ac3ecb711fa..eb59f73583dca 100644
void WebViewImpl::ThemeChanged() { void WebViewImpl::ThemeChanged() {
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index ace66b559cdc5..130638e2dfaba 100644 index ace66b559cdc..130638e2dfab 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h --- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h +++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -128,7 +128,8 @@ class CORE_EXPORT WebViewImpl final : public WebView, @@ -128,7 +128,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -137,7 +137,7 @@ index ace66b559cdc5..130638e2dfaba 100644
TransformationMatrix device_emulation_transform_; TransformationMatrix device_emulation_transform_;
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index 4e33591b87e15..f3381f4436024 100644 index 4e33591b87e1..f3381f443602 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc --- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc +++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -811,7 +811,7 @@ bool ChromeClientImpl::HasOpenedPopup() const { @@ -811,7 +811,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {

2
patch/patches/webkit_runtime_enabled_features.patch
View File

@@ -1,5 +1,5 @@
diff --git third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl diff --git third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
index 602131e3d6407..7791b570547ed 100644 index 602131e3d640..7791b570547e 100644
--- third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl --- third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
+++ third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl +++ third_party/blink/renderer/build/scripts/templates/runtime_enabled_features.h.tmpl
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@

4
patch/patches/webui_2037.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index b180f511a9f07..e08dcb1520308 100644 index b180f511a9f0..e08dcb152030 100644
--- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc --- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc +++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
@@ -62,7 +62,7 @@ index b180f511a9f07..e08dcb1520308 100644
bool result = bool result =
base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason); base::win::IsKeyboardPresentOnSlate(ui::GetHiddenWindow(), &reason);
diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc diff --git chrome/browser/memory_details.cc chrome/browser/memory_details.cc
index 3f5b288edf3c6..46e189a2ceedd 100644 index 3f5b288edf3c..46e189a2ceed 100644
--- chrome/browser/memory_details.cc --- chrome/browser/memory_details.cc
+++ chrome/browser/memory_details.cc +++ chrome/browser/memory_details.cc
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@

2
patch/patches/webview_plugin_2020.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd diff --git chrome/app/generated_resources.grd chrome/app/generated_resources.grd
index 1c3e3d6cf653f..a82439b5be0af 100644 index 87944c3bbab6..42f18fe1917d 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -5136,7 +5136,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -5136,7 +5136,7 @@ Keep your key file in a safe place. You will need it to create new versions of y

4
patch/patches/win_cpp17_msvc_sandbox_2819.patch
View File

@@ -1,5 +1,5 @@
diff --git base/third_party/double_conversion/BUILD.gn base/third_party/double_conversion/BUILD.gn diff --git base/third_party/double_conversion/BUILD.gn base/third_party/double_conversion/BUILD.gn
index 0083efdcd9c85..6f647c31e28aa 100644 index 0083efdcd9c8..6f647c31e28a 100644
--- base/third_party/double_conversion/BUILD.gn --- base/third_party/double_conversion/BUILD.gn
+++ base/third_party/double_conversion/BUILD.gn +++ base/third_party/double_conversion/BUILD.gn
@@ -9,6 +9,11 @@ config("config") { @@ -9,6 +9,11 @@ config("config") {
@@ -15,7 +15,7 @@ index 0083efdcd9c85..6f647c31e28aa 100644
static_library("double_conversion") { static_library("double_conversion") {
diff --git base/win/BUILD.gn base/win/BUILD.gn diff --git base/win/BUILD.gn base/win/BUILD.gn
index eb5dca74bcea3..be10cc59b39c7 100644 index eb5dca74bcea..be10cc59b39c 100644
--- base/win/BUILD.gn --- base/win/BUILD.gn
+++ base/win/BUILD.gn +++ base/win/BUILD.gn
@@ -33,4 +33,7 @@ static_library("pe_image") { @@ -33,4 +33,7 @@ static_library("pe_image") {