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 101.0.4951.15

Browse Source
This commit is contained in:
Marshall Greenblatt
2022-03-31 19:17:05 -04:00
parent a3b1dc01ea
commit 889823e082
9 changed files with 52 additions and 51 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/101.0.4951.0' 'chromium_checkout': 'refs/tags/101.0.4951.15',
'depot_tools_checkout': '7f02c0d981'
} }

6
patch/patches/browser_security_policy_1081397.patch
View File

@@ -20,10 +20,10 @@ index f5b91aa9fc965..65319cceb358c 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 dad72b675ef23..e5afb8080f074 100644 index 72a902bbd2557..df1a8e009755a 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
@@ -6053,6 +6053,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost( @@ -6069,6 +6069,12 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithoutFinalFrameHost(
network::mojom::WebSandboxFlags sandbox_flags) { network::mojom::WebSandboxFlags sandbox_flags) {
// Calculate an approximation of the origin. The sandbox/csp are ignored. // Calculate an approximation of the origin. The sandbox/csp are ignored.
url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this); url::Origin origin = GetOriginForURLLoaderFactoryUnchecked(this);
@@ -36,7 +36,7 @@ index dad72b675ef23..e5afb8080f074 100644
// Apply sandbox flags. // Apply sandbox flags.
// See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag // See https://html.spec.whatwg.org/#sandboxed-origin-browsing-context-flag
@@ -6086,6 +6092,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() { @@ -6102,6 +6108,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryWithFinalFrameHost() {
if (IsSameDocument() || IsPageActivation()) if (IsSameDocument() || IsPageActivation())
return GetRenderFrameHost()->GetLastCommittedOrigin(); return GetRenderFrameHost()->GetLastCommittedOrigin();

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 fbceb85450c53..1141aa50698fe 100644 index 9f43f67ddb16b..36f37256c29a4 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni") @@ -12,6 +12,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index fbceb85450c53..1141aa50698fe 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")
@@ -1916,6 +1917,7 @@ static_library("browser") { @@ -1921,6 +1922,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 fbceb85450c53..1141aa50698fe 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2572,6 +2574,10 @@ static_library("browser") { @@ -2577,6 +2579,10 @@ static_library("browser") {
deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ] deps += [ "//chrome/browser/ui/webui/connectors_internals:mojo_bindings" ]
} }

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 936021a313995..2dd2554f8a7c5 100644 index 8b45cdafec81d..2bf3e9957623d 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/features.gni") @@ -10,6 +10,7 @@ import("//build/config/features.gni")
@@ -29,7 +29,7 @@ index 936021a313995..2dd2554f8a7c5 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -5301,6 +5307,7 @@ static_library("ui") { @@ -5298,6 +5304,7 @@ static_library("ui") {
if (enable_basic_printing) { if (enable_basic_printing) {
deps += [ deps += [
"//components/printing/browser", "//components/printing/browser",

28
patch/patches/chrome_runtime.patch
View File

@@ -132,7 +132,7 @@ index 566535f74acf1..4b435553575b0 100644
GetMainRunLoopInstance()->QuitWhenIdleClosure()); GetMainRunLoopInstance()->QuitWhenIdleClosure());
} }
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 831d7173873d1..594aee58331a7 100644 index 8bf722c61c059..ac755279227f2 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 @@
@@ -143,7 +143,7 @@ index 831d7173873d1..594aee58331a7 100644
#import "chrome/browser/app_controller_mac.h" #import "chrome/browser/app_controller_mac.h"
#include "chrome/browser/apps/app_shim/app_shim_listener.h" #include "chrome/browser/apps/app_shim/app_shim_listener.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
@@ -111,6 +112,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { @@ -112,6 +113,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
} }
} }
@@ -151,15 +151,15 @@ index 831d7173873d1..594aee58331a7 100644
// Create the app delegate. This object is intentionally leaked as a global // Create the app delegate. This object is intentionally leaked as a global
// singleton. It is accessed through -[NSApp delegate]. // singleton. It is accessed through -[NSApp delegate].
AppController* app_controller = [[AppController alloc] init]; AppController* app_controller = [[AppController alloc] init];
@@ -119,6 +121,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { @@ -120,6 +122,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() {
chrome::BuildMainMenu(NSApp, app_controller, chrome::BuildMainMenu(NSApp, app_controller,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false); l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), false);
[app_controller mainMenuCreated]; [app_controller mainMenuCreated];
+#endif // BUILDFLAG(ENABLE_CEF) +#endif // BUILDFLAG(ENABLE_CEF)
chrome::DeveloperIDCertificateReauthorizeInApp(); chrome::DeveloperIDCertificateReauthorizeInApp();
chrome::PurgeStaleScreenCapturePermission();
@@ -180,7 +183,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile, @@ -182,7 +185,9 @@ void ChromeBrowserMainPartsMac::PostProfileInit(Profile* profile,
} }
void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() { void ChromeBrowserMainPartsMac::DidEndMainMessageLoop() {
@@ -170,7 +170,7 @@ index 831d7173873d1..594aee58331a7 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 019fd68040dc5..794765646efc7 100644 index 8f28441f6639b..b23d0e2a11e87 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
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
@@ -202,7 +202,7 @@ index 019fd68040dc5..794765646efc7 100644
// static // static
void ChromeContentBrowserClient::RegisterLocalStatePrefs( void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) { PrefRegistrySimple* registry) {
@@ -3725,9 +3733,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( @@ -3740,9 +3748,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite); &search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_ANDROID)
@@ -214,7 +214,7 @@ index 019fd68040dc5..794765646efc7 100644
} }
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -5354,7 +5364,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( @@ -5369,7 +5379,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
network_service); network_service);
} }
@@ -223,7 +223,7 @@ index 019fd68040dc5..794765646efc7 100644
content::BrowserContext* context, content::BrowserContext* context,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
@@ -5372,6 +5382,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( @@ -5387,6 +5397,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale(); network_context_params->accept_language = GetApplicationLocale();
} }
@@ -232,7 +232,7 @@ index 019fd68040dc5..794765646efc7 100644
} }
std::vector<base::FilePath> std::vector<base::FilePath>
@@ -6212,10 +6224,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( @@ -6227,10 +6239,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context); const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@@ -245,7 +245,7 @@ index 019fd68040dc5..794765646efc7 100644
FROM_HERE, keepalive_deadline_ - now, FROM_HERE, keepalive_deadline_ - now,
base::BindOnce( base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired, &ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -6234,7 +6246,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { @@ -6249,7 +6261,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_; --num_keepalive_requests_;
if (num_keepalive_requests_ == 0) { if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer"; DVLOG(1) << "Stopping the keepalive timer";
@@ -255,7 +255,7 @@ index 019fd68040dc5..794765646efc7 100644
// This deletes the keep alive handle attached to the timer function and // This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence. // unblock the shutdown sequence.
} }
@@ -6342,7 +6355,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( @@ -6357,7 +6370,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now(); const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_; const auto then = keepalive_deadline_;
if (now < then) { if (now < then) {
@@ -296,7 +296,7 @@ index 4aa99834bd6c7..cd932dd3cacf4 100644
#endif #endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index a265ff6d1cf43..cebf6e611c84d 100644 index 095881e6bb92f..3c25e8af6f950 100644
--- chrome/browser/prefs/browser_prefs.cc --- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@@ -318,7 +318,7 @@ index a265ff6d1cf43..cebf6e611c84d 100644
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1264,6 +1269,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, @@ -1267,6 +1272,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
SessionDataService::RegisterProfilePrefs(registry); SessionDataService::RegisterProfilePrefs(registry);
#endif #endif

36
patch/patches/chrome_runtime_views.patch
View File

@@ -171,10 +171,10 @@ index d42661a633fcd..85b03452d4dc3 100644
BrowserFrame(const BrowserFrame&) = delete; BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(const BrowserFrame&) = delete; BrowserFrame& operator=(const BrowserFrame&) = delete;
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 39cef285ed27c..e08ec72ba9c85 100644 index f0303eb7fc215..e32d8a8d61001 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
@@ -300,11 +300,10 @@ using content::WebContents; @@ -302,11 +302,10 @@ using content::WebContents;
using views::ColumnSet; using views::ColumnSet;
using web_modal::WebContentsModalDialogHost; using web_modal::WebContentsModalDialogHost;
@@ -189,7 +189,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
#if BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation. // UMA histograms that record animation smoothness for tab loading animation.
@@ -689,11 +688,22 @@ class BrowserView::SidePanelButtonHighlighter : public views::ViewObserver { @@ -795,11 +794,22 @@ class BrowserView::SidePanelVisibilityController : public views::ViewObserver {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// BrowserView, public: // BrowserView, public:
@@ -213,7 +213,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
SetShowIcon( SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay())); ::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -728,7 +738,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser) @@ -834,7 +844,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
} }
browser_->tab_strip_model()->AddObserver(this); browser_->tab_strip_model()->AddObserver(this);
@@ -221,7 +221,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
// Top container holds tab strip region and toolbar and lives at the front of // Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy. // the view hierarchy.
@@ -771,8 +780,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser) @@ -877,8 +886,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>( contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_)); devtools_web_view_, contents_web_view_));
@@ -239,7 +239,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
contents_separator_ = contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>()); top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1644,6 +1660,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const { @@ -1763,6 +1779,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled()) if (immersive_mode_controller_->IsEnabled())
return false; return false;
@@ -248,7 +248,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen(); return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
} }
@@ -2814,7 +2832,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const { @@ -2934,7 +2952,8 @@ BrowserView::GetNativeViewHostsForTopControlsSlide() const {
} }
void BrowserView::ReparentTopContainerForEndOfImmersive() { void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -258,7 +258,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
top_container()->DestroyLayer(); top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0); AddChildViewAt(top_container(), 0);
EnsureFocusOrder(); EnsureFocusOrder();
@@ -3334,8 +3353,10 @@ void BrowserView::Layout() { @@ -3475,8 +3494,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code? // TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@@ -271,7 +271,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
// Some of the situations when the BrowserView is laid out are: // Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode. // - Enter/exit immersive fullscreen mode.
@@ -3401,6 +3422,11 @@ void BrowserView::AddedToWidget() { @@ -3542,6 +3563,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif #endif
@@ -283,7 +283,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
toolbar_->Init(); toolbar_->Init();
// TODO(pbos): Manage this either inside SidePanel or the corresponding button // TODO(pbos): Manage this either inside SidePanel or the corresponding button
@@ -3459,13 +3485,9 @@ void BrowserView::AddedToWidget() { @@ -3605,13 +3631,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder(); EnsureFocusOrder();
@@ -299,7 +299,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
using_native_frame_ = frame_->ShouldUseNativeFrame(); using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip(); MaybeInitializeWebUITabStrip();
@@ -3894,7 +3916,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, @@ -4040,7 +4062,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout. // Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false; in_process_fullscreen_ = false;
ToolbarSizeChanged(false); ToolbarSizeChanged(false);
@@ -309,7 +309,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
} }
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4221,6 +4244,8 @@ Profile* BrowserView::GetProfile() { @@ -4367,6 +4390,8 @@ Profile* BrowserView::GetProfile() {
} }
void BrowserView::UpdateUIForTabFullscreen() { void BrowserView::UpdateUIForTabFullscreen() {
@@ -318,7 +318,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
frame()->GetFrameView()->UpdateFullscreenTopUI(); frame()->GetFrameView()->UpdateFullscreenTopUI();
} }
@@ -4243,6 +4268,8 @@ void BrowserView::HideDownloadShelf() { @@ -4389,6 +4414,8 @@ void BrowserView::HideDownloadShelf() {
} }
bool BrowserView::CanUserExitFullscreen() const { bool BrowserView::CanUserExitFullscreen() const {
@@ -328,7 +328,7 @@ index 39cef285ed27c..e08ec72ba9c85 100644
} }
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 69f92ec5228c4..b6100283f81d0 100644 index 19ffaf7bb75ab..062dadf456efa 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
@@ -127,11 +127,16 @@ class BrowserView : public BrowserWindow, @@ -127,11 +127,16 @@ class BrowserView : public BrowserWindow,
@@ -348,7 +348,7 @@ index 69f92ec5228c4..b6100283f81d0 100644
void set_frame(BrowserFrame* frame) { frame_ = frame; } void set_frame(BrowserFrame* frame) { frame_ = frame; }
BrowserFrame* frame() const { return frame_; } BrowserFrame* frame() const { return frame_; }
@@ -732,6 +737,12 @@ class BrowserView : public BrowserWindow, @@ -741,6 +746,12 @@ class BrowserView : public BrowserWindow,
const std::map<std::string, std::string>& extra_data) override; const std::map<std::string, std::string>& extra_data) override;
#endif #endif
@@ -441,10 +441,10 @@ index 7475765f4b514..25c59d942782b 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 ef42774da13f6..840b7aa893ca8 100644 index 9f76962e79146..0009632e9011c 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
@@ -172,12 +172,13 @@ auto& GetViewCommandMap() { @@ -173,12 +173,13 @@ auto& GetViewCommandMap() {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public: // ToolbarView, public:
@@ -460,7 +460,7 @@ index ef42774da13f6..840b7aa893ca8 100644
SetID(VIEW_ID_TOOLBAR); SetID(VIEW_ID_TOOLBAR);
UpgradeDetector::GetInstance()->AddObserver(this); UpgradeDetector::GetInstance()->AddObserver(this);
@@ -212,7 +213,7 @@ void ToolbarView::Init() { @@ -213,7 +214,7 @@ void ToolbarView::Init() {
#endif #endif
auto location_bar = std::make_unique<LocationBarView>( auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this, browser_, browser_->profile(), browser_->command_controller(), this,

14
patch/patches/crashpad_tp_1995.patch
View File

@@ -197,7 +197,7 @@ index efbeab7804c44..44fd31e58175c 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 70f1628354455..cd043a821e96d 100644 index 2af958d7da9e5..6a67185a668af 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 @@
@@ -208,16 +208,16 @@ index 70f1628354455..cd043a821e96d 100644
#include <memory> #include <memory>
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
@@ -108,7 +109,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, @@ -111,7 +112,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! It is expected to only be called from the same thread that called Start(). //! \return `true` if the thread is running, `false` if it is not.
void Stop() override; bool is_running() const { return thread_.is_running(); }
- private: - private:
+ protected: + protected:
//! \brief The result code from UploadReport(). //! \brief The result code from UploadReport().
enum class UploadResult { enum class UploadResult {
//! \brief The crash report was uploaded successfully. //! \brief The crash report was uploaded successfully.
@@ -136,7 +137,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, @@ -139,7 +140,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! object was constructed with \a watch_pending_reports, it will also scan //! object was constructed with \a watch_pending_reports, it will also scan
//! the crash report database for other pending reports, and process those as //! the crash report database for other pending reports, and process those as
//! well. //! well.
@@ -226,7 +226,7 @@ index 70f1628354455..cd043a821e96d 100644
//! \brief Processes a single pending report from the database. //! \brief Processes a single pending report from the database.
//! //!
@@ -150,7 +151,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate, @@ -153,7 +154,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
//! remain in the “pending” state. If the upload fails and no more retries are //! remain in the “pending” state. If the upload fails and no more retries are
//! desired, or report upload is disabled, it will be marked as “completed” in //! desired, or report upload is disabled, it will be marked as “completed” in
//! the database without ever having been uploaded. //! the database without ever having been uploaded.
@@ -235,7 +235,7 @@ index 70f1628354455..cd043a821e96d 100644
//! \brief Attempts to upload a crash report. //! \brief Attempts to upload a crash report.
//! //!
@@ -167,6 +168,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate, @@ -170,6 +171,11 @@ class CrashReportUploadThread : public WorkerThread::Delegate,
UploadResult UploadReport(const CrashReportDatabase::UploadReport* report, UploadResult UploadReport(const CrashReportDatabase::UploadReport* report,
std::string* response_body); std::string* response_body);

2
patch/patches/gn_config.patch
View File

@@ -12,7 +12,7 @@ index 5356717746edd..6345b837a6ea6 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 f686fc6368936..37848e164aeb0 100644 index 7dd89e07a401a..a47e59d1e769a 100644
--- BUILD.gn --- BUILD.gn
+++ BUILD.gn +++ BUILD.gn
@@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni") @@ -17,6 +17,7 @@ import("//build/config/sanitizers/sanitizers.gni")

4
patch/patches/services_network_2622.patch
View File

@@ -123,10 +123,10 @@ index 49c53dc75789f..07c204a826877 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 6564e1dda47a9..d7d67a96a3a64 100644 index 18fd482ea1c74..92a2a57a451e8 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -2300,17 +2300,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -2302,17 +2302,21 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator()); network_service_->network_quality_estimator());
} }