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 89.0.4389.40

Browse Source
This commit is contained in:
Marshall Greenblatt
2021-02-08 19:05:42 -05:00
parent 5ef0fb8ac8
commit e528bdb0b7
21 changed files with 67 additions and 66 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
{
'chromium_checkout': 'refs/tags/89.0.4389.0'
'chromium_checkout': 'refs/tags/89.0.4389.40',
'depot_tools_checkout': '1f976d6f30'
}

4
patch/patches/base_sandbox_2743.patch
View File

@@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 4516b3575892..db53b698a7d4 100644
index 21e4ee1d3efb..ef289b9d5c91 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -34,6 +34,7 @@ import("//build/config/ui.gni")
@@ -23,7 +23,7 @@ index 4516b3575892..db53b698a7d4 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -1867,6 +1872,12 @@ component("base") {
@@ -1869,6 +1874,12 @@ component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}

8
patch/patches/chrome_browser.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 40c07e2d724a..1cfe14f8cd6f 100644
index f246df9270f8..89e95f41987c 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/crypto.gni")
@@ -10,7 +10,7 @@ index 40c07e2d724a..1cfe14f8cd6f 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1966,6 +1967,7 @@ static_library("browser") {
@@ -1968,6 +1969,7 @@ static_library("browser") {
"//build:chromeos_buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@@ -18,7 +18,7 @@ index 40c07e2d724a..1cfe14f8cd6f 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2489,6 +2491,10 @@ static_library("browser") {
@@ -2492,6 +2494,10 @@ static_library("browser") {
]
}
@@ -29,7 +29,7 @@ index 40c07e2d724a..1cfe14f8cd6f 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -5104,7 +5110,7 @@ static_library("browser") {
@@ -5105,7 +5111,7 @@ static_library("browser") {
]
}

10
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
index e2eb5c2c73d0..601b582c6675 100644
index 88858a923a07..2a1d137c70f4 100644
--- chrome/browser/app_controller_mac.mm
+++ chrome/browser/app_controller_mac.mm
@@ -1194,6 +1194,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
@@ -18,7 +18,7 @@ index e2eb5c2c73d0..601b582c6675 100644
}
// Same as |-commandDispatch:|, but executes commands using a disposition
@@ -1599,6 +1601,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
@@ -1600,6 +1602,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
// TODO(rickcam): Mock out BackgroundApplicationListModel, then add unit
// tests which use the mock in place of the profile-initialized model.
@@ -26,7 +26,7 @@ index e2eb5c2c73d0..601b582c6675 100644
// Avoid breaking unit tests which have no profile.
if (profile) {
BackgroundApplicationListModel applications(profile);
@@ -1625,6 +1628,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
@@ -1626,6 +1629,7 @@ static base::mac::ScopedObjCClassSwizzler* g_swizzle_imk_input_session;
}
}
}
@@ -118,10 +118,10 @@ index e0cafee5eedd..06ded156be3c 100644
// Make a copy of the BrowserList to simplify the case where we need to
// destroy a Browser during the loop.
diff --git chrome/browser/sessions/session_service.cc chrome/browser/sessions/session_service.cc
index cbddcc52a8f6..02ab085c481c 100644
index 6857a3cc5cae..c4d9db6ad7d5 100644
--- chrome/browser/sessions/session_service.cc
+++ chrome/browser/sessions/session_service.cc
@@ -968,12 +968,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
@@ -985,12 +985,19 @@ void SessionService::MaybeDeleteSessionOnlyData() {
if (!profile() || profile()->AsTestingProfile())
return;

34
patch/patches/chrome_browser_browser.patch
View File

@@ -13,7 +13,7 @@ index ba0c5c3fc044..b4df9af95ecd 100644
return false;
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 1dc23535c42a..4aae0399346f 100644
index 409f908148b3..19e57752bb78 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -257,6 +257,20 @@
@@ -37,7 +37,7 @@ index 1dc23535c42a..4aae0399346f 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
@@ -480,6 +494,13 @@ Browser::Browser(const CreateParams& params)
@@ -482,6 +496,13 @@ Browser::Browser(const CreateParams& params)
tab_strip_model_->AddObserver(this);
@@ -51,7 +51,7 @@ index 1dc23535c42a..4aae0399346f 100644
location_bar_model_ = std::make_unique<LocationBarModelImpl>(
location_bar_model_delegate_.get(), content::kMaxURLDisplayChars);
@@ -1343,6 +1364,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1345,6 +1366,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@@ -66,7 +66,7 @@ index 1dc23535c42a..4aae0399346f 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1350,8 +1379,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1352,8 +1381,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@@ -87,7 +87,7 @@ index 1dc23535c42a..4aae0399346f 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1579,6 +1618,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1581,6 +1620,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@@ -102,7 +102,7 @@ index 1dc23535c42a..4aae0399346f 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1692,6 +1739,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1694,6 +1741,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool to_different_document) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, to_different_document);
@@ -111,7 +111,7 @@ index 1dc23535c42a..4aae0399346f 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1719,6 +1768,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1721,6 +1770,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -120,7 +120,7 @@ index 1dc23535c42a..4aae0399346f 100644
if (!GetStatusBubble())
return;
@@ -1726,6 +1777,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1728,6 +1779,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@@ -138,7 +138,7 @@ index 1dc23535c42a..4aae0399346f 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1842,6 +1904,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1844,6 +1906,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@@ -149,7 +149,7 @@ index 1dc23535c42a..4aae0399346f 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -1878,6 +1944,8 @@ void Browser::RendererResponsive(
@@ -1880,6 +1946,8 @@ void Browser::RendererResponsive(
void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) {
if (web_contents == tab_strip_model_->GetActiveWebContents())
UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
@@ -158,7 +158,7 @@ index 1dc23535c42a..4aae0399346f 100644
}
content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager(
@@ -1924,11 +1992,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -1926,11 +1994,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@@ -174,7 +174,7 @@ index 1dc23535c42a..4aae0399346f 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2826,6 +2898,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2828,6 +2900,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
content_translate_driver->RemoveTranslationObserver(this);
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
}
@@ -184,7 +184,7 @@ index 1dc23535c42a..4aae0399346f 100644
void Browser::CloseFrame() {
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 7287ec00c3f5..93df2551fab7 100644
index 1ccab44183bf..5a982980d79f 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@@ -206,7 +206,7 @@ index 7287ec00c3f5..93df2551fab7 100644
#if defined(OS_ANDROID)
#error This file should only be included on desktop.
#endif
@@ -269,6 +274,11 @@ class Browser : public TabStripModelObserver,
@@ -273,6 +278,11 @@ class Browser : public TabStripModelObserver,
// User-set title of this browser window, if there is one.
std::string user_title;
@@ -218,7 +218,7 @@ index 7287ec00c3f5..93df2551fab7 100644
private:
friend class Browser;
friend class WindowSizerChromeOSTest;
@@ -386,6 +396,12 @@ class Browser : public TabStripModelObserver,
@@ -393,6 +403,12 @@ class Browser : public TabStripModelObserver,
return &signin_view_controller_;
}
@@ -231,7 +231,7 @@ index 7287ec00c3f5..93df2551fab7 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -770,6 +786,11 @@ class Browser : public TabStripModelObserver,
@@ -777,6 +793,11 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@@ -243,7 +243,7 @@ index 7287ec00c3f5..93df2551fab7 100644
void ContentsMouseEvent(content::WebContents* source,
bool motion,
bool exited) override;
@@ -1240,6 +1261,10 @@ class Browser : public TabStripModelObserver,
@@ -1248,6 +1269,10 @@ class Browser : public TabStripModelObserver,
extension_browser_window_helper_;
#endif

2
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
index afee70a01862..e49e769b6366 100644
index b89946d77d8d..2063273f7a9f 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -12,6 +12,7 @@ import("//build/config/features.gni")

4
patch/patches/chrome_browser_product_override.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 19c5989c8b67..e85ce53a22a1 100644
index 1b4dffcda417..279d8522dccd 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -1067,10 +1067,6 @@ void LaunchURL(const GURL& url,
@@ -29,7 +29,7 @@ index 19c5989c8b67..e85ce53a22a1 100644
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kUserAgent)) {
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 3ef2329ac8a6..3e3ede99e042 100644
index 7fd6936c4ee8..ce07e8959232 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -108,7 +108,8 @@ class ChromeXrIntegrationClient;

10
patch/patches/chrome_browser_profiles.patch
View File

@@ -1,5 +1,5 @@
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index 102a4c5ce183..a6ce775156b4 100644
index 20f57ee35862..1046710291b9 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -390,7 +390,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -12,10 +12,10 @@ index 102a4c5ce183..a6ce775156b4 100644
}
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
index 1be24b4ee39c..4288383cb2a8 100644
index 69840a8d8e2f..4ec980d7b914 100644
--- chrome/browser/profiles/profile_manager.h
+++ chrome/browser/profiles/profile_manager.h
@@ -106,7 +106,7 @@ class ProfileManager : public content::NotificationObserver,
@@ -113,7 +113,7 @@ class ProfileManager : public content::NotificationObserver,
// acceptable. Returns null if creation of the new profile fails.
// TODO(bauerb): Migrate calls from other code to GetProfileByPath(), then
// make this method private.
@@ -24,7 +24,7 @@ index 1be24b4ee39c..4288383cb2a8 100644
// Returns regular or off-the-record profile given its profile key.
static Profile* GetProfileFromProfileKey(ProfileKey* profile_key);
@@ -139,7 +139,7 @@ class ProfileManager : public content::NotificationObserver,
@@ -146,7 +146,7 @@ class ProfileManager : public content::NotificationObserver,
// Returns true if the profile pointer is known to point to an existing
// profile.
@@ -33,7 +33,7 @@ index 1be24b4ee39c..4288383cb2a8 100644
// Returns the directory where the first created profile is stored,
// relative to the user data directory currently in use.
@@ -148,7 +148,7 @@ class ProfileManager : public content::NotificationObserver,
@@ -155,7 +155,7 @@ class ProfileManager : public content::NotificationObserver,
// Get the Profile last used (the Profile to which owns the most recently
// focused window) with this Chrome build. If no signed profile has been
// stored in Local State, hand back the Default profile.

2
patch/patches/chrome_plugins.patch
View File

@@ -198,7 +198,7 @@ index ce40f0039fe0..c8cbecb61455 100644
// that the X-Frame-Options protection mechanism is set to either DENY or
// SAMEORIGIN.
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index a1c26dfbd5cc..aaf96b069c32 100644
index 8268205a1db1..283807a0dd6a 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -848,6 +848,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(

2
patch/patches/chrome_runtime.patch
View File

@@ -78,7 +78,7 @@ index db85b6b2fcf5..bcf6867e8f4e 100644
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index fee4d5f1a8ca..2e4fb506d851 100644
index 48ac613da9e7..ee35924ef215 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -49,6 +49,7 @@

10
patch/patches/content_2015.patch
View File

@@ -240,7 +240,7 @@ index 4bb04980b544..4e1e448a8bfc 100644
std::string /* mime_type */,
bool /* found */,
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 4438e0417b3c..cdc59afa7f54 100644
index e79384f012c5..500d20671125 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@@ -253,7 +253,7 @@ index 4438e0417b3c..cdc59afa7f54 100644
#include <utility>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index df6e463d1518..68ab6d8748eb 100644
index a0d311812044..0a3f06e3ef7a 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -32,6 +32,7 @@
@@ -264,7 +264,7 @@ index df6e463d1518..68ab6d8748eb 100644
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
#include "device/vr/buildflags/buildflags.h"
@@ -1686,6 +1687,14 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1713,6 +1714,14 @@ class CONTENT_EXPORT ContentBrowserClient {
const base::Optional<url::Origin>& initiating_origin,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@@ -279,7 +279,7 @@ index df6e463d1518..68ab6d8748eb 100644
// Creates an OverlayWindow to be used for Picture-in-Picture. This window
// will house the content shown when in Picture-in-Picture mode. This will
// return a new OverlayWindow.
@@ -1757,6 +1766,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1784,6 +1793,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@@ -340,7 +340,7 @@ index a4695ba832fc..3eb41cb569b1 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index fcb99889673b..9d50aa58f325 100644
index a401af64fad7..229b79fb71d7 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3639,7 +3639,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(

6
patch/patches/content_main_654986.patch
View File

@@ -94,7 +94,7 @@ index 2aba28d210db..5413f08af93d 100644
return RunContentProcess(params, runner.get());
}
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index 811017f5d455..00e4020dea17 100644
index 1f05e6351c58..4de74fb3cf50 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -48,6 +48,7 @@
@@ -105,7 +105,7 @@ index 811017f5d455..00e4020dea17 100644
#include "base/trace_event/trace_event.h"
#include "components/discardable_memory/service/discardable_shared_memory_manager.h"
#include "components/download/public/common/download_task_runner.h"
@@ -629,7 +630,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@@ -631,7 +632,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
#else // !OS_WIN
#if defined(OS_MAC)
@@ -114,7 +114,7 @@ index 811017f5d455..00e4020dea17 100644
#endif // defined(OS_MAC)
#if defined(OS_ANDROID)
@@ -1089,6 +1090,11 @@ void ContentMainRunnerImpl::Shutdown() {
@@ -1098,6 +1099,11 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true;
}

4
patch/patches/print_preview_123.patch
View File

@@ -58,7 +58,7 @@ index 97cae92b96fa..6acf5188e1d6 100644
// Add an entry to the map.
preview_dialog_map_[preview_dialog] = initiator;
diff --git chrome/browser/printing/print_view_manager_base.cc chrome/browser/printing/print_view_manager_base.cc
index ae1ab34986d1..b742e9fffaf3 100644
index 83849c57ba42..d53d82a72a3a 100644
--- chrome/browser/printing/print_view_manager_base.cc
+++ chrome/browser/printing/print_view_manager_base.cc
@@ -22,6 +22,7 @@
@@ -341,7 +341,7 @@ index 67aa6bc0d76e..0fecbd87423b 100644
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
index fb3328d0d75b..4dd94d59e195 100644
index 43259fb9d86d..c8c2f7e5a107 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -29,6 +29,7 @@

4
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
index dd16ddb90fa9..1d70818d0eff 100644
index 33122769e7c4..e0693d4aa14e 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -657,10 +657,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
@@ -19,7 +19,7 @@ index dd16ddb90fa9..1d70818d0eff 100644
}
base::Optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
@@ -2020,6 +2022,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -2005,6 +2007,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
// This needs to happen only after |window_| has been initialized using
// Init(), because it needs to have the layer.
window_->SetEmbedFrameSinkId(frame_sink_id_);

6
patch/patches/services_network_2622.patch
View File

@@ -123,10 +123,10 @@ index f91ffe61dba5..f3482e68cd11 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index a75980730046..a0c104d88545 100644
index db667e13f2e4..56016c1c0e5d 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2014,16 +2014,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2015,16 +2015,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@@ -157,7 +157,7 @@ index a75980730046..a0c104d88545 100644
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 294b04445bd3..f1f81e44986f 100644
index 8ac73cae1530..0574e447272e 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -288,6 +288,9 @@ struct NetworkContextParams {

6
patch/patches/services_network_2718.patch
View File

@@ -1,5 +1,5 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index 46fd3da02453..879e7a0b2275 100644
index c28ce91036fb..d3e5f22a570d 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -495,10 +495,6 @@ class LoginHandlerDelegate {
@@ -26,7 +26,7 @@ index 46fd3da02453..879e7a0b2275 100644
new LoginHandlerDelegate(std::move(auth_challenge_responder),
std::move(web_contents_getter), auth_info,
is_request_for_main_frame, process_id, routing_id,
@@ -2449,8 +2439,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -2451,8 +2441,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@@ -40,7 +40,7 @@ index 46fd3da02453..879e7a0b2275 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -2462,6 +2456,11 @@ void StoragePartitionImpl::InitNetworkContext() {
@@ -2464,6 +2458,11 @@ void StoragePartitionImpl::InitNetworkContext() {
GetContentClient()->browser()->ConfigureNetworkContextParams(
browser_context_, is_in_memory_, relative_partition_path_,
context_params.get(), cert_verifier_creation_params.get());

6
patch/patches/views_1749_2102.patch
View File

@@ -238,10 +238,10 @@ index 2426029d6733..d12bc4568203 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 15d30255e990..745b483213cf 100644
index 867971462753..da96feb22859 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2744,8 +2744,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2736,8 +2736,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@@ -256,7 +256,7 @@ index 15d30255e990..745b483213cf 100644
MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2764,8 +2769,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2756,8 +2761,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);

4
patch/patches/views_widget.patch
View File

@@ -359,10 +359,10 @@ index 52c1d1eb59c4..ebcbd0286a7b 100644
}
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 819ea9ae89cc..1cae5eda3d5f 100644
index 07e66170f483..dc9d58a76dd8 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -318,6 +318,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -317,6 +317,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// the concept with bubble anchoring a la BubbleDialogDelegateView.
gfx::NativeView parent = nullptr;

2
patch/patches/viz_osr_2575.patch
View File

@@ -80,7 +80,7 @@ index 1026b739d283..fe562ab60ce9 100644
private:
const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index c66d791c7c9a..5c98ae02d8b7 100644
index 0f6a5a2fa3d8..5365d4015e7e 100644
--- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn
@@ -180,6 +180,8 @@ viz_component("service") {

4
patch/patches/webkit_plugin_info_2015.patch
View File

@@ -44,10 +44,10 @@ index 570678bc648c..42d979f2a496 100644
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
index aa8952f06c9d..1fed8c0efe80 100644
index dfd7e20c2665..d7ff4836b1c9 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1811,7 +1811,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -1864,7 +1864,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins())
return nullptr;

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
index 3a1f50cb713c..e915ab4ee03a 100644
index 3173fac28aa8..299722517a42 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -5083,7 +5083,7 @@ Keep your key file in a safe place. You will need it to create new versions of y