bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-16 20:20:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 83.0.4103.0 (#756066)

Browse Source
This commit is contained in:
Marshall Greenblatt 2020-04-14 15:31:00 -04:00
parent 30d83cb94a
commit fa519f5108
56 changed files with 352 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BUILD.gn
View File

@ -955,7 +955,7 @@ static_library("libcef_static") {
]
deps += [
"//components/crash/content/app",
"//components/crash/core/app",
"//components/crash/content/browser",
]
}
@ -1582,7 +1582,6 @@ if (is_mac) {
sources = [
"$root_out_dir/egl_intermediates/libEGL.dylib",
"$root_out_dir/egl_intermediates/libGLESv2.dylib",
"$root_out_dir/egl_intermediates/libvulkan.dylib",
]
outputs = [
"{{bundle_contents_dir}}/Libraries/{{source_file_part}}",

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

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

2
CHROMIUM_UPDATE.txt
View File

@ -57,7 +57,9 @@
'content/shell/renderer/shell_*',
'content/shell/utility/shell_*',
'extensions/shell/*',
'net/base/features.cc',
'net/cookies/cookie_store.h',
'services/network/public/cpp/features.cc',
'ui/base/ui_base_features.cc',
],
# Patterns that should not be found in the chromium/src directory after

4
libcef/browser/browser_main.cc
View File

@ -32,6 +32,7 @@
#include "chrome/browser/plugins/plugin_finder.h"
#include "components/constrained_window/constrained_window_views.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/network_service_instance.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/constants.h"
#include "net/base/net_module.h"
@ -199,6 +200,9 @@ void CefBrowserMainParts::PreMainMessageLoopRun() {
CefDevToolsManagerDelegate::StartHttpHandler(browser_context);
// Initialize before IO access restrictions are applied.
content::GetNetworkService();
// Triggers initialization of the singleton instance on UI thread.
PluginFinder::GetInstance()->Init();

45
libcef/browser/browser_message_loop.cc
View File

@ -34,11 +34,17 @@ class MessagePumpExternal : public base::MessagePumpForUI {
base::mac::ScopedNSAutoreleasePool autorelease_pool;
#endif
const bool has_more_work = DirectRunWork(delegate);
base::TimeTicks next_run_time; // is_null()
const bool has_more_work = DirectRunWork(delegate, &next_run_time);
if (!has_more_work)
break;
const base::TimeDelta& delta = base::TimeTicks::Now() - start;
if (next_run_time.is_null()) {
// We have more work that should run immediately.
next_run_time = base::TimeTicks::Now();
}
const base::TimeDelta& delta = next_run_time - start;
if (delta.InSecondsF() > max_time_slice_)
break;
}
@ -54,26 +60,31 @@ class MessagePumpExternal : public base::MessagePumpForUI {
}
private:
bool DirectRunWork(Delegate* delegate) {
bool did_work = false;
bool did_delayed_work = false;
bool did_idle_work = false;
static bool DirectRunWork(Delegate* delegate,
base::TimeTicks* next_run_time) {
bool more_immediate_work = false;
bool more_idle_work = false;
bool more_delayed_work = false;
// Perform work & delayed work.
// If no work was found, then perform idle work.
Delegate::NextWorkInfo next_work_info = delegate->DoWork();
did_work = delegate->DoWork();
// is_immediate() returns true if the next task is ready right away.
more_immediate_work = next_work_info.is_immediate();
if (!more_immediate_work) {
// DoIdleWork() returns true if idle work was all done.
more_idle_work = !delegate->DoIdleWork();
// We are using an external timer, so we don't have any action based on the
// returned next delayed work time.
base::TimeTicks next_time;
did_delayed_work = delegate->DoDelayedWork(&next_time);
if (!did_work && !did_delayed_work) {
did_idle_work = delegate->DoIdleWork();
// Check the next PendingTask's |delayed_run_time|.
// is_max() returns true if there are no more immediate nor delayed tasks.
more_delayed_work = !next_work_info.delayed_run_time.is_max();
if (more_delayed_work && !more_idle_work) {
// The only remaining work that we know about is the PendingTask.
// Consider the run time for that task in the time slice calculation.
*next_run_time = next_work_info.delayed_run_time;
}
}
return did_work || did_delayed_work || did_idle_work;
return more_immediate_work || more_idle_work || more_delayed_work;
}
const float max_time_slice_;

2
libcef/browser/content_browser_client.cc
View File

@ -131,8 +131,8 @@
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#include "base/debug/leak_annotations.h"
#include "chrome/common/chrome_paths.h"
#include "components/crash/content/app/breakpad_linux.h"
#include "components/crash/content/browser/crash_handler_host_linux.h"
#include "components/crash/core/app/breakpad_linux.h"
#include "content/public/common/content_descriptors.h"
#endif

8
libcef/browser/context.cc
View File

@ -37,13 +37,13 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/chrome_elf/chrome_elf_main.h"
#include "chrome/install_static/initialize_from_primary_module.h"
#include "components/crash/content/app/crashpad.h"
#include "components/crash/core/app/crashpad.h"
#include "content/public/app/sandbox_helper_win.h"
#include "sandbox/win/src/sandbox_types.h"
#endif
#if defined(OS_MACOSX) || defined(OS_WIN)
#include "components/crash/content/app/crash_switches.h"
#include "components/crash/core/app/crash_switches.h"
#include "third_party/crashpad/crashpad/handler/handler_main.h"
#endif
@ -97,12 +97,12 @@ void InitCrashReporter() {
#if defined(OS_MACOSX) || defined(OS_WIN)
// Based on components/crash/content/app/run_as_crashpad_handler_win.cc
// Based on components/crash/core/app/run_as_crashpad_handler_win.cc
// Remove the "--type=crashpad-handler" command-line flag that will otherwise
// confuse the crashpad handler.
// Chrome uses an embedded crashpad handler on Windows only and imports this
// function via the existing "run_as_crashpad_handler" target defined in
// components/crash/content/app/BUILD.gn. CEF uses an embedded handler on both
// components/crash/core/app/BUILD.gn. CEF uses an embedded handler on both
// Windows and macOS so we define the function here instead of using the
// existing target (because we can't use that target on macOS).
int RunAsCrashpadHandler(const base::CommandLine& command_line) {

4
libcef/browser/extensions/extension_function_details.cc
View File

@ -423,8 +423,8 @@ std::unique_ptr<api::tabs::Tab> CefExtensionFunctionDetails::CreateTabObject(
tab_object->id = std::make_unique<int>(new_browser->GetIdentifier());
tab_object->index = index;
tab_object->window_id = *tab_object->id;
tab_object->status = std::make_unique<std::string>(
is_loading ? keys::kStatusValueLoading : keys::kStatusValueComplete);
tab_object->status = is_loading ? api::tabs::TAB_STATUS_LOADING
: api::tabs::TAB_STATUS_COMPLETE;
tab_object->active = active;
tab_object->selected = true;
tab_object->highlighted = true;

5
libcef/browser/osr/render_widget_host_view_osr.cc
View File

@ -445,6 +445,11 @@ blink::mojom::PointerLockResult CefRenderWidgetHostViewOSR::LockMouse(
return blink::mojom::PointerLockResult::kPermissionDenied;
}
blink::mojom::PointerLockResult CefRenderWidgetHostViewOSR::ChangeMouseLock(
bool request_unadjusted_movement) {
return blink::mojom::PointerLockResult::kPermissionDenied;
}
void CefRenderWidgetHostViewOSR::UnlockMouse() {}
void CefRenderWidgetHostViewOSR::TakeFallbackContentFrom(

2
libcef/browser/osr/render_widget_host_view_osr.h
View File

@ -125,6 +125,8 @@ class CefRenderWidgetHostViewOSR : public content::RenderWidgetHostViewBase,
void UpdateBackgroundColor() override;
blink::mojom::PointerLockResult LockMouse(
bool request_unadjusted_movement) override;
blink::mojom::PointerLockResult ChangeMouseLock(
bool request_unadjusted_movement) override;
void UnlockMouse() override;
void TakeFallbackContentFrom(content::RenderWidgetHostView* view) override;

3
libcef/browser/osr/software_output_device_proxy.cc
View File

@ -7,7 +7,6 @@
#include "base/memory/shared_memory_mapping.h"
#include "base/trace_event/trace_event.h"
#include "components/viz/common/resources/resource_sizes.h"
#include "mojo/public/cpp/base/shared_memory_utils.h"
#include "mojo/public/cpp/system/platform_handle.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkCanvas.h"
@ -74,7 +73,7 @@ void SoftwareOutputDeviceProxy::Resize(const gfx::Size& viewport_pixel_size,
}
#if !defined(OS_WIN)
auto shm = mojo::CreateReadOnlySharedMemoryRegion(required_bytes);
auto shm = base::ReadOnlySharedMemoryRegion::Create(required_bytes);
if (!shm.IsValid()) {
DLOG(ERROR) << "Failed to allocate " << required_bytes << " bytes";
return;

2
libcef/browser/printing/print_view_manager.cc
View File

@ -151,7 +151,7 @@ void SavePdfFile(scoped_refptr<base::RefCountedSharedMemoryMapping> data,
DCHECK_GT(data->size(), 0U);
MetafileSkia metafile;
metafile.InitFromData(static_cast<const void*>(data->front()), data->size());
metafile.InitFromData(*data);
base::File file(path,
base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE);

2
libcef/common/crash_reporter_client.cc
View File

@ -46,7 +46,7 @@
#if defined(OS_WIN)
#include "base/debug/leak_annotations.h"
#include "chrome/install_static/install_util.h"
#include "components/crash/content/app/crashpad.h"
#include "components/crash/core/app/crashpad.h"
#endif
namespace {

2
libcef/common/crash_reporter_client.h
View File

@ -16,7 +16,7 @@
#include "base/macros.h"
#include "base/synchronization/lock.h"
#include "build/build_config.h"
#include "components/crash/content/app/crash_reporter_client.h"
#include "components/crash/core/app/crash_reporter_client.h"
// Global object that is instantiated in each process and configures crash
// reporting. On Windows this is created by the

4
libcef/common/crash_reporting.cc
View File

@ -21,7 +21,7 @@
#if defined(OS_MACOSX)
#include "base/mac/foundation_util.h"
#include "components/crash/content/app/crashpad.h"
#include "components/crash/core/app/crashpad.h"
#include "components/crash/core/common/crash_keys.h"
#include "content/public/common/content_paths.h"
#endif
@ -32,7 +32,7 @@
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#include "components/crash/content/app/breakpad_linux.h"
#include "components/crash/core/app/breakpad_linux.h"
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif

23
libcef/common/main_delegate.cc
View File

@ -48,6 +48,7 @@
#include "content/public/common/main_function_params.h"
#include "extensions/common/constants.h"
#include "ipc/ipc_buildflags.h"
#include "net/base/features.h"
#include "pdf/pdf_ppapi.h"
#include "services/network/public/cpp/features.h"
#include "services/service_manager/sandbox/switches.h"
@ -182,6 +183,7 @@ const base::FilePath::CharType kPepperFlashSystemBaseDirectory[] =
#endif
void OverridePepperFlashSystemPluginPath() {
#if defined(OS_WIN) || defined(OS_MACOSX)
base::FilePath plugin_filename;
#if defined(OS_WIN)
if (!GetSystemFlashFilename(&plugin_filename))
@ -191,15 +193,16 @@ void OverridePepperFlashSystemPluginPath() {
return;
plugin_filename = plugin_filename.Append(kPepperFlashSystemBaseDirectory)
.Append(chrome::kPepperFlashPluginFilename);
#else
// A system plugin is not available on other platforms.
return;
#endif
#endif // defined(OS_MACOSX)
if (!plugin_filename.empty()) {
base::PathService::Override(chrome::FILE_PEPPER_FLASH_SYSTEM_PLUGIN,
plugin_filename);
}
#else // !(defined(OS_WIN) || defined(OS_MACOSX))
// A system plugin is not available on other platforms.
return;
#endif
}
#if defined(OS_LINUX)
@ -617,6 +620,18 @@ bool CefMainDelegate::BasicStartupComplete(int* exit_code) {
disable_features.push_back(network::features::kOutOfBlinkCors.name);
}
// TODO: Add support for creating cookies with SameSite attribute (see issue
// #2524)
if (net::features::kSameSiteByDefaultCookies.default_state ==
base::FEATURE_ENABLED_BY_DEFAULT) {
disable_features.push_back(net::features::kSameSiteByDefaultCookies.name);
}
if (net::features::kCookiesWithoutSameSiteMustBeSecure.default_state ==
base::FEATURE_ENABLED_BY_DEFAULT) {
disable_features.push_back(
net::features::kCookiesWithoutSameSiteMustBeSecure.name);
}
#if defined(OS_WIN)
if (features::kCalculateNativeWinOcclusion.default_state ==
base::FEATURE_ENABLED_BY_DEFAULT) {

5
patch/patch.cfg
View File

@ -487,5 +487,10 @@ patches = [
# Fix ScreenlockMonitorDeviceSource window creation error.
# https://bugs.chromium.org/p/chromium/issues/detail?id=1058556
'name': 'win_screenlock_1058556',
},
{
# Fix unbound AssociatedRemote error in SetBackgroundOpaque.
# https://bugs.chromium.org/p/chromium/issues/detail?id=1070713
'name': 'renderer_host_1070713',
}
]

4
patch/patches/base_sandbox_2743.patch
View File

@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index b47b0ec88dde..d3554dd7ef6e 100644
index 8df68ae89306..aa23704044be 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -33,6 +33,7 @@ import("//build/config/sysroot.gni")
@ -10,7 +10,7 @@ index b47b0ec88dde..d3554dd7ef6e 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
@@ -1654,7 +1655,11 @@ jumbo_component("base") {
@@ -1656,7 +1657,11 @@ jumbo_component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]

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
index fb38e3b0f072..c390d6443e7b 100644
index 332ef34e24dc..ee866ca5f3b6 100644
--- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc
@@ -244,7 +244,7 @@ void BrowserTaskExecutor::PostFeatureListSetup() {

4
patch/patches/build.patch
View File

@ -1,5 +1,5 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 9573394d28b8..eb3663551a62 100644
index 3d5e4dede0ba..63dde0c70634 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -163,7 +163,7 @@ declare_args() {
@ -11,7 +11,7 @@ index 9573394d28b8..eb3663551a62 100644
!(current_cpu == "x86" || current_cpu == "x64"))))
}
@@ -1748,8 +1748,6 @@ config("thin_archive") {
@@ -1740,8 +1740,6 @@ config("thin_archive") {
# archive names to 16 characters, which is not what we want).
if ((is_posix && !is_nacl && !is_mac && !is_ios) || is_fuchsia) {
arflags = [ "-T" ]

6
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 021b133ee20e..3282a16ad86c 100644
index 023024e81c99..1404e5aff399 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index 021b133ee20e..3282a16ad86c 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1975,6 +1976,7 @@ jumbo_static_library("browser") {
@@ -1988,6 +1989,7 @@ jumbo_static_library("browser") {
"//base/util/values:values_util",
"//build:branding_buildflags",
"//cc",
@ -18,7 +18,7 @@ index 021b133ee20e..3282a16ad86c 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2296,6 +2298,10 @@ jumbo_static_library("browser") {
@@ -2314,6 +2316,10 @@ jumbo_static_library("browser") {
]
}

10
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 c2920a353de1..1b5a3b70b276 100644
index dfffff81bcf2..a4518ba20aaf 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -10,6 +10,7 @@ import("//build/config/features.gni")
@ -10,7 +10,7 @@ index c2920a353de1..1b5a3b70b276 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/assistant/assistant.gni")
@@ -364,6 +365,10 @@ jumbo_static_library("ui") {
@@ -362,6 +363,10 @@ jumbo_static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -21,7 +21,7 @@ index c2920a353de1..1b5a3b70b276 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -385,6 +390,7 @@ jumbo_static_library("ui") {
@@ -383,6 +388,7 @@ jumbo_static_library("ui") {
"//base/allocator:buildflags",
"//build:branding_buildflags",
"//cc/paint",
@ -29,14 +29,14 @@ index c2920a353de1..1b5a3b70b276 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -1460,6 +1466,7 @@ jumbo_static_library("ui") {
@@ -1470,6 +1476,7 @@ jumbo_static_library("ui") {
"//components/keep_alive_registry",
"//components/network_session_configurator/common",
"//components/page_load_metrics/browser",
+ "//components/printing/common:mojo_interfaces",
"//components/profile_metrics",
"//components/search_provider_logos",
"//components/ui_metrics",
"//components/url_formatter",
diff --git chrome/browser/ui/webui/net_export_ui.cc chrome/browser/ui/webui/net_export_ui.cc
index 93bfc84f49a1..eeee229e943f 100644
--- chrome/browser/ui/webui/net_export_ui.cc

14
patch/patches/chrome_browser_product_override.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index f1f4f715ca7e..97075e049f9c 100644
index b7ff92ae4e58..6c3773b92454 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -992,10 +992,6 @@ void LaunchURL(const GURL& url,
@@ -996,10 +996,6 @@ void LaunchURL(const GURL& url,
}
}
@ -13,7 +13,7 @@ index f1f4f715ca7e..97075e049f9c 100644
void MaybeAppendSecureOriginsAllowlistSwitch(base::CommandLine* cmdline) {
// |allowlist| combines pref/policy + cmdline switch in the browser process.
// For renderer and utility (e.g. NetworkService) processes the switch is the
@@ -1090,6 +1086,14 @@ void MaybeRecordSameSiteCookieEngagementHistogram(
@@ -1094,6 +1090,14 @@ void MaybeRecordSameSiteCookieEngagementHistogram(
} // namespace
@ -29,12 +29,12 @@ index f1f4f715ca7e..97075e049f9c 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 3e2312a0bffa..940ca48b98a0 100644
index ae86be8afe0f..61be54670431 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -85,7 +85,8 @@ class ChromeBluetoothDelegate;
class ChromeHidDelegate;
class ChromeSerialDelegate;
@@ -91,7 +91,8 @@ class ChromeXrIntegrationClient;
}
#endif
-// Returns the user agent of Chrome.
+// Returns the product and user agent of Chrome.

4
patch/patches/chrome_browser_safe_browsing.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
index 42cacbd4d078..cce7879e66f2 100644
index 14bef91c5370..cb1faba7c23e 100644
--- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn
@@ -241,6 +241,7 @@ jumbo_static_library("safe_browsing") {
@@ -246,6 +246,7 @@ jumbo_static_library("safe_browsing") {
"//chrome/common/safe_browsing:download_type_util",
"//chrome/services/file_util/public/cpp",
"//components/content_settings/core/browser",

12
patch/patches/chrome_plugins.patch
View File

@ -197,10 +197,10 @@ index bcb97138c321..df6792bd5317 100644
GURL webstore_url(extension_urls::GetWebstoreLaunchURL());
if (response_url.SchemeIsHTTPOrHTTPS() &&
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index 6600de77c3f6..dece49ca3455 100644
index b96048aec4f7..edaa78c59fe8 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -811,6 +811,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -813,6 +813,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -208,7 +208,7 @@ index 6600de77c3f6..dece49ca3455 100644
content_settings_agent->IsPluginTemporarilyAllowed(identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
}
@@ -1013,7 +1014,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1015,7 +1016,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -218,7 +218,7 @@ index 6600de77c3f6..dece49ca3455 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1022,7 +1024,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1024,7 +1026,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -228,7 +228,7 @@ index 6600de77c3f6..dece49ca3455 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1032,7 +1035,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1034,7 +1037,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -238,7 +238,7 @@ index 6600de77c3f6..dece49ca3455 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedNoLoading: {
@@ -1040,7 +1044,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1042,7 +1046,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
IDR_BLOCKED_PLUGIN_HTML,
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED_NO_LOADING,
group_name));

6
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index 9b93e72eee7b..5d7c3d7fb2ab 100644
index 88cbad65b714..2d899f1805e2 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@ -10,7 +10,7 @@ index 9b93e72eee7b..5d7c3d7fb2ab 100644
import("//chrome/common/features.gni")
import("//components/nacl/features.gni")
import("//components/offline_pages/buildflags/features.gni")
@@ -127,6 +128,7 @@ jumbo_static_library("renderer") {
@@ -129,6 +130,7 @@ jumbo_static_library("renderer") {
defines = []
deps = [
@ -18,7 +18,7 @@ index 9b93e72eee7b..5d7c3d7fb2ab 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
@@ -191,6 +193,10 @@ jumbo_static_library("renderer") {
@@ -193,6 +195,10 @@ jumbo_static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]

4
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
index e42da08fd771..f7e63be23f92 100644
index 35726bdf4303..e0da57f2275b 100644
--- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h
@@ -12,6 +12,7 @@
@ -10,7 +10,7 @@ index e42da08fd771..f7e63be23f92 100644
#include "content/common/navigation_params.mojom.h"
#include "content/public/browser/certificate_request_result_type.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
@@ -48,7 +49,7 @@ void ApplyNetworkRequestOverrides(FrameTreeNode* frame_tree_node,
@@ -54,7 +55,7 @@ void ApplyNetworkRequestOverrides(FrameTreeNode* frame_tree_node,
mojom::BeginNavigationParams* begin_params,
bool* report_raw_headers);

32
patch/patches/content_2015.patch
View File

@ -111,10 +111,10 @@ index 451bfecfa4b1..b7cddcbaca66 100644
const std::string& mime_type,
bool* found,
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index f9125290d783..e7558300bbe3 100644
index 2be5d4400de9..14ece86df0e3 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -718,6 +718,13 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -722,6 +722,13 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
resource_request_->has_user_gesture,
resource_request_->request_initiator, &loader_factory);
@ -128,7 +128,7 @@ index f9125290d783..e7558300bbe3 100644
if (loader_factory) {
factory =
base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
@@ -929,7 +936,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
@@ -932,7 +939,7 @@ class NavigationURLLoaderImpl::URLLoaderRequestController
frame_tree_node->current_frame_host()->GetProcess()->GetID();
int routing_id = frame_tree_node->current_frame_host()->GetRoutingID();
bool has_plugin = PluginService::GetInstance()->GetPluginInfo(
@ -224,10 +224,10 @@ index 632ae86c6fd6..55b749ec1242 100644
const std::vector<WebPluginInfo>& all_plugins);
diff --git content/common/frame_messages.h content/common/frame_messages.h
index c71e15cc41c6..420d581c04e1 100644
index 118765f9323f..614830e4f406 100644
--- content/common/frame_messages.h
+++ content/common/frame_messages.h
@@ -724,9 +724,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
@@ -687,9 +687,10 @@ IPC_MESSAGE_ROUTED1(FrameHostMsg_PepperStopsPlayback,
// type. If there is no matching plugin, |found| is false.
// |actual_mime_type| is the actual mime type supported by the
// found plugin.
@ -240,7 +240,7 @@ index c71e15cc41c6..420d581c04e1 100644
std::string /* mime_type */,
bool /* found */,
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index 4e95486031b4..a6009160c9ed 100644
index 89f33b33f8c8..30512bab9b12 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -9,7 +9,7 @@
@ -253,7 +253,7 @@ index 4e95486031b4..a6009160c9ed 100644
#include <utility>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index a13172df620d..16c1e118e7df 100644
index 26cd6d1afcb8..5ac45c794daf 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -26,6 +26,7 @@
@ -264,7 +264,7 @@ index a13172df620d..16c1e118e7df 100644
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/previews_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
@@ -1620,6 +1621,14 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1631,6 +1632,14 @@ class CONTENT_EXPORT ContentBrowserClient {
const base::Optional<url::Origin>& initiating_origin,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -279,7 +279,7 @@ index a13172df620d..16c1e118e7df 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.
@@ -1687,6 +1696,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1699,6 +1708,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@ -315,10 +315,10 @@ index 98c59005599e..69752184745d 100644
WebPluginInfo* plugin) = 0;
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index 56062bb2680a..246c965ed375 100644
index 764556d80f1b..7267aa6c26f6 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -80,6 +80,9 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -81,6 +81,9 @@ class CONTENT_EXPORT ContentRendererClient {
// binding requests from RenderProcessHost::BindReceiver().
virtual void ExposeInterfacesToBrowser(mojo::BinderMap* binders) {}
@ -328,7 +328,7 @@ index 56062bb2680a..246c965ed375 100644
// Notifies that a new RenderFrame has been created.
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
@@ -305,6 +308,10 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -310,6 +313,10 @@ class CONTENT_EXPORT ContentRendererClient {
// This method may invalidate the frame.
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
@ -340,10 +340,10 @@ index 56062bb2680a..246c965ed375 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_frame_impl.cc content/renderer/render_frame_impl.cc
index 813fd92481d5..4f609d11f92e 100644
index 2ab5e79b71cc..51cd9556a884 100644
--- content/renderer/render_frame_impl.cc
+++ content/renderer/render_frame_impl.cc
@@ -3754,7 +3754,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
@@ -3742,7 +3742,8 @@ blink::WebPlugin* RenderFrameImpl::CreatePlugin(
std::string mime_type;
bool found = false;
Send(new FrameHostMsg_GetPluginInfo(
@ -354,10 +354,10 @@ index 813fd92481d5..4f609d11f92e 100644
if (!found)
return nullptr;
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index 1ba5936414aa..7595a5279c1c 100644
index 76176518dfe4..b7d8dc75a23a 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -623,6 +623,8 @@ void RenderThreadImpl::Init() {
@@ -630,6 +630,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
URLLoaderThrottleProviderType::kFrame);

8
patch/patches/content_app_shutdown_2798.patch
View File

@ -1,8 +1,8 @@
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index d769b656dbe9..b2c67e1da6aa 100644
index bb72915a26e2..9fbafc0643e1 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -43,6 +43,7 @@
@@ -44,6 +44,7 @@
#include "base/strings/stringprintf.h"
#include "base/task/post_task.h"
#include "base/task/thread_pool/thread_pool_instance.h"
@ -10,7 +10,7 @@ index d769b656dbe9..b2c67e1da6aa 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"
@@ -1014,6 +1015,11 @@ void ContentMainRunnerImpl::Shutdown() {
@@ -1016,6 +1017,11 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true;
}
@ -23,7 +23,7 @@ index d769b656dbe9..b2c67e1da6aa 100644
ContentMainRunner* ContentMainRunner::Create() {
return ContentMainRunnerImpl::Create();
diff --git content/app/content_main_runner_impl.h content/app/content_main_runner_impl.h
index 0a129f34c19f..9c83646113a0 100644
index 4632e35eaf65..c74d9ca750c7 100644
--- content/app/content_main_runner_impl.h
+++ content/app/content_main_runner_impl.h
@@ -51,6 +51,8 @@ class ContentMainRunnerImpl : public ContentMainRunner {

74
patch/patches/crashpad_1995.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/chrome_elf/BUILD.gn chrome/chrome_elf/BUILD.gn
index de079e97cc2b..b6bcf351e438 100644
index 9b08e23e921b..49182504ae36 100644
--- chrome/chrome_elf/BUILD.gn
+++ chrome/chrome_elf/BUILD.gn
@@ -7,6 +7,7 @@
@ -26,7 +26,7 @@ index de079e97cc2b..b6bcf351e438 100644
"//base:base_static", # pe_image
+ "//cef/libcef/features",
"//chrome/install_static:install_static_util",
"//components/crash/content/app",
"//components/crash/core/app",
"//components/crash/core/common", # crash_keys
@@ -121,6 +120,17 @@ static_library("crash") {
"//content/public/common:result_codes",
@ -47,7 +47,7 @@ index de079e97cc2b..b6bcf351e438 100644
source_set("dll_hash") {
diff --git chrome/chrome_elf/crash/crash_helper.cc chrome/chrome_elf/crash/crash_helper.cc
index a02aa37c566a..0d0581132bdd 100644
index 42a4bfcdb856..9f674625a155 100644
--- chrome/chrome_elf/crash/crash_helper.cc
+++ chrome/chrome_elf/crash/crash_helper.cc
@@ -11,12 +11,17 @@
@ -57,7 +57,7 @@ index a02aa37c566a..0d0581132bdd 100644
+#include "cef/libcef/features/features.h"
#include "chrome/app/chrome_crash_reporter_client_win.h"
#include "chrome/chrome_elf/hook_util/hook_util.h"
#include "components/crash/content/app/crashpad.h"
#include "components/crash/core/app/crashpad.h"
#include "components/crash/core/common/crash_keys.h"
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
@ -81,7 +81,7 @@ index a02aa37c566a..0d0581132bdd 100644
g_crash_helper_enabled = true;
return true;
diff --git chrome/common/crash_keys.cc chrome/common/crash_keys.cc
index 4b9d1c365376..6529583db11b 100644
index f9a6c6b6ae2d..3701b4423899 100644
--- chrome/common/crash_keys.cc
+++ chrome/common/crash_keys.cc
@@ -4,6 +4,8 @@
@ -126,10 +126,10 @@ index bcf172e645a2..f879aa745adf 100644
// Sets the kNumSwitches key and the set of keys named using kSwitchFormat based
// on the given |command_line|.
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
diff --git components/crash/content/app/breakpad_linux.cc components/crash/content/app/breakpad_linux.cc
index 27683246750c..064c679a03f1 100644
--- components/crash/content/app/breakpad_linux.cc
+++ components/crash/content/app/breakpad_linux.cc
diff --git components/crash/core/app/breakpad_linux.cc components/crash/core/app/breakpad_linux.cc
index 192b0a7f137f..d53b90173ae2 100644
--- components/crash/core/app/breakpad_linux.cc
+++ components/crash/core/app/breakpad_linux.cc
@@ -28,6 +28,7 @@
#include "base/base_switches.h"
#include "base/command_line.h"
@ -229,10 +229,10 @@ index 27683246750c..064c679a03f1 100644
#if defined(OS_ANDROID)
void InitNonBrowserCrashReporterForAndroid(const std::string& process_type) {
SanitizationInfo sanitization_info;
diff --git components/crash/content/app/breakpad_linux.h components/crash/content/app/breakpad_linux.h
index 6e95af6ca7f5..061fb189d60f 100644
--- components/crash/content/app/breakpad_linux.h
+++ components/crash/content/app/breakpad_linux.h
diff --git components/crash/core/app/breakpad_linux.h components/crash/core/app/breakpad_linux.h
index 9ea80370a842..3043f7d32f33 100644
--- 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);
// Sets the product/distribution channel crash key.
void SetChannelCrashKey(const std::string& channel);
@ -243,10 +243,10 @@ index 6e95af6ca7f5..061fb189d60f 100644
#if defined(OS_ANDROID)
extern void InitCrashKeysForTesting();
diff --git components/crash/content/app/crash_reporter_client.cc components/crash/content/app/crash_reporter_client.cc
index bb131fb5d540..a4b86e58187d 100644
--- components/crash/content/app/crash_reporter_client.cc
+++ components/crash/content/app/crash_reporter_client.cc
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
index e778f68af30f..d2a2a6bf1f67 100644
--- components/crash/core/app/crash_reporter_client.cc
+++ components/crash/core/app/crash_reporter_client.cc
@@ -88,7 +88,7 @@ int CrashReporterClient::GetResultCodeRespawnFailed() {
}
#endif
@ -320,13 +320,13 @@ index bb131fb5d540..a4b86e58187d 100644
+#endif
} // namespace crash_reporter
diff --git components/crash/content/app/crash_reporter_client.h components/crash/content/app/crash_reporter_client.h
index eb726494e22b..c8b1d82e64b9 100644
--- components/crash/content/app/crash_reporter_client.h
+++ components/crash/content/app/crash_reporter_client.h
diff --git components/crash/core/app/crash_reporter_client.h components/crash/core/app/crash_reporter_client.h
index 9cc78fc25840..f54cdbdf2fc4 100644
--- components/crash/core/app/crash_reporter_client.h
+++ components/crash/core/app/crash_reporter_client.h
@@ -5,7 +5,9 @@
#ifndef COMPONENTS_CRASH_CONTENT_APP_CRASH_REPORTER_CLIENT_H_
#define COMPONENTS_CRASH_CONTENT_APP_CRASH_REPORTER_CLIENT_H_
#ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
#define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
+#include <map>
#include <string>
@ -390,10 +390,10 @@ index eb726494e22b..c8b1d82e64b9 100644
};
} // namespace crash_reporter
diff --git components/crash/content/app/crashpad.cc components/crash/content/app/crashpad.cc
index 222d62ada276..22c35665b394 100644
--- components/crash/content/app/crashpad.cc
+++ components/crash/content/app/crashpad.cc
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
index 290b4692c16f..ef91dbdc369d 100644
--- components/crash/core/app/crashpad.cc
+++ components/crash/core/app/crashpad.cc
@@ -151,7 +151,8 @@ void InitializeCrashpadImpl(bool initial_client,
// fallback. Forwarding is turned off for debug-mode builds even for the
// browser process, because the system's crash reporter can take a very long
@ -404,10 +404,10 @@ index 222d62ada276..22c35665b394 100644
crashpad::CrashpadInfo::GetCrashpadInfo()
->set_system_crash_reporter_forwarding(crashpad::TriState::kDisabled);
}
diff --git components/crash/content/app/crashpad_mac.mm components/crash/content/app/crashpad_mac.mm
index c2de9fe867c5..29cda67a1f72 100644
--- components/crash/content/app/crashpad_mac.mm
+++ components/crash/content/app/crashpad_mac.mm
diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
index b579521d5586..644756cf710c 100644
--- components/crash/core/app/crashpad_mac.mm
+++ components/crash/core/app/crashpad_mac.mm
@@ -16,12 +16,15 @@
#include "base/logging.h"
#include "base/mac/bundle_locations.h"
@ -418,8 +418,8 @@ index c2de9fe867c5..29cda67a1f72 100644
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "build/branding_buildflags.h"
#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/content/app/crash_switches.h"
#include "components/crash/core/app/crash_reporter_client.h"
+#include "components/crash/core/app/crash_switches.h"
+#include "content/public/common/content_paths.h"
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
@ -513,10 +513,10 @@ index c2de9fe867c5..29cda67a1f72 100644
bool result = GetCrashpadClient().StartHandler(
handler_path, database_path, metrics_path, url,
GetProcessSimpleAnnotations(), arguments, true, false);
diff --git components/crash/content/app/crashpad_win.cc components/crash/content/app/crashpad_win.cc
index 4e6d3052b315..f8c4dfb37e5d 100644
--- components/crash/content/app/crashpad_win.cc
+++ components/crash/content/app/crashpad_win.cc
diff --git components/crash/core/app/crashpad_win.cc components/crash/core/app/crashpad_win.cc
index 669f5bea844d..734163c0aad1 100644
--- components/crash/core/app/crashpad_win.cc
+++ components/crash/core/app/crashpad_win.cc
@@ -36,8 +36,8 @@ void GetPlatformCrashpadAnnotations(
base::string16 product_name, version, special_build, channel_name;
crash_reporter_client->GetProductNameAndVersion(

6
patch/patches/extensions_1947.patch
View File

@ -27,7 +27,7 @@ index bb4af725af9f..a1389be84f6e 100644
auto* browser_context = web_contents->GetBrowserContext();
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index 524c0603c138..f10ecd683aae 100644
index 01fbe50e48a9..3977d27e813d 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -66,11 +66,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@ -97,7 +97,7 @@ index 524c0603c138..f10ecd683aae 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index 093fb25589a9..3e6247802c52 100644
index b5d2c7652cae..2e11775e5db3 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -52,13 +52,19 @@ class ExtensionHost : public DeferredStartRenderHost,
@ -159,7 +159,7 @@ index c2d64706c1db..4d5c75dd035f 100644
// once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index 3c02c62162f1..13c355db03e0 100644
index bc06d55da961..64f513b54fe3 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -386,9 +386,16 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,

6
patch/patches/gn_config.patch
View File

@ -1,8 +1,8 @@
diff --git .gn .gn
index 7ad6b3bc6298..6dc25b644f2b 100644
index c7296bb80f62..a64c7c42720a 100644
--- .gn
+++ .gn
@@ -643,6 +643,8 @@ exec_script_whitelist =
@@ -642,6 +642,8 @@ exec_script_whitelist =
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
@ -12,7 +12,7 @@ index 7ad6b3bc6298..6dc25b644f2b 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 6791cf2464d3..a00f33f5987f 100644
index 72ae0d476511..1f8c6244e2a3 100644
--- BUILD.gn
+++ BUILD.gn
@@ -222,6 +222,7 @@ group("gn_all") {

4
patch/patches/gritsettings.patch
View File

@ -1,8 +1,8 @@
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
index f8e27f6df773..a9cf4203e104 100644
index 730e3209ec95..39257ae244de 100644
--- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec
@@ -600,4 +600,13 @@
@@ -601,4 +601,13 @@
# Please read the header and find the right section above instead.
# Resource ids starting at 31000 are reserved for projects built on Chromium.

2
patch/patches/message_loop.patch
View File

@ -43,7 +43,7 @@ index 61b8c6fcc42d..d439b00a87bb 100644
#if !defined(OS_NACL)
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
index 8f6258f7644a..9c356dea5234 100644
index c50e34f6da1b..40dcc66ed82a 100644
--- base/message_loop/message_pump_win.cc
+++ base/message_loop/message_pump_win.cc
@@ -2,6 +2,7 @@

6
patch/patches/message_pump_mac_2495.patch
View File

@ -1,8 +1,8 @@
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
index 7711944f8e30..676f69e7890a 100644
index bb9e6d30bedd..e5ef7077c9de 100644
--- base/message_loop/message_pump_mac.mm
+++ base/message_loop/message_pump_mac.mm
@@ -777,7 +777,8 @@ void MessagePumpUIApplication::Detach() {
@@ -785,7 +785,8 @@ void MessagePumpUIApplication::Detach() {
#else
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@ -12,7 +12,7 @@ index 7711944f8e30..676f69e7890a 100644
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
// Pumping events in private runloop modes is known to interact badly with
// app modal windows like NSAlert.
@@ -789,7 +790,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@@ -797,7 +798,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
}
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {

8
patch/patches/osr_fling_2745.patch
View File

@ -41,10 +41,10 @@ index cc4b13a7b9c6..84f3b9ed7cf4 100644
} // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index 40b9e634b8bf..4d2401533577 100644
index 5ad66a6af94f..501a4dc07a9f 100644
--- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -2671,6 +2671,11 @@ void RenderWidgetHostImpl::DidStartScrollingViewport() {
@@ -2746,6 +2746,11 @@ void RenderWidgetHostImpl::DidStartScrollingViewport() {
view_->set_is_currently_scrolling_viewport(true);
}
@ -57,10 +57,10 @@ index 40b9e634b8bf..4d2401533577 100644
const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index b6f95fdfa88b..73ab5a676373 100644
index 013b2165038f..28d33768143f 100644
--- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h
@@ -709,6 +709,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
@@ -731,6 +731,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl
void ProgressFlingIfNeeded(base::TimeTicks current_time);
void StopFling();

10
patch/patches/prefs_content_1161.patch
View File

@ -1,5 +1,5 @@
diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
index 1df0ec456eca..ca472453aef2 100644
index 0e67ad3c7431..de0bb8e1a824 100644
--- content/public/common/common_param_traits_macros.h
+++ content/public/common/common_param_traits_macros.h
@@ -177,6 +177,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
@ -11,7 +11,7 @@ index 1df0ec456eca..ca472453aef2 100644
IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc
index 8d1b50f56adf..1e1ad9227ce0 100644
index 13999e87c780..3494c1c762cc 100644
--- content/public/common/web_preferences.cc
+++ content/public/common/web_preferences.cc
@@ -165,6 +165,7 @@ WebPreferences::WebPreferences()
@ -23,7 +23,7 @@ index 8d1b50f56adf..1e1ad9227ce0 100644
record_whole_document(false),
cookie_enabled(true),
diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h
index 76cb05a11674..355c32dd6c55 100644
index 6c6420ec70bf..256923855837 100644
--- content/public/common/web_preferences.h
+++ content/public/common/web_preferences.h
@@ -181,6 +181,7 @@ struct CONTENT_EXPORT WebPreferences {
@ -35,10 +35,10 @@ index 76cb05a11674..355c32dd6c55 100644
bool record_whole_document;
diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
index 9c452f46c9a1..018190efd2b4 100644
index f0cb4833442b..1f80fefaa124 100644
--- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc
@@ -962,6 +962,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
@@ -971,6 +971,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
#endif
WebRuntimeFeatures::EnableTranslateService(prefs.translate_service_available);

8
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
index 332aa3a417e8..094523fc1d6b 100644
index 00d1c0fa2b00..45dcadc79fb2 100644
--- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc
@@ -22,6 +22,7 @@
@ -262,7 +262,7 @@ index 0881b3dd9303..4df6883d4d05 100644
Profile* const profile_;
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
index c0823ff96ee0..1897338ee4e6 100644
index 113d34201f90..8834b94c5475 100644
--- chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -27,6 +27,7 @@
@ -318,7 +318,7 @@ index c0823ff96ee0..1897338ee4e6 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 4e2e925da7c9..b4c622ce6c7f 100644
index cf3c71f478da..8438a234eb8b 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -24,6 +24,7 @@
@ -346,7 +346,7 @@ index 4e2e925da7c9..b4c622ce6c7f 100644
#if !BUILDFLAG(OPTIMIZE_WEBUI)
constexpr char kGeneratedPath[] =
@@ -334,7 +339,7 @@ void AddPrintPreviewFlags(content::WebUIDataSource* source, Profile* profile) {
@@ -332,7 +337,7 @@ void AddPrintPreviewFlags(content::WebUIDataSource* source, Profile* profile) {
source->AddBoolean("isEnterpriseManaged", enterprise_managed);
bool cloud_printer_handler_enabled =

13
patch/patches/renderer_host_1070713.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index 01a4e3dc134b..cddb71886d4f 100644
--- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc
@@ -455,6 +455,8 @@ bool RenderViewHostImpl::IsRenderViewLive() {
}
void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
+ if (!GetWidget()->GetAssociatedFrameWidget().is_bound())
+ return;
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
}

10
patch/patches/resource_bundle_2512.patch
View File

@ -1,8 +1,8 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index f0d845264cd0..af8ce36b915d 100644
index 133540ca848f..d442344715af 100644
--- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc
@@ -846,6 +846,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@@ -854,6 +854,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
: delegate_(delegate),
locale_resources_data_lock_(new base::Lock),
max_scale_factor_(SCALE_FACTOR_100P) {
@ -15,7 +15,7 @@ index f0d845264cd0..af8ce36b915d 100644
mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kMangleLocalizedStrings);
}
@@ -855,6 +861,11 @@ ResourceBundle::~ResourceBundle() {
@@ -863,6 +869,11 @@ ResourceBundle::~ResourceBundle() {
UnloadLocaleResources();
}
@ -28,10 +28,10 @@ index f0d845264cd0..af8ce36b915d 100644
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
index 102bb47dc58a..145e5b46d8e8 100644
index 3daa73bdc6d5..3d2f9232870d 100644
--- ui/base/resource/resource_bundle.h
+++ ui/base/resource/resource_bundle.h
@@ -155,6 +155,11 @@ class UI_BASE_EXPORT ResourceBundle {
@@ -158,6 +158,11 @@ class UI_BASE_EXPORT ResourceBundle {
// Return the global resource loader instance.
static ResourceBundle& GetSharedInstance();

2
patch/patches/runhooks.patch
View File

@ -1,5 +1,5 @@
diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py
index fa31688f36a2..69d74aa31c47 100644
index 2ab240da4548..b8eec0aa2383 100644
--- build/toolchain/win/setup_toolchain.py
+++ build/toolchain/win/setup_toolchain.py
@@ -142,22 +142,25 @@ def _LoadToolchainEnv(cpu, sdk_dir, target_store):

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 bef2f08dce2d..87c33b3d0d08 100644
index f7f9dafb9798..a378394c2d41 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -745,10 +745,12 @@ gfx::Rect RenderWidgetHostViewAura::GetViewBounds() {
@ -19,7 +19,7 @@ index bef2f08dce2d..87c33b3d0d08 100644
}
void RenderWidgetHostViewAura::WindowTitleChanged() {
@@ -2024,6 +2026,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -2029,6 +2031,15 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
// Init(), because it needs to have the layer.
if (frame_sink_id_.is_valid())
window_->SetEmbedFrameSinkId(frame_sink_id_);

21
patch/patches/service_manager_654986.patch
View File

@ -1,18 +1,5 @@
diff --git base/memory/shared_memory_hooks.h base/memory/shared_memory_hooks.h
index 4404b54c22a4..fa3138003032 100644
--- base/memory/shared_memory_hooks.h
+++ base/memory/shared_memory_hooks.h
@@ -24,7 +24,7 @@ class SharedMemoryHooks {
private:
friend class SharedMemoryHooksTest;
- friend int service_manager::Main(const service_manager::MainParams&);
+ friend int service_manager::MainInitialize(service_manager::MainParams&);
// Allows shared memory region creation to be hooked. Useful for sandboxed
// processes that are restricted from invoking the platform APIs directly.
diff --git services/service_manager/embedder/main.cc services/service_manager/embedder/main.cc
index b338bbff49ff..a0645251504b 100644
index f9c275cdd78f..247142951d99 100644
--- services/service_manager/embedder/main.cc
+++ services/service_manager/embedder/main.cc
@@ -244,22 +244,36 @@ int RunService(MainDelegate* delegate) {
@ -70,7 +57,7 @@ index b338bbff49ff..a0645251504b 100644
InitializeMac();
#endif
@@ -423,18 +432,16 @@ int Main(const MainParams& params) {
@@ -422,18 +431,16 @@ int Main(const MainParams& params) {
}
}
@ -98,7 +85,7 @@ index b338bbff49ff..a0645251504b 100644
switch (process_type) {
case ProcessType::kDefault:
NOTREACHED();
@@ -456,6 +463,8 @@ int Main(const MainParams& params) {
@@ -455,6 +462,8 @@ int Main(const MainParams& params) {
break;
}
@ -107,7 +94,7 @@ index b338bbff49ff..a0645251504b 100644
if (tracker) {
if (exit_code == 0) {
tracker->SetProcessPhaseIfEnabled(
@@ -467,13 +476,38 @@ int Main(const MainParams& params) {
@@ -466,13 +475,38 @@ int Main(const MainParams& params) {
}
}

16
patch/patches/services_network_2622.patch
View File

@ -58,7 +58,7 @@ index ee2f1e1baf51..4d53c655d723 100644
// itself, if |relative_path| is empty).
virtual mojo::Remote<network::mojom::NetworkContext> CreateNetworkContext(
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 84a7d50dfd71..aaa1346043da 100644
index 783485c013df..bf115fd4d63a 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -476,6 +476,25 @@ void CookieMonster::SetCookieableSchemes(
@ -139,10 +139,10 @@ index d1bf7a4d1f6d..772e08ee8916 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 05bd6dc34b94..26bd748ad4b6 100644
index 5e37a45a033a..ca44461120a8 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -1785,6 +1785,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
@@ -1795,6 +1795,7 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
}
scoped_refptr<SessionCleanupCookieStore> session_cleanup_cookie_store;
@ -150,7 +150,7 @@ index 05bd6dc34b94..26bd748ad4b6 100644
if (params_->cookie_path) {
scoped_refptr<base::SequencedTaskRunner> client_task_runner =
base::ThreadTaskRunnerHandle::Get();
@@ -1811,18 +1812,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
@@ -1821,18 +1822,26 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext() {
session_cleanup_cookie_store =
base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store);
@ -177,14 +177,14 @@ index 05bd6dc34b94..26bd748ad4b6 100644
+ builder.SetCookieStore(std::move(cookie_store));
+
#if BUILDFLAG(IS_TRUST_TOKENS_SUPPORTED)
if (base::FeatureList::IsEnabled(features::kTrustTokens)) {
if (params_->trust_token_path) {
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index b74677de805c..b67a2d246e65 100644
index 9515fe92e0b1..e659550debd2 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -253,6 +253,9 @@ struct NetworkContextParams {
@@ -219,6 +219,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;

8
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
index e76b66dace82..94a5f80a9b42 100644
index 66a4f7c28b4f..92cb66c1dc38 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -780,10 +780,6 @@ class LoginHandlerDelegate {
@@ -797,10 +797,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index e76b66dace82..94a5f80a9b42 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -840,12 +836,6 @@ void OnAuthRequiredContinuation(
@@ -857,12 +853,6 @@ void OnAuthRequiredContinuation(
web_contents_getter =
base::BindRepeating(GetWebContents, process_id, routing_id);
}
@ -26,7 +26,7 @@ index e76b66dace82..94a5f80a9b42 100644
new LoginHandlerDelegate(std::move(auth_challenge_responder),
std::move(web_contents_getter), auth_info,
is_request_for_main_frame, process_id, routing_id,
@@ -2573,15 +2563,21 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -2603,15 +2593,21 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}

14
patch/patches/set_resize_background_color.patch
View File

@ -1,8 +1,8 @@
diff --git ui/views/controls/native/native_view_host.cc ui/views/controls/native/native_view_host.cc
index bc1cb3a9e6fc..f68bdeb8786c 100644
index b29553ae8f7b..c31233db9ab2 100644
--- ui/views/controls/native/native_view_host.cc
+++ ui/views/controls/native/native_view_host.cc
@@ -151,7 +151,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
@@ -154,7 +154,7 @@ void NativeViewHost::OnPaint(gfx::Canvas* canvas) {
// It would be nice if this used some approximation of the page's
// current background color.
if (native_wrapper_->HasInstalledClip())
@ -12,10 +12,10 @@ index bc1cb3a9e6fc..f68bdeb8786c 100644
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
index 2a6cfc54d866..48623ab5d672 100644
index f92961e9f79b..f1ff80b244ef 100644
--- ui/views/controls/native/native_view_host.h
+++ ui/views/controls/native/native_view_host.h
@@ -85,6 +85,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
@@ -86,6 +86,12 @@ class VIEWS_EXPORT NativeViewHost : public View {
void set_fast_resize(bool fast_resize) { fast_resize_ = fast_resize; }
bool fast_resize() const { return fast_resize_; }
@ -28,7 +28,7 @@ index 2a6cfc54d866..48623ab5d672 100644
gfx::NativeView native_view() const { return native_view_; }
void NativeViewDestroyed();
@@ -131,6 +137,9 @@ class VIEWS_EXPORT NativeViewHost : public View {
@@ -132,6 +138,9 @@ class VIEWS_EXPORT NativeViewHost : public View {
// in the setter/accessor above.
bool fast_resize_ = false;
@ -39,10 +39,10 @@ index 2a6cfc54d866..48623ab5d672 100644
};
diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
index 9a9f2505f15f..8cd5198e0304 100644
index 7bef84b8c9ea..9b9f0a789fe9 100644
--- ui/views/controls/webview/webview.cc
+++ ui/views/controls/webview/webview.cc
@@ -126,6 +126,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
@@ -127,6 +127,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
MaybeEnableAutoResize();
}

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
index 6f07209af5dc..9f97108c8c31 100644
index ac67c35bbcb0..f1ebee76b00d 100644
--- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h
@@ -52,6 +52,8 @@

40
patch/patches/views_1749_2102.patch
View File

@ -39,7 +39,7 @@ index 5bcc6204c2b5..1bf18609d150 100644
virtual void MenuWillShow() {}
diff --git ui/gfx/render_text.cc ui/gfx/render_text.cc
index dcaacc840f3a..602cb6b03c0c 100644
index 7d5fb0c4d6e6..79e59cd87f91 100644
--- ui/gfx/render_text.cc
+++ ui/gfx/render_text.cc
@@ -609,6 +609,14 @@ void RenderText::SetWhitespaceElision(base::Optional<bool> whitespace_elision) {
@ -57,7 +57,7 @@ index dcaacc840f3a..602cb6b03c0c 100644
void RenderText::SetDisplayRect(const Rect& r) {
if (r != display_rect_) {
display_rect_ = r;
@@ -1987,6 +1995,19 @@ void RenderText::OnTextAttributeChanged() {
@@ -1973,6 +1981,19 @@ void RenderText::OnTextAttributeChanged() {
layout_text_up_to_date_ = false;
@ -78,7 +78,7 @@ index dcaacc840f3a..602cb6b03c0c 100644
}
diff --git ui/gfx/render_text.h ui/gfx/render_text.h
index 3e554d265299..1596aa1f873e 100644
index 892b32910b77..0d3c4ef5cafa 100644
--- ui/gfx/render_text.h
+++ ui/gfx/render_text.h
@@ -324,6 +324,10 @@ class GFX_EXPORT RenderText {
@ -115,10 +115,10 @@ index b711c5f08f80..d0d428057e5d 100644
// Size used for the default SquareInkDropRipple.
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
index 76864b91df6d..f9b61ee10b1e 100644
index bb9105f1a18e..45ae9cdb4ab0 100644
--- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc
@@ -479,6 +479,12 @@ void LabelButton::OnThemeChanged() {
@@ -480,6 +480,12 @@ void LabelButton::OnThemeChanged() {
SchedulePaint();
}
@ -146,7 +146,7 @@ index ac348aa7dd46..88ab098daddc 100644
ImageView* image() const { return image_; }
Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 7749c52c1cf0..487099b3559d 100644
index c15c27ae75b6..325eec4939de 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -53,6 +53,20 @@ bool IsOpaque(SkColor color) {
@ -170,7 +170,7 @@ index 7749c52c1cf0..487099b3559d 100644
} // namespace
namespace views {
@@ -310,6 +324,14 @@ base::string16 Label::GetTooltipText() const {
@@ -308,6 +322,14 @@ base::string16 Label::GetTooltipText() const {
return tooltip_text_;
}
@ -185,7 +185,7 @@ index 7749c52c1cf0..487099b3559d 100644
void Label::SetTooltipText(const base::string16& tooltip_text) {
DCHECK(handles_tooltips_);
if (tooltip_text_ == tooltip_text)
@@ -587,7 +609,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
@@ -582,7 +604,19 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SetFontList(font_list());
render_text->set_shadows(GetShadows());
render_text->SetCursorEnabled(false);
@ -230,10 +230,10 @@ index 4cb533caa9c7..63eac79c878c 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 36e7f97887fd..940fb3d8a338 100644
index d8c09129ad9a..7c28530fa7dd 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -2646,8 +2646,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
@@ -2638,8 +2638,13 @@ MenuItemView* MenuController::FindNextSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@ -248,7 +248,7 @@ index 36e7f97887fd..940fb3d8a338 100644
MenuItemView* to_select = nullptr;
if (!item->GetSubmenu()->GetMenuItems().empty())
to_select = FindInitialSelectableMenuItem(item, INCREMENT_SELECTION_DOWN);
@@ -2666,8 +2671,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2658,8 +2663,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@ -300,10 +300,10 @@ index 2a03ff43f4a6..c12d68eb212c 100644
virtual int GetMaxWidthForMenu(MenuItemView* menu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index c67fc8503db7..604c8e29f5e3 100644
index 6f45e5ac5d1c..d8a0eee3fedd 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1036,6 +1036,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -987,6 +987,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@ -319,7 +319,7 @@ index c67fc8503db7..604c8e29f5e3 100644
} else if (render_selection) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) {
@@ -1103,6 +1112,13 @@ void MenuItemView::PaintMinorIconAndText(
@@ -1054,6 +1063,13 @@ void MenuItemView::PaintMinorIconAndText(
}
SkColor MenuItemView::GetTextColor(bool minor, bool render_selection) const {
@ -334,10 +334,10 @@ index c67fc8503db7..604c8e29f5e3 100644
GetMenuController() && GetMenuController()->use_touchable_layout()
? style::CONTEXT_TOUCH_MENU
diff --git ui/views/controls/menu/menu_model_adapter.cc ui/views/controls/menu/menu_model_adapter.cc
index 373ea41937fe..8d13cab6916b 100644
index 88a868cf6f98..b7c10dc5613c 100644
--- ui/views/controls/menu/menu_model_adapter.cc
+++ ui/views/controls/menu/menu_model_adapter.cc
@@ -228,6 +228,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
@@ -230,6 +230,77 @@ bool MenuModelAdapter::IsItemChecked(int id) const {
return false;
}
@ -441,10 +441,10 @@ index 78f832fd3acf..cb030c991614 100644
void WillHideMenu(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
index a1d302f3d5d5..d83ad955da37 100644
index 7a9d15cb2066..abfe73a68ace 100644
--- ui/views/controls/menu/menu_scroll_view_container.cc
+++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -187,6 +187,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@@ -189,6 +189,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
scroll_down_button_ =
AddChildView(std::make_unique<MenuScrollButton>(content_view, false));
@ -457,10 +457,10 @@ index a1d302f3d5d5..d83ad955da37 100644
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
index 3c483dffc6c8..203e3b62c385 100644
index 82a2d7a7827f..082c614e57a9 100644
--- ui/views/test/ui_controls_factory_desktop_aurax11.cc
+++ ui/views/test/ui_controls_factory_desktop_aurax11.cc
@@ -134,10 +134,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
@@ -139,10 +139,6 @@ class UIControlsDesktopX11 : public UIControlsAura {
aura::test::QueryLatestMousePositionRequestInHost(host);
host->ConvertPixelsToDIP(&root_current_location);

64
patch/patches/views_widget_180_1481_1565_1677_1749.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index 6fc2ae557a26..0a704d1453a2 100644
index 19c6b2e5c705..b48d5c04ae0e 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -564,6 +564,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
@@ -568,6 +568,14 @@ float RenderWidgetHostViewBase::GetDeviceScaleFactor() {
return screen_info.device_scale_factor;
}
@ -18,7 +18,7 @@ index 6fc2ae557a26..0a704d1453a2 100644
return renderer_frame_number_;
}
diff --git content/browser/renderer_host/render_widget_host_view_base.h content/browser/renderer_host/render_widget_host_view_base.h
index fca7a56a4b7f..3691f64f2f95 100644
index 27133fd98354..2552750935af 100644
--- 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;
@ -48,7 +48,7 @@ index fca7a56a4b7f..3691f64f2f95 100644
TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override;
void SetRecordContentToVisibleTimeRequest(
@@ -441,6 +447,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -444,6 +450,12 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
// helps to position the full screen widget on the correct monitor.
virtual void InitAsFullscreen(RenderWidgetHostView* reference_host_view) = 0;
@ -61,7 +61,7 @@ index fca7a56a4b7f..3691f64f2f95 100644
// Sets the cursor for this view to the one associated with the specified
// cursor_type.
virtual void UpdateCursor(const WebCursor& cursor) = 0;
@@ -605,6 +617,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
@@ -608,6 +620,10 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
bool is_currently_scrolling_viewport_ = false;
@ -73,7 +73,7 @@ index fca7a56a4b7f..3691f64f2f95 100644
FRIEND_TEST_ALL_PREFIXES(
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
index e571258b6046..ba1bb2e96b40 100644
index 4b2067bc7f26..3f483ff54365 100644
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -33,6 +33,10 @@
@ -87,7 +87,7 @@ index e571258b6046..ba1bb2e96b40 100644
#if defined(OS_WIN)
#include "content/browser/frame_host/render_frame_host_impl.h"
#include "ui/aura/window_tree_host.h"
@@ -896,6 +900,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
@@ -928,6 +932,14 @@ void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
::SetFocus(hwnd);
}
}
@ -103,10 +103,10 @@ index e571258b6046..ba1bb2e96b40 100644
// TODO(wjmaclean): can host_ ever be null?
if (host_ && set_focus_on_mouse_down_or_key_event_) {
diff --git content/public/browser/render_widget_host_view.h content/public/browser/render_widget_host_view.h
index d7631d9b2246..853692333f9d 100644
index 3e5bf09f1cf7..bc8ea335d501 100644
--- content/public/browser/render_widget_host_view.h
+++ content/public/browser/render_widget_host_view.h
@@ -238,6 +238,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
@@ -243,6 +243,14 @@ class CONTENT_EXPORT RenderWidgetHostView {
// This must always return the same device scale factor as GetScreenInfo.
virtual float GetDeviceScaleFactor() = 0;
@ -122,10 +122,10 @@ index d7631d9b2246..853692333f9d 100644
// Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0;
diff --git ui/base/x/x11_window.cc ui/base/x/x11_window.cc
index 2c9c97b81e74..01dd7ca2c9b8 100644
index 62c8122e05ad..ff44d464a7b0 100644
--- ui/base/x/x11_window.cc
+++ ui/base/x/x11_window.cc
@@ -251,8 +251,12 @@ void XWindow::Init(const Configuration& config) {
@@ -256,8 +256,12 @@ void XWindow::Init(const Configuration& config) {
attribute_mask |= CWBorderPixel;
swa.border_pixel = 0;
@ -140,7 +140,7 @@ index 2c9c97b81e74..01dd7ca2c9b8 100644
bounds_in_pixels_.height(),
0, // border width
diff --git ui/base/x/x11_window.h ui/base/x/x11_window.h
index 9939835d80ad..61249e3fb8f2 100644
index d0f852b1d69d..7d3ea8779fd1 100644
--- ui/base/x/x11_window.h
+++ ui/base/x/x11_window.h
@@ -19,6 +19,7 @@
@ -151,7 +151,7 @@ index 9939835d80ad..61249e3fb8f2 100644
#include "ui/gfx/x/x11.h"
#include "ui/gfx/x/x11_types.h"
@@ -85,6 +86,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XWindow {
@@ -86,6 +87,7 @@ class COMPONENT_EXPORT(UI_BASE_X) XWindow {
std::string wm_class_name;
std::string wm_class_class;
std::string wm_role_name;
@ -160,7 +160,7 @@ index 9939835d80ad..61249e3fb8f2 100644
XWindow();
diff --git ui/platform_window/x11/x11_window.cc ui/platform_window/x11/x11_window.cc
index fb6b7ac459ce..39a262afc8ca 100644
index 98b442ee756d..d3ad9f8995cc 100644
--- ui/platform_window/x11/x11_window.cc
+++ ui/platform_window/x11/x11_window.cc
@@ -85,6 +85,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig(
@ -185,10 +185,10 @@ index 70553b153c44..ecd99bc78373 100644
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
index 6030f29ac64f..d7a679c4a1b8 100644
index 91cfaf77bb31..f369314e02f4 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_linux.cc
@@ -329,6 +329,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
@@ -348,6 +348,8 @@ void DesktopWindowTreeHostLinux::AddAdditionalInitProperties(
properties->wm_class_class = params.wm_class_class;
properties->wm_role_name = params.wm_role_name;
@ -198,10 +198,10 @@ index 6030f29ac64f..d7a679c4a1b8 100644
properties->x11_extension_delegate = 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
index d0825cdb2a1c..606400d2bcef 100644
index 6f576d95707d..dacd02f13012 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -129,8 +129,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@@ -133,8 +133,12 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
native_widget_delegate_);
HWND parent_hwnd = nullptr;
@ -215,7 +215,7 @@ index d0825cdb2a1c..606400d2bcef 100644
remove_standard_frame_ = params.remove_standard_frame;
has_non_client_view_ = Widget::RequiresNonClientView(params.type);
@@ -905,11 +909,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -909,11 +913,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@ -234,7 +234,7 @@ index d0825cdb2a1c..606400d2bcef 100644
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
index 78925bf334d9..57519c817127 100644
index 4b217541512c..1940da51d5c6 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -288,6 +288,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
@ -249,10 +249,10 @@ index 78925bf334d9..57519c817127 100644
// a reference.
corewm::TooltipWin* tooltip_;
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
index 7439257da38c..4ccfd25c82e3 100644
index 2c94941cf273..9512335908cf 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc
@@ -84,6 +84,9 @@ DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
@@ -83,6 +83,9 @@ DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
// DesktopWindowTreeHostX11, DesktopWindowTreeHost implementation:
void DesktopWindowTreeHostX11::Init(const Widget::InitParams& params) {
@ -262,7 +262,7 @@ index 7439257da38c..4ccfd25c82e3 100644
DesktopWindowTreeHostLinux::Init(params);
// Set XEventDelegate to receive selection, drag&drop and raw key events.
@@ -139,6 +142,18 @@ void DesktopWindowTreeHostX11::EndMoveLoop() {
@@ -134,6 +137,18 @@ void DesktopWindowTreeHostX11::EndMoveLoop() {
////////////////////////////////////////////////////////////////////////////////
// DesktopWindowTreeHostX11 implementation:
@ -329,10 +329,10 @@ index 53da309c14d3..7a50560c8abc 100644
};
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index 734e988c5a9a..02e30f2f8b7f 100644
index 6472b4210a0a..390758b017be 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -288,7 +288,8 @@ void Widget::Init(InitParams params) {
@@ -289,7 +289,8 @@ void Widget::Init(InitParams params) {
params.name = params.delegate->GetContentsView()->GetClassName();
params.child |= (params.type == InitParams::TYPE_CONTROL);
@ -342,7 +342,7 @@ index 734e988c5a9a..02e30f2f8b7f 100644
if (params.opacity == views::Widget::InitParams::WindowOpacity::kInferred &&
params.type != views::Widget::InitParams::TYPE_WINDOW) {
@@ -370,7 +371,12 @@ void Widget::Init(InitParams params) {
@@ -371,7 +372,12 @@ void Widget::Init(InitParams params) {
}
} else if (delegate) {
SetContentsView(delegate->GetContentsView());
@ -356,7 +356,7 @@ index 734e988c5a9a..02e30f2f8b7f 100644
}
observer_manager_.Add(GetNativeTheme());
@@ -1147,10 +1153,16 @@ void Widget::OnNativeWidgetDestroyed() {
@@ -1156,10 +1162,16 @@ void Widget::OnNativeWidgetDestroyed() {
}
gfx::Size Widget::GetMinimumSize() const {
@ -374,11 +374,11 @@ index 734e988c5a9a..02e30f2f8b7f 100644
}
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index e7070ef061d9..e8bb88da3631 100644
index 105fc39ed5ec..a4e227167dbd 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -282,6 +282,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@@ -312,6 +312,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
// the concept with bubble anchoring a la BubbleDialogDelegateView.
gfx::NativeView parent = nullptr;
+ gfx::AcceleratedWidget parent_widget = gfx::kNullAcceleratedWidget;
@ -415,10 +415,10 @@ index 40e66a212e3e..08ee8523ab15 100644
if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 10f39e919d56..787a92fefdce 100644
index e18afe3c8c28..3b8b21eee322 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -2994,10 +2994,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3005,10 +3005,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
} else if (event.type() == ui::ET_MOUSEWHEEL) {
ui::MouseWheelEvent mouse_wheel_event(msg);
// Reroute the mouse wheel to the window under the pointer if applicable.

6
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 84a16ad496b5..79db9031051e 100644
index eb1a0ae5ca25..846c738053b7 100644
--- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn
@@ -13,7 +13,10 @@ config("viz_service_implementation") {
@ -128,10 +128,10 @@ index b4d4b1c1c597..9ce685048ab1 100644
return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
display_client);
diff --git components/viz/service/display_embedder/software_output_device_win.cc components/viz/service/display_embedder/software_output_device_win.cc
index 94ea55487f85..542ec00f4a7f 100644
index 2bb30e5318b6..535535dd6c10 100644
--- components/viz/service/display_embedder/software_output_device_win.cc
+++ components/viz/service/display_embedder/software_output_device_win.cc
@@ -268,8 +268,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
@@ -188,8 +188,9 @@ void SoftwareOutputDeviceWinProxy::EndPaintDelegated(
if (!canvas_)
return;

26
patch/patches/web_contents_1257_1565.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index b57520fe4254..0aa0a4a7c058 100644
index 0fe5a498d698..9d5379624671 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -2066,15 +2066,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -2069,15 +2069,22 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -33,7 +33,7 @@ index b57520fe4254..0aa0a4a7c058 100644
}
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -2894,6 +2901,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
@@ -2897,6 +2904,15 @@ RenderFrameHostDelegate* WebContentsImpl::CreateNewWindow(
// objects.
create_params.renderer_initiated_creation = !is_new_browsing_instance;
@ -49,7 +49,7 @@ index b57520fe4254..0aa0a4a7c058 100644
std::unique_ptr<WebContentsImpl> new_contents;
if (!is_guest) {
create_params.context = view_->GetNativeView();
@@ -6356,6 +6372,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -6370,6 +6386,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// This is an outermost WebContents.
SetAsFocusedWebContentsIfNecessary();
}
@ -73,10 +73,10 @@ index d1d8ff84e1d2..e7cca94f8647 100644
WebContents::CreateParams::CreateParams(const CreateParams& other) = default;
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index cf98180740c4..c4eba9a42702 100644
index b471bd1f78c6..19fb0c70ac94 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -82,9 +82,11 @@ class BrowserPluginGuestDelegate;
@@ -84,9 +84,11 @@ class BrowserPluginGuestDelegate;
class InterstitialPage;
class RenderFrameHost;
class RenderViewHost;
@ -88,7 +88,7 @@ index cf98180740c4..c4eba9a42702 100644
class WebUI;
struct CustomContextMenuContext;
struct DropData;
@@ -212,6 +214,10 @@ class WebContents : public PageNavigator,
@@ -214,6 +216,10 @@ class WebContents : public PageNavigator,
// Sandboxing flags set on the new WebContents.
blink::mojom::WebSandboxFlags starting_sandbox_flags;
@ -100,10 +100,10 @@ index cf98180740c4..c4eba9a42702 100644
// the value that'll be returned by GetLastActiveTime(). If this is left
// 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
index c20a325ff586..874490e1c878 100644
index d10b0f458416..84e09b266d48 100644
--- content/public/browser/web_contents_delegate.h
+++ content/public/browser/web_contents_delegate.h
@@ -57,10 +57,12 @@ class ColorChooser;
@@ -59,10 +59,12 @@ class ColorChooser;
class FileSelectListener;
class JavaScriptDialogManager;
class RenderFrameHost;
@ -115,8 +115,8 @@ index c20a325ff586..874490e1c878 100644
+class WebContentsView;
struct ContextMenuParams;
struct DropData;
struct NativeWebKeyboardEvent;
@@ -324,6 +326,14 @@ class CONTENT_EXPORT WebContentsDelegate {
struct MediaPlayerWatchTime;
@@ -327,6 +329,14 @@ class CONTENT_EXPORT WebContentsDelegate {
const std::string& partition_id,
SessionStorageNamespace* session_storage_namespace);
@ -132,10 +132,10 @@ index c20a325ff586..874490e1c878 100644
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index 7bc8aae9b388..81cf86ef7990 100644
index 0b9a8c72a426..1c6ca61171cd 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -585,6 +585,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
@@ -582,6 +582,10 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener {
// WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

24
patch/patches/webkit_plugin_info_2015.patch
View File

@ -26,7 +26,7 @@ index c7bc68000ad0..45798fbcf914 100644
static void InitializeCommon(Platform* platform,
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
index bb92fd9c58d0..02f55f2f33e0 100644
index c9c761dd34e6..75afc167a60e 100644
--- third_party/blink/renderer/core/dom/document_init.cc
+++ third_party/blink/renderer/core/dom/document_init.cc
@@ -200,11 +200,11 @@ DocumentInit& DocumentInit::WithTypeFrom(const String& type) {
@ -44,10 +44,10 @@ index bb92fd9c58d0..02f55f2f33e0 100644
}
diff --git third_party/blink/renderer/core/frame/local_frame.cc third_party/blink/renderer/core/frame/local_frame.cc
index bd3e6c88f1ec..17467a507403 100644
index ab0d55c3de88..360c1b8abdf5 100644
--- third_party/blink/renderer/core/frame/local_frame.cc
+++ third_party/blink/renderer/core/frame/local_frame.cc
@@ -1322,7 +1322,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
@@ -1331,7 +1331,7 @@ WebContentSettingsClient* LocalFrame::GetContentSettingsClient() {
PluginData* LocalFrame::GetPluginData() const {
if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
return nullptr;
@ -57,7 +57,7 @@ index bd3e6c88f1ec..17467a507403 100644
}
diff --git third_party/blink/renderer/core/inspector/devtools_session.cc third_party/blink/renderer/core/inspector/devtools_session.cc
index e35e1920ecc7..5bc708d6b67a 100644
index 7286135e8f5d..55e17265a36d 100644
--- third_party/blink/renderer/core/inspector/devtools_session.cc
+++ third_party/blink/renderer/core/inspector/devtools_session.cc
@@ -8,6 +8,7 @@
@ -68,7 +68,7 @@ index e35e1920ecc7..5bc708d6b67a 100644
#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"
#include "third_party/blink/renderer/core/frame/local_frame.h"
#include "third_party/blink/renderer/core/inspector/devtools_agent.h"
@@ -140,6 +141,7 @@ DevToolsSession::DevToolsSession(
@@ -141,6 +142,7 @@ DevToolsSession::DevToolsSession(
for (wtf_size_t i = 0; i < agents_.size(); i++)
agents_[i]->Restore();
}
@ -76,19 +76,19 @@ index e35e1920ecc7..5bc708d6b67a 100644
}
DevToolsSession::~DevToolsSession() {
@@ -180,6 +182,7 @@ void DevToolsSession::Detach() {
@@ -181,6 +183,7 @@ void DevToolsSession::Detach() {
agents_.clear();
v8_session_.reset();
agent_->client_->DebuggerTaskFinished();
+ Platform::Current()->DevToolsAgentDetached();
}
void DevToolsSession::FlushProtocolNotifications() {
void DevToolsSession::DispatchProtocolCommand(
diff --git third_party/blink/renderer/core/page/page.cc third_party/blink/renderer/core/page/page.cc
index e25cee72e6d8..306b2b721a71 100644
index 50e76a0e0a63..e3e7dcaa5352 100644
--- third_party/blink/renderer/core/page/page.cc
+++ third_party/blink/renderer/core/page/page.cc
@@ -199,7 +199,8 @@ Page::Page(PageClients& page_clients)
@@ -194,7 +194,8 @@ Page::Page(PageClients& page_clients)
MakeGarbageCollected<OverscrollController>(GetVisualViewport(),
GetChromeClient())),
link_highlight_(MakeGarbageCollected<LinkHighlight>(*this)),
@ -98,7 +98,7 @@ index e25cee72e6d8..306b2b721a71 100644
// TODO(pdr): Initialize |validation_message_client_| lazily.
validation_message_client_(
MakeGarbageCollected<ValidationMessageClientImpl>(*this)),
@@ -380,21 +381,41 @@ void Page::InitialStyleChanged() {
@@ -379,21 +380,41 @@ void Page::InitialStyleChanged() {
}
}
@ -149,7 +149,7 @@ index e25cee72e6d8..306b2b721a71 100644
page->NotifyPluginsChanged();
}
}
@@ -895,7 +916,8 @@ void Page::Trace(Visitor* visitor) {
@@ -906,7 +927,8 @@ void Page::Trace(Visitor* visitor) {
visitor->Trace(link_highlight_);
visitor->Trace(spatial_navigation_controller_);
visitor->Trace(main_frame_);
@ -160,7 +160,7 @@ index e25cee72e6d8..306b2b721a71 100644
visitor->Trace(agent_metrics_collector_);
visitor->Trace(plugins_changed_observers_);
diff --git third_party/blink/renderer/core/page/page.h third_party/blink/renderer/core/page/page.h
index 442eb4c493d9..196017276cdb 100644
index 1074204dbfb6..e00ef8e7393a 100644
--- third_party/blink/renderer/core/page/page.h
+++ third_party/blink/renderer/core/page/page.h
@@ -144,7 +144,8 @@ class CORE_EXPORT Page final : public GarbageCollected<Page>,

14
patch/patches/webkit_popups.patch
View File

@ -1,5 +1,5 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index c2c079e51358..b719cf3d0edc 100644
index 406c19b10b2e..28d5336e5ab6 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -372,6 +372,7 @@ class WebView {
@ -11,7 +11,7 @@ index c2c079e51358..b719cf3d0edc 100644
// Cancels and hides the current popup (datetime, select...) if any.
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
index bcf5d6b07b26..d66e6df02d2d 100644
index 43fc2bb2de69..562952a05f0c 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -216,8 +216,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@ -39,10 +39,10 @@ index bcf5d6b07b26..d66e6df02d2d 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)),
receiver_(this,
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index ea6325cccfe6..c4fc56b44589 100644
index 60cfa746367a..3329a3f4a9b1 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -117,7 +117,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -118,7 +118,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
static HashSet<WebViewImpl*>& AllInstances();
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@ -52,7 +52,7 @@ index ea6325cccfe6..c4fc56b44589 100644
// Returns whether frames under this WebView are backed by a compositor.
bool does_composite() const { return does_composite_; }
@@ -618,6 +619,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -628,6 +629,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_ = 0.f;
bool fake_page_scale_animation_use_anchor_ = false;
@ -62,10 +62,10 @@ index ea6325cccfe6..c4fc56b44589 100644
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
index 8285be4622c9..08b3dd25b6f4 100644
index 1b430137301a..ee21b1e7bf17 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -859,7 +859,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
@@ -819,7 +819,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
HTMLSelectElement& select) {
NotifyPopupOpeningObservers();

33
patch/patches/webui_2037.patch
View File

@ -1,8 +1,16 @@
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 29953fdc7c55..fb03891ede32 100644
index 29953fdc7c55..89dd4e61f66f 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
@@ -28,6 +28,7 @@
@@ -21,6 +21,7 @@
#include "base/task/thread_pool.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
+#include "cef/libcef/features/features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings.h"
#include "chrome/browser/data_reduction_proxy/data_reduction_proxy_chrome_settings_factory.h"
@@ -28,6 +29,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/common/channel_info.h"
@ -10,18 +18,19 @@ index 29953fdc7c55..fb03891ede32 100644
#include "components/prefs/pref_service.h"
#include "components/sync/driver/about_sync_util.h"
#include "components/sync/driver/sync_service.h"
@@ -322,6 +323,10 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
}
@@ -274,7 +276,11 @@ void ChromeInternalLogSource::Fetch(SysLogsSourceCallback callback) {
response->emplace(kOsVersionTag, os_version);
#endif
void ChromeInternalLogSource::PopulateSyncLogs(SystemLogsResponse* response) {
+#if !BUILDFLAG(ENABLE_CEF)
+ // CEF should avoid loading ProfileSyncServiceFactory which depends on a lot
+ // of unnecessary Chrome-specific factories.
+ return;
+
// We are only interested in sync logs for the primary user profile.
Profile* profile = ProfileManager::GetPrimaryUserProfile();
if (!profile || !ProfileSyncServiceFactory::HasSyncService(profile))
@@ -364,6 +369,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
PopulateSyncLogs(response.get());
+#endif
PopulateExtensionInfoLogs(response.get());
PopulatePowerApiLogs(response.get());
PopulateDataReductionProxyLogs(response.get());
@@ -364,6 +370,12 @@ void ChromeInternalLogSource::PopulateExtensionInfoLogs(
if (!profile)
return;
@ -34,7 +43,7 @@ index 29953fdc7c55..fb03891ede32 100644
extensions::ExtensionRegistry* extension_registry =
extensions::ExtensionRegistry::Get(profile);
std::string extensions_list;
@@ -453,6 +464,8 @@ void ChromeInternalLogSource::PopulateArcPolicyStatus(
@@ -453,6 +465,8 @@ void ChromeInternalLogSource::PopulateArcPolicyStatus(
#if defined(OS_WIN)
void ChromeInternalLogSource::PopulateUsbKeyboardDetected(
SystemLogsResponse* response) {

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
index 007d476f22ce..106ddd21a532 100644
index 7cbbf4a059f1..2d0c85751076 100644
--- chrome/app/generated_resources.grd
+++ chrome/app/generated_resources.grd
@@ -4984,7 +4984,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
@@ -4970,7 +4970,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
</message>
</if>
<message name="IDS_PLUGIN_BLOCKED_BY_POLICY" desc="The placeholder text for a plugin blocked by enterprise policy.">

4
patch/patches/win_rt_2274.patch
View File

@ -1,8 +1,8 @@
diff --git services/service_manager/sandbox/win/sandbox_win.cc services/service_manager/sandbox/win/sandbox_win.cc
index 5eaed19bf922..78f31aeefe40 100644
index c369dde34758..1c2dea10764d 100644
--- services/service_manager/sandbox/win/sandbox_win.cc
+++ services/service_manager/sandbox/win/sandbox_win.cc
@@ -929,8 +929,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
@@ -939,8 +939,11 @@ sandbox::ResultCode SandboxWin::StartSandboxedProcess(
}
// TODO(wfh): Relax strict handle checks for network process until root cause
// for this crash can be resolved. See https://crbug.com/939590.