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 80.0.3987.116

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-02-18 19:32:14 -05:00
parent 294eb75355
commit 14948082f3
16 changed files with 82 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{ {
'chromium_checkout': 'refs/tags/80.0.3987.0' 'chromium_checkout': 'refs/tags/80.0.3987.116'
} }

33
patch/patches/build_jumbo.patch
View File

@@ -53,7 +53,7 @@ index 3f790e96da74..7deec3e4b0ce 100644
event_router->GetEngineIfActive(extension_id, error); event_router->GetEngineIfActive(extension_id, error);
return engine; return engine;
diff --git chrome/browser/optimization_guide/optimization_guide_navigation_data.cc chrome/browser/optimization_guide/optimization_guide_navigation_data.cc diff --git chrome/browser/optimization_guide/optimization_guide_navigation_data.cc chrome/browser/optimization_guide/optimization_guide_navigation_data.cc
index acbec3d510c4..3f640008ddc0 100644 index 756a80c5565b..cb91b30e7882 100644
--- chrome/browser/optimization_guide/optimization_guide_navigation_data.cc --- chrome/browser/optimization_guide/optimization_guide_navigation_data.cc
+++ chrome/browser/optimization_guide/optimization_guide_navigation_data.cc +++ chrome/browser/optimization_guide/optimization_guide_navigation_data.cc
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
@@ -91,10 +91,10 @@ index acbec3d510c4..3f640008ddc0 100644
int64_t navigation_id) int64_t navigation_id)
: navigation_id_(navigation_id) {} : navigation_id_(navigation_id) {}
diff --git chrome/browser/optimization_guide/prediction/prediction_manager.cc chrome/browser/optimization_guide/prediction/prediction_manager.cc diff --git chrome/browser/optimization_guide/prediction/prediction_manager.cc chrome/browser/optimization_guide/prediction/prediction_manager.cc
index f8eb245f6b48..6b24f4d43d5f 100644 index dfb47dfd1886..bf0753323b61 100644
--- chrome/browser/optimization_guide/prediction/prediction_manager.cc --- chrome/browser/optimization_guide/prediction/prediction_manager.cc
+++ chrome/browser/optimization_guide/prediction/prediction_manager.cc +++ chrome/browser/optimization_guide/prediction/prediction_manager.cc
@@ -61,7 +61,9 @@ bool ShouldUseCurrentOptimizationTargetDecision( @@ -62,7 +62,9 @@ bool ShouldUseCurrentOptimizationTargetDecision(
// Delay between retries on failed fetch and store of prediction models and // Delay between retries on failed fetch and store of prediction models and
// host model features from the remote Optimization Guide Service. // host model features from the remote Optimization Guide Service.
@@ -104,7 +104,7 @@ index f8eb245f6b48..6b24f4d43d5f 100644
// The amount of time to wait after a successful fetch of models and host model // The amount of time to wait after a successful fetch of models and host model
// features before requesting an update from the remote Optimization Guide // features before requesting an update from the remote Optimization Guide
@@ -71,11 +73,13 @@ constexpr base::TimeDelta kUpdateModelsAndFeaturesDelay = @@ -72,11 +74,13 @@ constexpr base::TimeDelta kUpdateModelsAndFeaturesDelay =
// Provide a random time delta in seconds before fetching models and host model // Provide a random time delta in seconds before fetching models and host model
// features. // features.
@@ -118,7 +118,7 @@ index f8eb245f6b48..6b24f4d43d5f 100644
} // namespace } // namespace
@@ -694,12 +698,12 @@ void PredictionManager::ScheduleModelsAndHostModelFeaturesFetch() { @@ -734,12 +738,12 @@ void PredictionManager::ScheduleModelsAndHostModelFeaturesFetch() {
model_and_features_store_->GetHostModelFeaturesUpdateTime() - model_and_features_store_->GetHostModelFeaturesUpdateTime() -
clock_->Now(); clock_->Now();
const base::TimeDelta time_until_retry = const base::TimeDelta time_until_retry =
@@ -432,6 +432,29 @@ index 8a49f3591a73..0345548ec18f 100644
} }
} }
diff --git third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc
index 3e2f1a5a3fad..613745b93595 100644
--- third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc
+++ third_party/blink/renderer/platform/audio/audio_delay_dsp_kernel.cc
@@ -32,7 +32,9 @@
namespace blink {
// Delay nodes have a max allowed delay time of this many seconds.
+namespace i {
const float kMaxDelayTimeSeconds = 30;
+}
AudioDelayDSPKernel::AudioDelayDSPKernel(AudioDSPKernelProcessor* processor,
size_t processing_size_in_frames)
@@ -46,7 +48,7 @@ AudioDelayDSPKernel::AudioDelayDSPKernel(double max_delay_time,
max_delay_time_(max_delay_time),
write_index_(0) {
DCHECK_GT(max_delay_time_, 0.0);
- DCHECK_LE(max_delay_time_, kMaxDelayTimeSeconds);
+ DCHECK_LE(max_delay_time_, i::kMaxDelayTimeSeconds);
DCHECK(std::isfinite(max_delay_time_));
size_t buffer_length = BufferLengthForDelay(max_delay_time, sample_rate);
diff --git third_party/blink/renderer/platform/fonts/font_matching_metrics.cc third_party/blink/renderer/platform/fonts/font_matching_metrics.cc diff --git third_party/blink/renderer/platform/fonts/font_matching_metrics.cc third_party/blink/renderer/platform/fonts/font_matching_metrics.cc
index 5e1005a2e4d3..ef83cadc9957 100644 index 5e1005a2e4d3..ef83cadc9957 100644
--- third_party/blink/renderer/platform/fonts/font_matching_metrics.cc --- third_party/blink/renderer/platform/fonts/font_matching_metrics.cc

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 6751a787272b..751b62c50a81 100644 index aefba4a5a3ca..eaa48b96c12a 100644
--- chrome/browser/BUILD.gn --- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/features.gni") @@ -10,6 +10,7 @@ import("//build/config/features.gni")
@@ -10,7 +10,7 @@ index 6751a787272b..751b62c50a81 100644
import("//chrome/browser/buildflags.gni") import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni") import("//chrome/common/features.gni")
import("//components/feature_engagement/features.gni") import("//components/feature_engagement/features.gni")
@@ -1959,6 +1960,7 @@ jumbo_static_library("browser") { @@ -1961,6 +1962,7 @@ jumbo_static_library("browser") {
"//base/util/values:values_util", "//base/util/values:values_util",
"//build:branding_buildflags", "//build:branding_buildflags",
"//cc", "//cc",
@@ -18,7 +18,7 @@ index 6751a787272b..751b62c50a81 100644
"//chrome:extra_resources", "//chrome:extra_resources",
"//chrome:resources", "//chrome:resources",
"//chrome:strings", "//chrome:strings",
@@ -2263,6 +2265,10 @@ jumbo_static_library("browser") { @@ -2266,6 +2268,10 @@ jumbo_static_library("browser") {
] ]
} }

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 diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index faa1344bd0a9..4528f101adb8 100644 index 7932e2421de6..04068aac7334 100644
--- chrome/browser/ui/BUILD.gn --- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/features.gni") @@ -9,6 +9,7 @@ import("//build/config/features.gni")

10
patch/patches/chrome_browser_profiles.patch
View File

@@ -1,8 +1,8 @@
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 1abea76ebc02..d9fc9c0450c2 100644 index c5ab679fb529..3f1c807c65a7 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
@@ -359,7 +359,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir) @@ -360,7 +360,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED, registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSE_CANCELLED,
content::NotificationService::AllSources()); content::NotificationService::AllSources());
@@ -43,7 +43,7 @@ index 7d02af7f8f60..eb70e533dbfb 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 07e6f8d726df..9a3c6b38b8eb 100644 index ce50c9ee3f92..eba0894ee2b4 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
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
@@ -54,7 +54,7 @@ index 07e6f8d726df..9a3c6b38b8eb 100644
#include "chrome/browser/content_settings/host_content_settings_map_factory.h" #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/identity_manager_factory.h" #include "chrome/browser/signin/identity_manager_factory.h"
@@ -67,8 +68,12 @@ void GetGuestViewDefaultContentSettingRules( @@ -62,8 +63,12 @@ void GetGuestViewDefaultContentSettingRules(
RendererUpdater::RendererUpdater(Profile* profile) RendererUpdater::RendererUpdater(Profile* profile)
: profile_(profile), identity_manager_observer_(this) { : profile_(profile), identity_manager_observer_(this) {
@@ -67,7 +67,7 @@ index 07e6f8d726df..9a3c6b38b8eb 100644
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
oauth2_login_manager_ = oauth2_login_manager_ =
chromeos::OAuth2LoginManagerFactory::GetForProfile(profile_); chromeos::OAuth2LoginManagerFactory::GetForProfile(profile_);
@@ -238,7 +243,7 @@ void RendererUpdater::UpdateRenderer( @@ -233,7 +238,7 @@ void RendererUpdater::UpdateRenderer(
force_google_safesearch_.GetValue(), force_google_safesearch_.GetValue(),
force_youtube_restrict_.GetValue(), force_youtube_restrict_.GetValue(),
allowed_domains_for_apps_.GetValue(), allowed_domains_for_apps_.GetValue(),

8
patch/patches/content_2015.patch
View File

@@ -226,10 +226,10 @@ index 632ae86c6fd6..55b749ec1242 100644
const std::vector<WebPluginInfo>& all_plugins); const std::vector<WebPluginInfo>& all_plugins);
diff --git content/common/frame_messages.h content/common/frame_messages.h diff --git content/common/frame_messages.h content/common/frame_messages.h
index 06c8e08ba8d5..1e349e3c06b6 100644 index 5009f74befcb..06537335ffda 100644
--- content/common/frame_messages.h --- content/common/frame_messages.h
+++ content/common/frame_messages.h +++ content/common/frame_messages.h
@@ -1060,9 +1060,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback, @@ -1056,9 +1056,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// type. If there is no matching plugin, |found| is false. // type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the // |actual_mime_type| is the actual mime type supported by the
// found plugin. // found plugin.
@@ -329,10 +329,10 @@ index 6002ce70bb17..4198134b1b73 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 32a6927eaa93..540a6cbf450b 100644 index 2c69d0b8e369..43484f4fc890 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
@@ -3892,7 +3892,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin( @@ -3886,7 +3886,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type; std::string mime_type;
bool found = false; bool found = false;
Send(new FrameHostMsg_GetPluginInfo( Send(new FrameHostMsg_GetPluginInfo(

6
patch/patches/linux_gtk_2014.patch
View File

@@ -1,8 +1,8 @@
diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn diff --git chrome/test/BUILD.gn chrome/test/BUILD.gn
index 5c45bc5e6b75..97282b45f57e 100644 index 4af881eba8a7..cf37d7b78107 100644
--- chrome/test/BUILD.gn --- chrome/test/BUILD.gn
+++ chrome/test/BUILD.gn +++ chrome/test/BUILD.gn
@@ -4720,7 +4720,7 @@ test("unit_tests") { @@ -4729,7 +4729,7 @@ test("unit_tests") {
if (use_gio) { if (use_gio) {
configs += [ "//build/linux:gio_config" ] configs += [ "//build/linux:gio_config" ]
} }
@@ -11,7 +11,7 @@ index 5c45bc5e6b75..97282b45f57e 100644
deps += [ "//chrome/browser/ui/libgtkui" ] deps += [ "//chrome/browser/ui/libgtkui" ]
} }
@@ -5708,7 +5708,7 @@ if (!is_android) { @@ -5717,7 +5717,7 @@ if (!is_android) {
# suites, it seems like one or another starts timing out too. # suites, it seems like one or another starts timing out too.
"../browser/ui/views/keyboard_access_browsertest.cc", "../browser/ui/views/keyboard_access_browsertest.cc",
] ]

4
patch/patches/osr_fling_2745.patch
View File

@@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 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 a91a66bca29d..bff1662c7323 100644 index e2e3d649a002..88d747b30755 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
@@ -2692,6 +2692,11 @@ void RenderWidgetHostImpl::SetNeedsBeginFrameForFlingProgress() { @@ -2694,6 +2694,11 @@ void RenderWidgetHostImpl::SetNeedsBeginFrameForFlingProgress() {
SetNeedsBeginFrame(true); SetNeedsBeginFrame(true);
} }

12
patch/patches/print_preview_123.patch
View File

@@ -262,7 +262,7 @@ index 0881b3dd9303..4df6883d4d05 100644
Profile* const profile_; Profile* const profile_;
PrintPreviewStickySettings* const sticky_settings_; PrintPreviewStickySettings* const sticky_settings_;
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 9bdbc0212f55..d93673e5b0c1 100644 index 9d9c689a4b9f..e2a90255acab 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
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
@@ -273,7 +273,7 @@ index 9bdbc0212f55..d93673e5b0c1 100644
#include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/app_mode/app_mode_utils.h"
#include "chrome/browser/bad_message.h" #include "chrome/browser/bad_message.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
@@ -1107,7 +1108,7 @@ void PrintPreviewHandler::SendInitialSettings( @@ -1128,7 +1129,7 @@ void PrintPreviewHandler::SendInitialSettings(
initial_settings.SetKey(kPolicies, std::move(policies)); initial_settings.SetKey(kPolicies, std::move(policies));
if (IsCloudPrintEnabled() && if (IsCloudPrintEnabled() &&
@@ -282,7 +282,7 @@ index 9bdbc0212f55..d93673e5b0c1 100644
initial_settings.SetStringKey( initial_settings.SetStringKey(
kCloudPrintURL, GURL(cloud_devices::GetCloudPrintURL()).spec()); kCloudPrintURL, GURL(cloud_devices::GetCloudPrintURL()).spec());
} }
@@ -1366,6 +1367,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler( @@ -1393,6 +1394,9 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
} }
return privet_printer_handler_.get(); return privet_printer_handler_.get();
} }
@@ -292,7 +292,7 @@ index 9bdbc0212f55..d93673e5b0c1 100644
#endif #endif
if (printer_type == PrinterType::kPdfPrinter) { if (printer_type == PrinterType::kPdfPrinter) {
if (!pdf_printer_handler_) { if (!pdf_printer_handler_) {
@@ -1385,7 +1389,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler( @@ -1412,7 +1416,7 @@ PrinterHandler* PrintPreviewHandler::GetPrinterHandler(
if (printer_type == PrinterType::kCloudPrinter) { if (printer_type == PrinterType::kCloudPrinter) {
// This printer handler is currently experimental. Ensure it is never // This printer handler is currently experimental. Ensure it is never
// created unless the flag is enabled. // created unless the flag is enabled.
@@ -301,7 +301,7 @@ index 9bdbc0212f55..d93673e5b0c1 100644
if (!cloud_printer_handler_) if (!cloud_printer_handler_)
cloud_printer_handler_ = PrinterHandler::CreateForCloudPrinters(); cloud_printer_handler_ = PrinterHandler::CreateForCloudPrinters();
return cloud_printer_handler_.get(); return cloud_printer_handler_.get();
@@ -1448,6 +1452,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id, @@ -1475,6 +1479,7 @@ void PrintPreviewHandler::OnPrintResult(const std::string& callback_id,
} }
void PrintPreviewHandler::RegisterForGaiaCookieChanges() { void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
@@ -309,7 +309,7 @@ index 9bdbc0212f55..d93673e5b0c1 100644
DCHECK(!identity_manager_); DCHECK(!identity_manager_);
cloud_print_enabled_ = cloud_print_enabled_ =
!base::Contains(printer_type_deny_list_, kCloudPrinter) && !base::Contains(printer_type_deny_list_, kCloudPrinter) &&
@@ -1464,6 +1469,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() { @@ -1491,6 +1496,7 @@ void PrintPreviewHandler::RegisterForGaiaCookieChanges() {
identity_manager_ = IdentityManagerFactory::GetForProfile(profile); identity_manager_ = IdentityManagerFactory::GetForProfile(profile);
identity_manager_->AddObserver(this); identity_manager_->AddObserver(this);

6
patch/patches/rwh_background_color_1984.patch
View File

@@ -1,8 +1,8 @@
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 4d7831ae6b04..9c1b215220ab 100644 index b5180b130204..7c18c0f1aad9 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
@@ -721,10 +721,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() { @@ -732,10 +732,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
void RenderWidgetHostViewAura::UpdateBackgroundColor() { void RenderWidgetHostViewAura::UpdateBackgroundColor() {
DCHECK(GetBackgroundColor()); DCHECK(GetBackgroundColor());
@@ -19,7 +19,7 @@ index 4d7831ae6b04..9c1b215220ab 100644
} }
void RenderWidgetHostViewAura::WindowTitleChanged() { void RenderWidgetHostViewAura::WindowTitleChanged() {
@@ -2001,6 +2003,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) { @@ -2022,6 +2024,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
// Init(), because it needs to have the layer. // Init(), because it needs to have the layer.
if (frame_sink_id_.is_valid()) if (frame_sink_id_.is_valid())
window_->SetEmbedFrameSinkId(frame_sink_id_); window_->SetEmbedFrameSinkId(frame_sink_id_);

6
patch/patches/services_network_2622.patch
View File

@@ -139,10 +139,10 @@ index 5dbc9d2dfcfb..1c31d97825c2 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 b1740e9c8a2f..3509c005191c 100644 index 83d6b8a9e1d9..583e323a9d5a 100644
--- services/network/network_context.cc --- services/network/network_context.cc
+++ services/network/network_context.cc +++ services/network/network_context.cc
@@ -1745,6 +1745,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -1727,6 +1727,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
} }
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store; scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
@@ -150,7 +150,7 @@ index b1740e9c8a2f..3509c005191c 100644
if (params_->cookie_path) { if (params_->cookie_path) {
scoped_refptr<base::SequencedTaskRunner> client_task_runner = scoped_refptr<base::SequencedTaskRunner> client_task_runner =
base::ThreadTaskRunnerHandle::Get(); base::ThreadTaskRunnerHandle::Get();
@@ -1772,18 +1773,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( @@ -1754,18 +1755,27 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
session_cleanup_cookie_store = session_cleanup_cookie_store =
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store); base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);

2
patch/patches/storage_incognito_2289.patch
View File

@@ -13,7 +13,7 @@ index 5e7af339b157..26bdb73c5086 100644
{base::ThreadPool(), base::MayBlock(), {base::ThreadPool(), base::MayBlock(),
base::TaskPriority::USER_VISIBLE, base::TaskPriority::USER_VISIBLE,
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 7b48f428955b..0bd02ca49d05 100644 index 80fd00865e83..2a5434f9b005 100644
--- content/browser/browser_context.cc --- content/browser/browser_context.cc
+++ content/browser/browser_context.cc +++ content/browser/browser_context.cc
@@ -57,6 +57,7 @@ @@ -57,6 +57,7 @@

30
patch/patches/views_1749_2102.patch
View File

@@ -39,7 +39,7 @@ index 5bcc6204c2b5..1bf18609d150 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 cb1a7976f6dc..d6360da8e69d 100644 index 07169b0ebe98..ea9488f13321 100644
--- ui/gfx/render_text.cc --- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc +++ ui/gfx/render_text.cc
@@ -713,6 +713,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) { @@ -713,6 +713,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
@@ -57,7 +57,7 @@ index cb1a7976f6dc..d6360da8e69d 100644
void RenderText::SetDisplayRect(const Rect& r) { void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) { if (r != display_rect_) {
display_rect_ = r; display_rect_ = r;
@@ -1904,6 +1912,19 @@ void RenderText::OnTextAttributeChanged() { @@ -1850,6 +1858,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false; layout_text_up_to_date_ = false;
@@ -78,7 +78,7 @@ index cb1a7976f6dc..d6360da8e69d 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 ee5748fa6f02..d4477f724d68 100644 index db6cc4d1b601..703b539edcf2 100644
--- ui/gfx/render_text.h --- ui/gfx/render_text.h
+++ ui/gfx/render_text.h +++ ui/gfx/render_text.h
@@ -304,6 +304,10 @@ class GFX_EXPORT RenderText { @@ -304,6 +304,10 @@ class GFX_EXPORT RenderText {
@@ -92,9 +92,9 @@ index ee5748fa6f02..d4477f724d68 100644
const Rect& display_rect() const { return display_rect_; } const Rect& display_rect() const { return display_rect_; }
void SetDisplayRect(const Rect& r); void SetDisplayRect(const Rect& r);
@@ -980,6 +984,8 @@ class GFX_EXPORT RenderText { @@ -973,6 +977,8 @@ class GFX_EXPORT RenderText {
// Tell whether or not the layout break lists need an update. // Tell whether or not the |layout_text_| needs an update or is up to date.
bool layout_text_attributes_up_to_date_ = false; bool layout_text_up_to_date_ = false;
+ int draw_strings_flags_ = 0; + int draw_strings_flags_ = 0;
+ +
@@ -102,12 +102,12 @@ index ee5748fa6f02..d4477f724d68 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 3b5bc508a0fd..262da51d50ac 100644 index 2b6056aed3ca..ecd5bc5c32b5 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
@@ -132,6 +132,8 @@ class VIEWS_EXPORT InkDropHostView : public View { @@ -142,6 +142,8 @@ class VIEWS_EXPORT InkDropHostView : public View {
// them. // this isn't necessary anymore.
void AnimateInkDrop(InkDropState state, const ui::LocatedEvent* event); virtual InkDrop* GetInkDrop();
+ InkDropMode ink_drop_mode() const { return ink_drop_mode_; } + InkDropMode ink_drop_mode() const { return ink_drop_mode_; }
+ +
@@ -146,7 +146,7 @@ index 1c8d5c27f928..90d7e7f004e4 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 21a8fa0fa8eb..55a2e57a2e6f 100644 index b166c6f6afb1..32de6ffe5196 100644
--- ui/views/controls/label.cc --- ui/views/controls/label.cc
+++ ui/views/controls/label.cc +++ ui/views/controls/label.cc
@@ -53,6 +53,20 @@ bool IsOpaque(SkColor color) { @@ -53,6 +53,20 @@ bool IsOpaque(SkColor color) {
@@ -185,7 +185,7 @@ index 21a8fa0fa8eb..55a2e57a2e6f 100644
void Label::SetTooltipText(const base::string16& tooltip_text) { void Label::SetTooltipText(const base::string16& tooltip_text) {
DCHECK(handles_tooltips_); DCHECK(handles_tooltips_);
if (tooltip_text_ == tooltip_text) if (tooltip_text_ == tooltip_text)
@@ -577,7 +599,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const { @@ -583,7 +605,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SetFontList(font_list()); render_text->SetFontList(font_list());
render_text->set_shadows(GetShadows()); render_text->set_shadows(GetShadows());
render_text->SetCursorEnabled(false); render_text->SetCursorEnabled(false);
@@ -207,7 +207,7 @@ index 21a8fa0fa8eb..55a2e57a2e6f 100644
render_text->SetMultiline(multiline); render_text->SetMultiline(multiline);
render_text->SetMaxLines(multiline ? GetMaxLines() : 0); render_text->SetMaxLines(multiline ? GetMaxLines() : 0);
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 aea6bb5b7b13..9ce9947174d4 100644 index fd5657b75c4b..90b6e831bd3c 100644
--- ui/views/controls/label.h --- ui/views/controls/label.h
+++ ui/views/controls/label.h +++ ui/views/controls/label.h
@@ -176,6 +176,10 @@ class VIEWS_EXPORT Label : public View, @@ -176,6 +176,10 @@ class VIEWS_EXPORT Label : public View,
@@ -221,7 +221,7 @@ index aea6bb5b7b13..9ce9947174d4 100644
// Gets/Sets the tooltip text. Default behavior for a label (single-line) is // Gets/Sets the tooltip text. Default behavior for a label (single-line) is
// to show the full text if it is wider than its bounds. Calling this // to show the full text if it is wider than its bounds. Calling this
// overrides the default behavior and lets you set a custom tooltip. To // overrides the default behavior and lets you set a custom tooltip. To
@@ -408,6 +412,7 @@ class VIEWS_EXPORT Label : public View, @@ -411,6 +415,7 @@ class VIEWS_EXPORT Label : public View,
bool collapse_when_hidden_; bool collapse_when_hidden_;
int fixed_width_; int fixed_width_;
int max_width_; int max_width_;
@@ -441,7 +441,7 @@ index 78f832fd3acf..cb030c991614 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 1a5af9db833f..60a61700a615 100644 index b4f0cfda3088..4a9c24d3a760 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
@@ -189,6 +189,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view) @@ -189,6 +189,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)

6
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@@ -160,7 +160,7 @@ index 91a828ead9e0..226cb92fd19b 100644
XWindow(); XWindow();
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 d6e17cde3baf..b91415a060b8 100644 index 10220f6bf888..2b31a58f676a 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
@@ -84,6 +84,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig( @@ -84,6 +84,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
@@ -418,10 +418,10 @@ index 40e66a212e3e..08ee8523ab15 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 6412ff796794..f66aff5a8766 100644 index 08807dc1a6ca..867d47829f09 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
@@ -3007,10 +3007,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message, @@ -3008,10 +3008,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
} else if (event.type() == ui::ET_MOUSEWHEEL) { } else if (event.type() == ui::ET_MOUSEWHEEL) {
ui::MouseWheelEvent mouse_wheel_event(msg); ui::MouseWheelEvent mouse_wheel_event(msg);
// Reroute the mouse wheel to the window under the pointer if applicable. // Reroute the mouse wheel to the window under the pointer if applicable.

4
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 6f2ee557fb41..7a9bf5c4c642 100644 index c8f7f6f8057d..7dfc673f4090 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
@@ -2045,16 +2045,24 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2045,16 +2045,24 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -51,7 +51,7 @@ index 6f2ee557fb41..7a9bf5c4c642 100644
// If |is_new_browsing_instance| is true, defer routing_id allocation // If |is_new_browsing_instance| is true, defer routing_id allocation
// to the WebContentsImpl::Create() call. This is required because with // to the WebContentsImpl::Create() call. This is required because with
// a new browsing instance, WebContentsImpl::Create() may elect a different // a new browsing instance, WebContentsImpl::Create() may elect a different
@@ -6279,6 +6296,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, @@ -6277,6 +6294,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// doesn't support properly traversing BrowserPlugins. // doesn't support properly traversing BrowserPlugins.
SetAsFocusedWebContentsIfNecessary(); SetAsFocusedWebContentsIfNecessary();
} }

4
patch/patches/webview_plugin_2020.patch
View File

@@ -1,8 +1,8 @@
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 e23ad6003e9f..6fdcf0097ef2 100644 index 07a0dbb301c8..0af973c4a4e9 100644
--- chrome/app/generated_resources.grd --- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd +++ chrome/app/generated_resources.grd
@@ -4835,7 +4835,7 @@ Keep your key file in a safe place. You will need it to create new versions of y @@ -4855,7 +4855,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message> </message>
</if> </if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy."> <message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">