roll Chrome to 72.0.3626.52 and update patches

This commit is contained in:
Jeremy Apthorp 2019-01-08 15:59:47 -08:00
parent cd25ddeb06
commit 02e41b41b2
62 changed files with 353 additions and 794 deletions

2
DEPS
View file

@ -10,7 +10,7 @@ gclient_gn_args = [
vars = { vars = {
'chromium_version': 'chromium_version':
'71.0.3578.98', '72.0.3626.52',
'node_version': 'node_version':
'aeae08cda811ed122918bfd48fd9e56f8204d818', 'aeae08cda811ed122918bfd48fd9e56f8204d818',

View file

@ -2,7 +2,6 @@ add_realloc.patch
build_gn.patch build_gn.patch
dcheck.patch dcheck.patch
accelerator.patch accelerator.patch
app_indicator_icon_menu.patch
blink_file_path.patch blink_file_path.patch
blink_local_frame.patch blink_local_frame.patch
blink_world_context.patch blink_world_context.patch
@ -43,7 +42,6 @@ mas-cgdisplayusesforcetogray.patch
mas-audiodeviceduck.patch mas-audiodeviceduck.patch
mas-lssetapplicationlaunchservicesserverconnectionstatus.patch mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
allow_webview_file_url.patch allow_webview_file_url.patch
windows_cc_wrapper.patch
enable_osr_components.patch enable_osr_components.patch
ignore_rc_check.patch ignore_rc_check.patch
enable_widevine.patch enable_widevine.patch
@ -66,9 +64,7 @@ tts.patch
color_chooser.patch color_chooser.patch
printing.patch printing.patch
verbose_generate_breakpad_symbols.patch verbose_generate_breakpad_symbols.patch
customizable_app_indicator_id_prefix.patch
cross_site_document_resource_handler.patch cross_site_document_resource_handler.patch
content_allow_embedder_to_prevent_locking_scheme_registry.patch content_allow_embedder_to_prevent_locking_scheme_registry.patch
fix_trackpad_scrolling.patch
support_mixed_sandbox_with_zygote.patch support_mixed_sandbox_with_zygote.patch
disable_color_correct_rendering.patch disable_color_correct_rendering.patch

View file

@ -5,7 +5,7 @@ Subject: accelerator.patch
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index d56e87be04cb4d765d0aa0eae1af86a9f562b222..9364ac4b75debc61e201e0da7eaef104acea770d 100644 index bf214d0b04ea5cf6711cd50618ad843bd054e538..7f245b1e8b9b3c5dc6666be4d74b69c86e80a351 100644
--- a/ui/base/accelerators/accelerator.cc --- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc +++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -16,7 +16,7 @@ index d56e87be04cb4d765d0aa0eae1af86a9f562b222..9364ac4b75debc61e201e0da7eaef104
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
@@ -21,9 +22,7 @@ @@ -22,9 +23,7 @@
#include <windows.h> #include <windows.h>
#endif #endif
@ -26,7 +26,7 @@ index d56e87be04cb4d765d0aa0eae1af86a9f562b222..9364ac4b75debc61e201e0da7eaef104
namespace ui { namespace ui {
@@ -147,7 +146,15 @@ base::string16 Accelerator::GetShortcutText() const { @@ -148,7 +147,15 @@ base::string16 Accelerator::GetShortcutText() const {
shortcut = KeyCodeToName(key_code_); shortcut = KeyCodeToName(key_code_);
#endif #endif
@ -42,7 +42,7 @@ index d56e87be04cb4d765d0aa0eae1af86a9f562b222..9364ac4b75debc61e201e0da7eaef104
#if defined(OS_WIN) #if defined(OS_WIN)
// Our fallback is to try translate the key code to a regular character // Our fallback is to try translate the key code to a regular character
// unless it is one of digits (VK_0 to VK_9). Some keyboard // unless it is one of digits (VK_0 to VK_9). Some keyboard
@@ -156,18 +163,14 @@ base::string16 Accelerator::GetShortcutText() const { @@ -157,18 +164,14 @@ base::string16 Accelerator::GetShortcutText() const {
// accent' for '0'). For display in the menu (e.g. Ctrl-0 for the // accent' for '0'). For display in the menu (e.g. Ctrl-0 for the
// default zoom level), we leave VK_[0-9] alone without translation. // default zoom level), we leave VK_[0-9] alone without translation.
wchar_t key; wchar_t key;
@ -52,7 +52,7 @@ index d56e87be04cb4d765d0aa0eae1af86a9f562b222..9364ac4b75debc61e201e0da7eaef104
- else - else
- key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR)); - key = LOWORD(::MapVirtualKeyW(key_code_, MAPVK_VK_TO_CHAR));
- shortcut += key; - shortcut += key;
-#elif defined(USE_AURA) || defined(OS_MACOSX) -#elif defined(USE_AURA) || defined(OS_MACOSX) || defined(OS_ANDROID)
- const uint16_t c = DomCodeToUsLayoutCharacter( - const uint16_t c = DomCodeToUsLayoutCharacter(
- UsLayoutKeyboardCodeToDomCode(key_code_), false); - UsLayoutKeyboardCodeToDomCode(key_code_), false);
- if (c != 0) - if (c != 0)
@ -67,7 +67,7 @@ index d56e87be04cb4d765d0aa0eae1af86a9f562b222..9364ac4b75debc61e201e0da7eaef104
} }
// Checking whether the character used for the accelerator is alphanumeric. // Checking whether the character used for the accelerator is alphanumeric.
@@ -231,7 +234,7 @@ base::string16 Accelerator::ApplyLongFormModifiers( @@ -232,7 +235,7 @@ base::string16 Accelerator::ApplyLongFormModifiers(
// more information. // more information.
if (IsCtrlDown()) if (IsCtrlDown())
shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY); shortcut = ApplyModifierToAcceleratorString(shortcut, IDS_APP_CTRL_KEY);

View file

@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
GIN_EXPORT static ArrayBufferAllocator* SharedInstance(); GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index 5db87633802ccc7efbd6b673505cd5c00deabf6e..235be280c4d9e54bcc2e3f60fc10036ad3b08356 100644 index 0050eb07bf1f1e8515663dfd14f2a3a1292edd96..96e8702f7e9f2a04a4edbc794d5c45e3e04bf8fb 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -660,6 +660,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { @@ -662,6 +662,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize); size, WTF::ArrayBufferContents::kDontInitialize);
} }
@ -54,7 +54,7 @@ index 5db87633802ccc7efbd6b673505cd5c00deabf6e..235be280c4d9e54bcc2e3f60fc10036a
WTF::ArrayBufferContents::FreeMemory(data); WTF::ArrayBufferContents::FreeMemory(data);
} }
diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
index 127d6d39d5b089f3a91edc100be24b046c4da4fe..5ee94712c0fbf0a16eeca7aadd1a5be187bcf49e 100644 index 5a8dbf109f4f7eb682c23bf24c391b70a7717a0c..e0b33e815f2eb98aa494a8489543acdb873e1597 100644
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
@@ -122,6 +122,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size, @@ -122,6 +122,11 @@ void* ArrayBufferContents::AllocateMemoryOrNull(size_t size,
@ -70,7 +70,7 @@ index 127d6d39d5b089f3a91edc100be24b046c4da4fe..5ee94712c0fbf0a16eeca7aadd1a5be1
Partitions::ArrayBufferPartition()->Free(data); Partitions::ArrayBufferPartition()->Free(data);
} }
diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
index 19ae6eb4a08c3499674f906c53164fa9194e5cf2..2f75c4b46c361f411c41242c406358da974ff7e4 100644 index 3cc1abe8e48c8e45d1f3ebb98a6a6ea1a4e3fbd9..1e2438cc6da97a89fefc86148bb1037d3c84f765 100644
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h --- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h +++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
@@ -134,6 +134,7 @@ class WTF_EXPORT ArrayBufferContents { @@ -134,6 +134,7 @@ class WTF_EXPORT ArrayBufferContents {

View file

@ -6,10 +6,10 @@ Subject: allow_webview_file_url.patch
Allow webview to load non-web URLs. Allow webview to load non-web URLs.
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 8f33f39eb1d4bcae2e1d78890ee5e9e2d88b1e75..7645b12dbccf5a714e32c74c437216fdca9ac286 100644 index 83b81f3e28f5f4f3a9fe3c2146c50a966f7e2ec2..d0f2bde4f6f7bb1a8b6cfc5dc990cb30d4432504 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc --- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1480,6 +1480,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( @@ -1462,6 +1462,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
!policy->IsWebSafeScheme(info.common_params.url.scheme()) && !policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
!is_external_protocol; !is_external_protocol;

View file

@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@electronjs.org>
Date: Thu, 20 Sep 2018 17:44:52 -0700
Subject: app_indicator_icon_menu.patch
diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
index 40399a35f8d2c70827adec732c898a5be09cf69b..1d3a0da948dca3fef3af53256d23e8ae2bd23bfa 100644
--- a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
+++ b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
@@ -116,7 +116,7 @@ void AppIndicatorIconMenu::OnMenuItemActivated(GtkWidget* menu_item) {
return;
// The menu item can still be activated by hotkeys even if it is disabled.
- if (menu_model_->IsEnabledAt(id))
+ if (model->IsEnabledAt(id))
ExecuteCommand(model, id);
}

View file

@ -5,10 +5,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
index 4bc3d11ba0270bb4bba863724688ee5b6bc063d2..4f9accd65348b9c8f23f3e2d160e836c7841420b 100644 index c0cec745454d8e7ec0730852bb324bcae72ed42e..4550698d31ae2c1a511820ae88ce1d914fe10f7f 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -261,7 +261,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy( @@ -285,7 +285,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
// document (which is implemented in WorkerMessagingProxy, and // document (which is implemented in WorkerMessagingProxy, and
// m_contentSecurityPolicy should be left as nullptr to inherit the policy). // m_contentSecurityPolicy should be left as nullptr to inherit the policy).
if (!response.Url().ProtocolIs("blob") && if (!response.Url().ProtocolIs("blob") &&

View file

@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
documentation at https://electronjs.org/docs/api/file-object documentation at https://electronjs.org/docs/api/file-object
diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
index 39831f1902c6ab85a0a4cac61a614931ee050ed6..fddb013aa122049de7142bca624d7d0749b58372 100644 index 2ca09ab8903d56b466e186203279e865ed4dd058..d522b53111a1c452220a1ca08ffcc7206adaa309 100644
--- a/third_party/blink/renderer/core/fileapi/file.h --- a/third_party/blink/renderer/core/fileapi/file.h
+++ b/third_party/blink/renderer/core/fileapi/file.h +++ b/third_party/blink/renderer/core/fileapi/file.h
@@ -168,6 +168,9 @@ class CORE_EXPORT File final : public Blob { @@ -193,6 +193,9 @@ class CORE_EXPORT File final : public Blob {
} }
const String& name() const { return name_; } const String& name() const { return name_; }

View file

@ -11,7 +11,7 @@ In the long term we should investigate why it happened, and take a more
formal fix. But for now I'm just make this assertion silently pass away. formal fix. But for now I'm just make this assertion silently pass away.
diff --git a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc diff --git a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
index 87f2176ce897583b6682e8f49d1e4cac1392aacb..ce3d9ce19bff686640be08776a7dc5736e9bd83a 100644 index e1378ffcd7e061aae635ad25078ee23674542786..6b07828930a9d5691609da394c192b9b5f531b5a 100644
--- a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc --- a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
+++ b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc +++ b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
@@ -98,8 +98,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject( @@ -98,8 +98,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
@ -26,4 +26,4 @@ index 87f2176ce897583b6682e8f49d1e4cac1392aacb..ce3d9ce19bff686640be08776a7dc573
+ return v8::Local<v8::Function>(); + return v8::Local<v8::Function>();
prototype_object = prototype_value.As<v8::Object>(); prototype_object = prototype_value.As<v8::Object>();
if (prototype_object->InternalFieldCount() == }

View file

@ -10,7 +10,7 @@ to fix electron/electron#13787. The backport landed in Chromium 67 but the
DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
index e148eda29606cdf8856c6875dc8e370f29e90f8a..c7289e9c60fc75d0db0d3671d7dd4b428bd80329 100644 index b43ca24b2595bbd20fb5cfa68a22ebec87acda33..496e5d16d49977cb2107a7101064093be19b1515 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc --- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc +++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -177,11 +177,10 @@ void LocalWindowProxy::Initialize() { @@ -177,11 +177,10 @@ void LocalWindowProxy::Initialize() {
@ -23,6 +23,6 @@ index e148eda29606cdf8856c6875dc8e370f29e90f8a..c7289e9c60fc75d0db0d3671d7dd4b42
- InstallConditionalFeatures(); - InstallConditionalFeatures();
- -
if (World().IsMainWorld()) { // This needs to go after everything else since it accesses the window object.
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld(); InitializeV8ExtrasBinding(script_state_);
}

View file

@ -14,10 +14,10 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron. This patch reverts the change to fix the crash in Electron.
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 19862e24a7f5aa9ae85a7731803aaedd56109354..9cd8833ae9b40a2bf9a875fb357459e858f2b180 100644 index 72df3508f9ea9219d3ca3aa716afcad01b378f7e..a7b8051311ef259c3297925c2f5050372ec3ac5b 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -394,10 +394,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { @@ -399,10 +399,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
} }
CHECK(!view_ || !view_->IsAttached()); CHECK(!view_ || !view_->IsAttached());
@ -28,7 +28,7 @@ index 19862e24a7f5aa9ae85a7731803aaedd56109354..9cd8833ae9b40a2bf9a875fb357459e8
if (!Client()) if (!Client())
return; return;
@@ -415,6 +411,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) { @@ -420,6 +416,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
// Notify ScriptController that the frame is closing, since its cleanup ends // Notify ScriptController that the frame is closing, since its cleanup ends
// up calling back to LocalFrameClient via WindowProxy. // up calling back to LocalFrameClient via WindowProxy.
GetScriptController().ClearForClose(); GetScriptController().ClearForClose();

View file

@ -5,10 +5,10 @@ Subject: blink_world_context.patch
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 68b3ae21865f7c23072e2783e6c474cd0d96b806..6318eb4bac9ac38185f3192c73489966d6918a9b 100644 index 4b680e1b99ee3dbbb8ed74d281ed1768b7b9a87a..4135cd54ddfd2295534515ca5c99eb58471d56ff 100644
--- a/third_party/blink/public/web/web_local_frame.h --- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h +++ b/third_party/blink/public/web/web_local_frame.h
@@ -441,6 +441,9 @@ class WebLocalFrame : public WebFrame { @@ -353,6 +353,9 @@ class WebLocalFrame : public WebFrame {
// be calling this API. // be calling this API.
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0; virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
@ -19,10 +19,10 @@ index 68b3ae21865f7c23072e2783e6c474cd0d96b806..6318eb4bac9ac38185f3192c73489966
// that the script evaluated to with callback. Script execution can be // that the script evaluated to with callback. Script execution can be
// suspend. // suspend.
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index a7c0e79100e18fe02469a8453c84713ee68d5019..2f71ed674e4cb41e42b320e7bb0373dfb01df519 100644 index 6f286a3e4007b60479f0279ef24afa3397112962..31ffedb206ae8315a7c19c4e0b091aa119bfe58b 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -891,6 +891,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const { @@ -895,6 +895,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global(); return MainWorldScriptContext()->Global();
} }
@ -37,10 +37,10 @@ index a7c0e79100e18fe02469a8453c84713ee68d5019..2f71ed674e4cb41e42b320e7bb0373df
return BindingSecurity::ShouldAllowAccessToFrame( return BindingSecurity::ShouldAllowAccessToFrame(
CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()), CurrentDOMWindow(V8PerIsolateData::MainThreadIsolate()),
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.h b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
index e857ff94ca93d44b67b2b850516fc6a93ac344e4..69ad8c4e747ac1ee311135371d932cf0b15b377c 100644 index 3f046d8c62324b70a89e37e23c4b15bb0b8e6e7a..18c14a90c18cb349fca4c64692bb899b2c1a7622 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -148,6 +148,8 @@ class CORE_EXPORT WebLocalFrameImpl final @@ -149,6 +149,8 @@ class CORE_EXPORT WebLocalFrameImpl final
int argc, int argc,
v8::Local<v8::Value> argv[]) override; v8::Local<v8::Value> argv[]) override;
v8::Local<v8::Context> MainWorldScriptContext() const override; v8::Local<v8::Context> MainWorldScriptContext() const override;

View file

@ -7,10 +7,10 @@ Build BoringSSL with some extra functions that nodejs needs. Only affects
the GN build; with the GYP build, nodejs is still built with OpenSSL. the GN build; with the GYP build, nodejs is still built with OpenSSL.
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index f57824f04d044b7180c0fc41df616a22174fe367..37735a7c2cad0a75aa609bac4e855cc564a7b2eb 100644 index 6e4fc85f124ed6dd4a7ac1812686fa59c4e50cdf..2fbd44c0ac71bbd84706ef50dd0d98b2466d4295 100644
--- a/third_party/boringssl/BUILD.gn --- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn
@@ -46,6 +46,13 @@ config("no_asm_config") { @@ -45,6 +45,13 @@ config("no_asm_config") {
all_sources = crypto_sources + ssl_sources all_sources = crypto_sources + ssl_sources
all_headers = crypto_headers + ssl_headers all_headers = crypto_headers + ssl_headers
@ -22,5 +22,5 @@ index f57824f04d044b7180c0fc41df616a22174fe367..37735a7c2cad0a75aa609bac4e855cc5
+ ] + ]
+} +}
# Windows' assembly is built with Yasm. The other platforms use the platform # Windows' assembly is built with NASM. The other platforms use the platform
# assembler. # assembler. Exclude Windows ARM64 because NASM targets x86 and x64 only.

View file

@ -5,7 +5,7 @@ Subject: browser_compositor_mac.patch
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h
index 71a9e1024b6055b1b1cc1e51d898a030e7f72111..479110fef40183c0d5d301686c1e8ae754317b29 100644 index da7e3391774e14550f7adf5956ca44b8b880662e..8b399558ad2469f6452e1793e8834d5c4f93adeb 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.h --- a/content/browser/renderer_host/browser_compositor_view_mac.h
+++ b/content/browser/renderer_host/browser_compositor_view_mac.h +++ b/content/browser/renderer_host/browser_compositor_view_mac.h
@@ -60,6 +60,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, @@ -60,6 +60,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
@ -14,10 +14,10 @@ index 71a9e1024b6055b1b1cc1e51d898a030e7f72111..479110fef40183c0d5d301686c1e8ae7
+ ui::Layer* GetRootLayer() { return root_layer_.get(); } + ui::Layer* GetRootLayer() { return root_layer_.get(); }
+ +
// Ensure that the currect compositor frame be cleared (even if it is // Force a new surface id to be allocated. Returns true if the
// potentially visible). // RenderWidgetHostImpl sent the resulting surface id to the renderer.
void ClearCompositorFrame(); bool ForceNewSurfaceId();
@@ -70,6 +72,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient, @@ -68,6 +70,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
// no valid frame is available. // no valid frame is available.
const gfx::CALayerParams* GetLastCALayerParams() const; const gfx::CALayerParams* GetLastCALayerParams() const;
@ -26,10 +26,10 @@ index 71a9e1024b6055b1b1cc1e51d898a030e7f72111..479110fef40183c0d5d301686c1e8ae7
viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink); viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
void OnDidNotProduceFrame(const viz::BeginFrameAck& ack); void OnDidNotProduceFrame(const viz::BeginFrameAck& ack);
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index 65670cccb50312a7cf0895ae39db01bc19d42d3d..235303a210fadd7ecfa7d1878df9fc93f2655b38 100644 index 21d3b34cc13f3471dcef456ec92ad7c1c4a012f4..cffbf04e781cff2d10283c7ef2093959f25e432b 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm --- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm +++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -79,6 +79,12 @@ @@ -79,6 +79,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
DCHECK_EQ(1u, num_erased); DCHECK_EQ(1u, num_erased);
} }

View file

@ -5,7 +5,7 @@ Subject: build_gn.patch
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 387fdb2795a832ba8ee1187f3097f736c69e9839..590d457928ced573a7152a129bbfcf01309ee3c1 100644 index f33cba178d7710b1ad624fcd1b649b370bb401a4..15ac71c3fddc63121f6959e69eb1ac8e9c15310d 100644
--- a/build/config/BUILDCONFIG.gn --- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") { @@ -123,6 +123,9 @@ if (current_os == "") {
@ -18,7 +18,7 @@ index 387fdb2795a832ba8ee1187f3097f736c69e9839..590d457928ced573a7152a129bbfcf01
# Set to enable the official build level of optimization. This has nothing # Set to enable the official build level of optimization. This has nothing
# to do with branding, but enables an additional level of optimization above # to do with branding, but enables an additional level of optimization above
# release (!is_debug). This might be better expressed as a tri-state # release (!is_debug). This might be better expressed as a tri-state
@@ -536,6 +539,7 @@ default_compiler_configs = [ @@ -537,6 +540,7 @@ default_compiler_configs = [
"//build/config/compiler:thin_archive", "//build/config/compiler:thin_archive",
"//build/config/coverage:default_coverage", "//build/config/coverage:default_coverage",
"//build/config/sanitizers:default_sanitizer_flags", "//build/config/sanitizers:default_sanitizer_flags",

View file

@ -5,10 +5,10 @@ Subject: can_create_window.patch
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a17ae7ca0c070aeb1e741f3db80f3bc71f36308d..86560af1b9e3861dbe4455403cf3af0f183fd6c7 100644 index e738789b56a39c8d1247c3916336c5fd2ff59446..a75b38add55b5c35c6480606b2ed856190d44413 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc --- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3333,6 +3333,38 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -3517,6 +3517,38 @@ void RenderFrameHostImpl::CreateNewWindow(
"frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url", "frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
params->target_url.possibly_invalid_spec()); params->target_url.possibly_invalid_spec());
@ -47,19 +47,19 @@ index a17ae7ca0c070aeb1e741f3db80f3bc71f36308d..86560af1b9e3861dbe4455403cf3af0f
bool no_javascript_access = false; bool no_javascript_access = false;
// Filter out URLs to which navigation is disallowed from this context. // Filter out URLs to which navigation is disallowed from this context.
@@ -3361,6 +3393,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -3545,6 +3577,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_.GetURL(), params->window_container_type, last_committed_origin_.GetURL(), params->window_container_type,
params->target_url, params->referrer, params->frame_name, params->target_url, params->referrer.To<Referrer>(),
params->disposition, *params->features, params->frame_name, params->disposition, *params->features,
+ params->additional_features, body, + params->additional_features, body,
effective_transient_activation_state, params->opener_suppressed, effective_transient_activation_state, params->opener_suppressed,
&no_javascript_access); &no_javascript_access);
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
index 82af60872317fdaf16561c9f9adecb79ce82f610..bf72f1adf22e71ebcae50dd9fb1b88e8178a7767 100644 index b72385bcebf35f16ad913e1f2a824653503bc483..6bfa8c215fd221031902ab63a38eef7234502352 100644
--- a/content/browser/security_exploit_browsertest.cc --- a/content/browser/security_exploit_browsertest.cc
+++ b/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc
@@ -357,6 +357,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, @@ -387,6 +387,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New(); mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New();
params->target_url = GURL("about:blank"); params->target_url = GURL("about:blank");
@ -68,7 +68,7 @@ index 82af60872317fdaf16561c9f9adecb79ce82f610..bf72f1adf22e71ebcae50dd9fb1b88e8
std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus, std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus,
mojom::CreateNewWindowReplyPtr) {})); mojom::CreateNewWindowReplyPtr) {}));
diff --git a/content/common/frame.mojom b/content/common/frame.mojom diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 25346dc852e799a2562386a6207d2de31077695f..908a8676daeb753c1580f98e8babf203cfa5b719 100644 index a9cd1241fdcfbd40bb2944193328b15929bd5f14..5207347bc8292b04a4452df5fe66984fb8d4cd7f 100644
--- a/content/common/frame.mojom --- a/content/common/frame.mojom
+++ b/content/common/frame.mojom +++ b/content/common/frame.mojom
@@ -12,6 +12,8 @@ import "content/public/common/resource_type.mojom"; @@ -12,6 +12,8 @@ import "content/public/common/resource_type.mojom";
@ -117,10 +117,10 @@ index 25346dc852e799a2562386a6207d2de31077695f..908a8676daeb753c1580f98e8babf203
// Operation result when the renderer asks the browser to create a new window. // Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 6ed69effde7e7b269191788bedd4f98e3d778d67..abfb6afec00a691ea2ff27e7797921e3eb25d8ea 100644 index 9029d6576bc13a49ac2b6781d12e7641b7d4178b..543e9d90098e65286482b82a98a116d3224925a9 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -460,6 +460,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -494,6 +494,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features, const blink::mojom::WindowFeatures& features,
@ -130,10 +130,10 @@ index 6ed69effde7e7b269191788bedd4f98e3d778d67..abfb6afec00a691ea2ff27e7797921e3
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access) { bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index b33545b865e4677ee2e9a909d259df171c12d985..eb2f9a8f240f8805e4bcbde0465ec445dd7539e7 100644 index ff83421f2bb8268ccc32d95ed9d2b4e7715c8d7b..6962a00811a20a8dd78ee3688fac31a87500b4dc 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -169,6 +169,7 @@ class RenderFrameHost; @@ -170,6 +170,7 @@ class RenderFrameHost;
class RenderProcessHost; class RenderProcessHost;
class RenderViewHost; class RenderViewHost;
class ResourceContext; class ResourceContext;
@ -141,7 +141,7 @@ index b33545b865e4677ee2e9a909d259df171c12d985..eb2f9a8f240f8805e4bcbde0465ec445
class ServiceManagerConnection; class ServiceManagerConnection;
class SiteInstance; class SiteInstance;
class SpeechRecognitionManagerDelegate; class SpeechRecognitionManagerDelegate;
@@ -757,6 +758,8 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -781,6 +782,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features, const blink::mojom::WindowFeatures& features,
@ -151,10 +151,10 @@ index b33545b865e4677ee2e9a909d259df171c12d985..eb2f9a8f240f8805e4bcbde0465ec445
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access); bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index bc72fadb307f801d9f1b6c90189596c36d7203e7..a95a89178cf80dc1f6efb15e0ea7ce92d1fd26ed 100644 index 7bf71ed5baaf391b96d8cfff2a5a3e4929cd3a07..92469c3007c2108756e685e7897b7c8c4a49c00f 100644
--- a/content/renderer/render_view_impl.cc --- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc
@@ -76,6 +76,7 @@ @@ -77,6 +77,7 @@
#include "content/renderer/ime_event_guard.h" #include "content/renderer/ime_event_guard.h"
#include "content/renderer/internal_document_state_data.h" #include "content/renderer/internal_document_state_data.h"
#include "content/renderer/loader/request_extra_data.h" #include "content/renderer/loader/request_extra_data.h"
@ -162,7 +162,7 @@ index bc72fadb307f801d9f1b6c90189596c36d7203e7..a95a89178cf80dc1f6efb15e0ea7ce92
#include "content/renderer/media/audio/audio_device_factory.h" #include "content/renderer/media/audio/audio_device_factory.h"
#include "content/renderer/media/stream/media_stream_device_observer.h" #include "content/renderer/media/stream/media_stream_device_observer.h"
#include "content/renderer/media/video_capture_impl_manager.h" #include "content/renderer/media/video_capture_impl_manager.h"
@@ -1379,6 +1380,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator, @@ -1345,6 +1346,46 @@ WebView* RenderViewImpl::CreateView(
} }
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features); params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
@ -210,10 +210,10 @@ index bc72fadb307f801d9f1b6c90189596c36d7203e7..a95a89178cf80dc1f6efb15e0ea7ce92
// moved on send. // moved on send.
bool is_background_tab = bool is_background_tab =
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
index 1c7ae733b09ed16183d9772c1954f6f190866d26..c7e4faf01f5f2d4dc110588c16bb67417c51bbf9 100644 index 393a34c290fc9ec5a56b685f5ba704132c8610f1..95498ec705ae3ea96efd387559f20585d1cae9f2 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc --- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -282,6 +282,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow( @@ -299,6 +299,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features, const blink::mojom::WindowFeatures& features,
@ -223,10 +223,10 @@ index 1c7ae733b09ed16183d9772c1954f6f190866d26..c7e4faf01f5f2d4dc110588c16bb6741
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access) { bool* no_javascript_access) {
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.h b/content/shell/browser/layout_test/layout_test_content_browser_client.h
index 76d53623ff698bec66dba4342e9384685ffb753e..d8b8e17dc22b96f083336cd3dcd888f89173eea1 100644 index b416ba6d27d3ad118440bc92ffe95ddd362f6ccf..81271680f73fa3606f672b9e6069c9f74ffbef44 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.h --- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h +++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
@@ -66,6 +66,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient { @@ -67,6 +67,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features, const blink::mojom::WindowFeatures& features,

View file

@ -7,7 +7,7 @@ Disable persiste licence support check for widevine cdm,
as its not supported in the current version of chrome. as its not supported in the current version of chrome.
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index bcf7d3a812ef8d105d6ffb5bc72432e15a98f10c..5d63d3824e53ec5b704b93b95e70ea1d5e5627b1 100644 index 0ef05eceaa0e42710c6cfa8acb2174cf930f6114..e0356f615f8bae10b5030f038057be027491f96c 100644
--- a/chrome/renderer/media/chrome_key_systems.cc --- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc +++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -15,7 +15,9 @@ @@ -15,7 +15,9 @@
@ -20,7 +20,7 @@ index bcf7d3a812ef8d105d6ffb5bc72432e15a98f10c..5d63d3824e53ec5b704b93b95e70ea1d
#include "components/cdm/renderer/external_clear_key_key_system_properties.h" #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
#include "components/cdm/renderer/widevine_key_system_properties.h" #include "components/cdm/renderer/widevine_key_system_properties.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
@@ -189,12 +191,14 @@ static SupportedCodecs GetSupportedCodecs( @@ -194,12 +196,14 @@ static SupportedCodecs GetSupportedCodecs(
// Returns persistent-license session support. // Returns persistent-license session support.
static EmeSessionTypeSupport GetPersistentLicenseSupport( static EmeSessionTypeSupport GetPersistentLicenseSupport(
bool supported_by_the_cdm) { bool supported_by_the_cdm) {

View file

@ -15,7 +15,7 @@ code was around 2012-2013, and this is purely UI, I don't think they have
automated tests for it). automated tests for it).
diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h diff --git a/chrome/browser/ui/browser_dialogs.h b/chrome/browser/ui/browser_dialogs.h
index f68bd5a7bf50eea701410779ed982db045f652a7..1c31eca5aaed470960e64f760c4328c0c155310f 100644 index 415ca1dcaf946fc576ddad660ea507981fd81458..2a5352b358a8f337e61af1143fe0a84628985eab 100644
--- a/chrome/browser/ui/browser_dialogs.h --- a/chrome/browser/ui/browser_dialogs.h
+++ b/chrome/browser/ui/browser_dialogs.h +++ b/chrome/browser/ui/browser_dialogs.h
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
@ -57,7 +57,7 @@ index f68bd5a7bf50eea701410779ed982db045f652a7..1c31eca5aaed470960e64f760c4328c0
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
// Bridging methods that show/hide the toolkit-views based Task Manager on Mac. // Bridging methods that show/hide the toolkit-views based Task Manager on Mac.
@@ -311,13 +313,13 @@ void ShowChromeCleanerRebootPrompt( @@ -313,13 +315,13 @@ void ShowChromeCleanerRebootPrompt(
safe_browsing::ChromeCleanerRebootDialogController* dialog_controller); safe_browsing::ChromeCleanerRebootDialogController* dialog_controller);
#endif // OS_WIN #endif // OS_WIN

View file

@ -18,7 +18,7 @@ diff --git a/chrome/browser/extensions/global_shortcut_listener_mac.mm b/chrome/
index f612ba2fb7952654663cbce596c43b0b65d5ea29..77c2c68e6f9bfec3fc887e2119243cee1321cd17 100644 index f612ba2fb7952654663cbce596c43b0b65d5ea29..77c2c68e6f9bfec3fc887e2119243cee1321cd17 100644
--- a/chrome/browser/extensions/global_shortcut_listener_mac.mm --- a/chrome/browser/extensions/global_shortcut_listener_mac.mm
+++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm +++ b/chrome/browser/extensions/global_shortcut_listener_mac.mm
@@ -20,6 +20,26 @@ @@ -20,6 +20,26 @@ using extensions::GlobalShortcutListenerMac;
namespace extensions { namespace extensions {
@ -92,7 +92,7 @@ diff --git a/ui/base/accelerators/media_keys_listener_mac.mm b/ui/base/accelerat
index cd595b0c017d6e36a5d94f7c99fe0a098a52b067..941c1a76a1c3ebe542aebcc9dc301d19bab47057 100644 index cd595b0c017d6e36a5d94f7c99fe0a098a52b067..941c1a76a1c3ebe542aebcc9dc301d19bab47057 100644
--- a/ui/base/accelerators/media_keys_listener_mac.mm --- a/ui/base/accelerators/media_keys_listener_mac.mm
+++ b/ui/base/accelerators/media_keys_listener_mac.mm +++ b/ui/base/accelerators/media_keys_listener_mac.mm
@@ -30,6 +30,12 @@ @@ -30,6 +30,12 @@ ui::KeyboardCode MediaKeyCodeToKeyboardCode(int key_code) {
case NX_KEYTYPE_NEXT: case NX_KEYTYPE_NEXT:
case NX_KEYTYPE_FAST: case NX_KEYTYPE_FAST:
return ui::VKEY_MEDIA_NEXT_TRACK; return ui::VKEY_MEDIA_NEXT_TRACK;
@ -105,7 +105,7 @@ index cd595b0c017d6e36a5d94f7c99fe0a098a52b067..941c1a76a1c3ebe542aebcc9dc301d19
} }
return ui::VKEY_UNKNOWN; return ui::VKEY_UNKNOWN;
} }
@@ -180,7 +186,10 @@ static CGEventRef EventTapCallback(CGEventTapProxy proxy, @@ -180,7 +186,10 @@ CGEventRef MediaKeysListenerImpl::EventTapCallback(CGEventTapProxy proxy,
int key_code = (data1 & 0xFFFF0000) >> 16; int key_code = (data1 & 0xFFFF0000) >> 16;
if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT && if (key_code != NX_KEYTYPE_PLAY && key_code != NX_KEYTYPE_NEXT &&
key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST && key_code != NX_KEYTYPE_PREVIOUS && key_code != NX_KEYTYPE_FAST &&

View file

@ -5,10 +5,10 @@ Subject: compositor_delegate.patch
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index e8741caf69a8d3770905dcf1d466e7f01ddf69ba..b62009feb2e97362d90c6c917305f91cae27d790 100644 index 97d3236bed1726170966683f5b7dec7540b0603e..bc20368abe66b954dc292e8e2521de42349d6a57 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc --- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc +++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -492,10 +492,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( @@ -482,10 +482,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
// surfaces as they are not following the correct mode. // surfaces as they are not following the correct mode.
DisableGpuCompositing(compositor.get()); DisableGpuCompositing(compositor.get());
} }
@ -32,7 +32,7 @@ index e8741caf69a8d3770905dcf1d466e7f01ddf69ba..b62009feb2e97362d90c6c917305f91c
} else { } else {
DCHECK(context_provider); DCHECK(context_provider);
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index b3905bdfa6500f02328552b7c2402797a71758be..490722c20c25f752e37ac3b481f8d2aa616408a4 100644 index 6f46fd5b4b57139da6855af99c2788a926c5ef25..4237c75c37ca4476e9fad25765629f7a14df042b 100644
--- a/ui/compositor/compositor.h --- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h +++ b/ui/compositor/compositor.h
@@ -26,6 +26,7 @@ @@ -26,6 +26,7 @@
@ -43,7 +43,7 @@ index b3905bdfa6500f02328552b7c2402797a71758be..490722c20c25f752e37ac3b481f8d2aa
#include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkMatrix44.h" #include "third_party/skia/include/core/SkMatrix44.h"
#include "ui/compositor/compositor_animation_observer.h" #include "ui/compositor/compositor_animation_observer.h"
@@ -198,6 +199,15 @@ class COMPOSITOR_EXPORT ContextFactory { @@ -194,6 +195,15 @@ class COMPOSITOR_EXPORT ContextFactory {
virtual bool SyncTokensRequiredForDisplayCompositor() = 0; virtual bool SyncTokensRequiredForDisplayCompositor() = 0;
}; };
@ -59,7 +59,7 @@ index b3905bdfa6500f02328552b7c2402797a71758be..490722c20c25f752e37ac3b481f8d2aa
// Compositor object to take care of GPU painting. // Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final // A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an // displayable form of pixels comprising a single widget's contents. It draws an
@@ -237,6 +247,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient, @@ -235,6 +245,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
// Schedules a redraw of the layer tree associated with this compositor. // Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw(); void ScheduleDraw();

View file

@ -12,10 +12,10 @@ Without this patch, calling `registerStandardSchemes` during initialization
when in debug mode will cause a DCHECK to fire. when in debug mode will cause a DCHECK to fire.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 6ed770290b1f18791c1a38a0e8e4dc0f670c29cf..37668b3e74c4031417c5ff91376a20aa56e15c07 100644 index 88565a9019f378021c2b6251a4fada275d6062b1..8bedc05fe860f40e5f531f83fc5cc5c7812b9532 100644
--- a/content/app/content_main_runner_impl.cc --- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc
@@ -739,7 +739,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) { @@ -747,7 +747,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
#endif #endif
RegisterPathProvider(); RegisterPathProvider();
@ -25,11 +25,11 @@ index 6ed770290b1f18791c1a38a0e8e4dc0f670c29cf..37668b3e74c4031417c5ff91376a20aa
#if defined(OS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE) #if defined(OS_ANDROID) && (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE)
int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor); int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor);
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index cf3c71fe0edc7fd9b788e5ca06cedcd5f9dfa369..877642228966170f3c6bbf4faf80af66bbac387e 100644 index 456df421598153bde006ad0ecb0f1031360bb543..af06d78b91fa30e5daf993ad2c65c2c5e35a17a5 100644
--- a/content/public/app/content_main_delegate.cc --- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc +++ b/content/public/app/content_main_delegate.cc
@@ -59,6 +59,10 @@ bool ContentMainDelegate::ShouldEnableProfilerRecording() { @@ -55,6 +55,10 @@ int ContentMainDelegate::TerminateForFatalInitializationError() {
return false; return 0;
} }
+bool ContentMainDelegate::ShouldLockSchemeRegistry() { +bool ContentMainDelegate::ShouldLockSchemeRegistry() {
@ -40,12 +40,12 @@ index cf3c71fe0edc7fd9b788e5ca06cedcd5f9dfa369..877642228966170f3c6bbf4faf80af66
return service_manager::ProcessType::kDefault; return service_manager::ProcessType::kDefault;
} }
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
index d55f5050c8c3cb15c549dd3ae90d00f1455d34c8..f00266ce4f93bea585f191512226cc40e1f46545 100644 index f836a17fa0568aa33e204725f96233aac236aac5..af1d5ef18fb414a681bee48d36c3f94ed789c077 100644
--- a/content/public/app/content_main_delegate.h --- a/content/public/app/content_main_delegate.h
+++ b/content/public/app/content_main_delegate.h +++ b/content/public/app/content_main_delegate.h
@@ -93,6 +93,9 @@ class CONTENT_EXPORT ContentMainDelegate { @@ -88,6 +88,9 @@ class CONTENT_EXPORT ContentMainDelegate {
// Returns whether or not profiler recording should be enabled. virtual void ZygoteForked() {}
virtual bool ShouldEnableProfilerRecording(); #endif // defined(OS_LINUX)
+ // Allows the embedder to prevent locking the scheme registry. + // Allows the embedder to prevent locking the scheme registry.
+ virtual bool ShouldLockSchemeRegistry(); + virtual bool ShouldLockSchemeRegistry();

View file

@ -8,10 +8,10 @@ run before shutdown. This is required to cleanup WebContents asynchronously
in atom::CommonWebContentsDelegate::ResetManageWebContents. in atom::CommonWebContentsDelegate::ResetManageWebContents.
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 20471ef5ccae66fb8c09eb4da25a67304d7626c2..bcaf20bdf3cf78d6ffb3eacb57653f5139ebf41d 100644 index bce899c644484962d22b129f56f8fc3cbcb9f3b3..68867c51bed182fae0510e0b92d4cb715956135b 100644
--- a/content/browser/browser_main_loop.cc --- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc
@@ -1527,7 +1527,7 @@ void BrowserMainLoop::MainMessageLoopRun() { @@ -1526,7 +1526,7 @@ void BrowserMainLoop::MainMessageLoopRun() {
} }
base::RunLoop run_loop; base::RunLoop run_loop;

View file

@ -22,10 +22,10 @@ index be1724e19eeb0186dc20dad48e0d604ff87918e5..3dea6a89eb12dc6be157c39787358cd8
} }
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index ae4bfc6553f347ad5a7e5327d64155e700e6584e..e279ded9407bbfda6d76072cd6fa2c8a06379e9f 100644 index f564df8841d1eaea29d4f09c679263ec97552e3b..809e140c4f6004aa95997df6fb6b76e2f8e23f95 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -59,6 +59,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should @@ -58,6 +58,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should
return SiteInstanceForNavigationType::ASK_CHROMIUM; return SiteInstanceForNavigationType::ASK_CHROMIUM;
} }
@ -37,10 +37,10 @@ index ae4bfc6553f347ad5a7e5327d64155e700e6584e..e279ded9407bbfda6d76072cd6fa2c8a
const MainFunctionParams& parameters) { const MainFunctionParams& parameters) {
return nullptr; return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 5f6fdb2d66acfa73c895cac18714d0998eed2ab2..836851cfcbc94becdf3d4af682dbe3e098172c25 100644 index af64896d0567870672bf4e2f45f7d76e1df68844..4ce6d14bd654e967e8cd5de43157167b98c162fc 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -233,6 +233,9 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -235,6 +235,9 @@ class CONTENT_EXPORT ContentBrowserClient {
content::RenderFrameHost* rfh, content::RenderFrameHost* rfh,
content::SiteInstance* pending_site_instance){}; content::SiteInstance* pending_site_instance){};

View file

@ -1,113 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <jeremya@chromium.org>
Date: Mon, 5 Nov 2018 20:13:27 +0000
Subject: backport from M72: Make gtk app indicator id prefix customizable
This makes the app indicator API in libgtkui usable by non-Chrome apps (in
particular, Electron).
Change-Id: I39e547fc04595900d99806208955c632e4199be4
Reviewed-on: https://chromium-review.googlesource.com/c/1315840
Commit-Queue: Jeremy Apthorp <jeremya@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605435}
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.cc b/chrome/browser/ui/libgtkui/gtk_ui.cc
index 3a829df4099f5223d0862c33a6ffc61b107b20b7..3b86e178d4c83f07231649360c8b65ca83143408 100644
--- a/chrome/browser/ui/libgtkui/gtk_ui.cc
+++ b/chrome/browser/ui/libgtkui/gtk_ui.cc
@@ -234,11 +234,6 @@ typedef std::unique_ptr<GIcon, GObjectDeleter> ScopedGIcon;
typedef std::unique_ptr<GtkIconInfo, GtkIconInfoDeleter> ScopedGtkIconInfo;
typedef std::unique_ptr<GdkPixbuf, GObjectDeleter> ScopedGdkPixbuf;
-#if !GTK_CHECK_VERSION(3, 90, 0)
-// Prefix for app indicator ids
-const char kAppIndicatorIdPrefix[] = "chrome_app_indicator_";
-#endif
-
// Number of app indicators used (used as part of app-indicator id).
int indicators_count;
@@ -545,7 +540,8 @@ bool GtkUi::IsStatusIconSupported() const {
std::unique_ptr<views::StatusIconLinux> GtkUi::CreateLinuxStatusIcon(
const gfx::ImageSkia& image,
- const base::string16& tool_tip) const {
+ const base::string16& tool_tip,
+ const char* id_prefix) const {
#if GTK_CHECK_VERSION(3, 90, 0)
NOTIMPLEMENTED();
return nullptr;
@@ -553,8 +549,8 @@ std::unique_ptr<views::StatusIconLinux> GtkUi::CreateLinuxStatusIcon(
if (AppIndicatorIcon::CouldOpen()) {
++indicators_count;
return std::unique_ptr<views::StatusIconLinux>(new AppIndicatorIcon(
- base::StringPrintf("%s%d", kAppIndicatorIdPrefix, indicators_count),
- image, tool_tip));
+ base::StringPrintf("%s%d", id_prefix, indicators_count), image,
+ tool_tip));
} else {
return std::unique_ptr<views::StatusIconLinux>(
new GtkStatusIcon(image, tool_tip));
diff --git a/chrome/browser/ui/libgtkui/gtk_ui.h b/chrome/browser/ui/libgtkui/gtk_ui.h
index 1c626d1cafd1ec979be8dd5ef6ddbbc9d1b29bc2..2c98c1990419eb5276c01553caad559cf60714ad 100644
--- a/chrome/browser/ui/libgtkui/gtk_ui.h
+++ b/chrome/browser/ui/libgtkui/gtk_ui.h
@@ -90,7 +90,8 @@ class GtkUi : public views::LinuxUI {
bool IsStatusIconSupported() const override;
std::unique_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
const gfx::ImageSkia& image,
- const base::string16& tool_tip) const override;
+ const base::string16& tool_tip,
+ const char* id_prefix) const override;
gfx::Image GetIconForContentType(const std::string& content_type,
int size) const override;
std::unique_ptr<views::Border> CreateNativeBorder(
diff --git a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
index eed6bb2eaf756189be016c382673e23eb7ca18e0..4694a9a920b1f9150399e183038f04ac700b4f52 100644
--- a/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
+++ b/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc
@@ -8,6 +8,13 @@
#include "ui/message_center/public/cpp/notifier_id.h"
#include "ui/views/linux_ui/linux_ui.h"
+namespace {
+
+// Prefix for app indicator ids
+const char kAppIndicatorIdPrefix[] = "chrome_app_indicator_";
+
+} // namespace
+
StatusIconLinuxWrapper::StatusIconLinuxWrapper(
std::unique_ptr<views::StatusIconLinux> status_icon)
: status_icon_(std::move(status_icon)), menu_model_(nullptr) {
@@ -53,7 +60,8 @@ StatusIconLinuxWrapper::CreateWrappedStatusIcon(
const base::string16& tool_tip) {
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
if (linux_ui) {
- auto status_icon = linux_ui->CreateLinuxStatusIcon(image, tool_tip);
+ auto status_icon =
+ linux_ui->CreateLinuxStatusIcon(image, tool_tip, kAppIndicatorIdPrefix);
if (status_icon) {
return base::WrapUnique(
new StatusIconLinuxWrapper(std::move(status_icon)));
diff --git a/ui/views/linux_ui/linux_ui.h b/ui/views/linux_ui/linux_ui.h
index 759d4ab03f02a338f5e89bf971a423f6b42814ed..208c9a5ac7eb5441110f34b3f7859945c591df21 100644
--- a/ui/views/linux_ui/linux_ui.h
+++ b/ui/views/linux_ui/linux_ui.h
@@ -130,10 +130,12 @@ class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory,
// Checks for platform support for status icons.
virtual bool IsStatusIconSupported() const = 0;
- // Create a native status icon.
+ // Create a native status icon. The id_prefix is used to distinguish Chrome's
+ // status icons from other apps' status icons, and should be unique.
virtual std::unique_ptr<StatusIconLinux> CreateLinuxStatusIcon(
const gfx::ImageSkia& image,
- const base::string16& tool_tip) const = 0;
+ const base::string16& tool_tip,
+ const char* id_prefix) const = 0;
// Returns the icon for a given content type from the icon theme.
// TODO(davidben): Add an observer for the theme changing, so we can drop the

View file

@ -17,10 +17,10 @@ only one or two specific checks fail. Then it's better to simply comment out the
failing checks and allow the rest of the target to have them enabled. failing checks and allow the rest of the target to have them enabled.
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index bd5221ce36f87e4f54cbf71268bbffa692701517..6c6a22fdea951662a63c88e6939404878afc45ab 100644 index 4c3c16176f2dced3f7f2e586594d9e368b358d37..9511aefc5cf61497fb98bb9bae028e67be41973c 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc --- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc +++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -995,8 +995,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( @@ -1101,8 +1101,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
return NAVIGATION_TYPE_NEW_SUBFRAME; return NAVIGATION_TYPE_NEW_SUBFRAME;
} }
@ -33,7 +33,7 @@ index bd5221ce36f87e4f54cbf71268bbffa692701517..6c6a22fdea951662a63c88e693940487
if (rfh->GetParent()) { if (rfh->GetParent()) {
// All manual subframes would be did_create_new_entry and handled above, so // All manual subframes would be did_create_new_entry and handled above, so
@@ -1233,7 +1235,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( @@ -1339,7 +1341,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon(); new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
} }
@ -46,7 +46,7 @@ index bd5221ce36f87e4f54cbf71268bbffa692701517..6c6a22fdea951662a63c88e693940487
// navigation. Now we know that the renderer has updated its state accordingly // navigation. Now we know that the renderer has updated its state accordingly
// and it is safe to also clear the browser side history. // and it is safe to also clear the browser side history.
diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.h b/third_party/blink/renderer/platform/wtf/text/string_impl.h diff --git a/third_party/blink/renderer/platform/wtf/text/string_impl.h b/third_party/blink/renderer/platform/wtf/text/string_impl.h
index be183011e7f4e0af6f7676ac8a343ef36d2e7bc2..8b40c554912754b05d3bc5dc4889667f87935a0a 100644 index 3073b0856d29e442f8905041350a2bb196aa24ce..e997f094c75e055b44ce4a31c359c31cb1f25a14 100644
--- a/third_party/blink/renderer/platform/wtf/text/string_impl.h --- a/third_party/blink/renderer/platform/wtf/text/string_impl.h
+++ b/third_party/blink/renderer/platform/wtf/text/string_impl.h +++ b/third_party/blink/renderer/platform/wtf/text/string_impl.h
@@ -258,21 +258,21 @@ class WTF_EXPORT StringImpl { @@ -258,21 +258,21 @@ class WTF_EXPORT StringImpl {
@ -75,10 +75,10 @@ index be183011e7f4e0af6f7676ac8a343ef36d2e7bc2..8b40c554912754b05d3bc5dc4889667f
<< AsciiForDebugging() << " " << CurrentThread(); << AsciiForDebugging() << " " << CurrentThread();
#endif #endif
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index e49dd8c81270cdd9794ddee11bad036c2f444af5..9e61c901cd2df168520b83a8522ca8c032f4c0ae 100644 index 1857bfa07ce3d8656105e696363a760889794e77..c25d8c241907fb166218670533a3b6e1e2f32769 100644
--- a/ui/base/clipboard/clipboard_win.cc --- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc +++ b/ui/base/clipboard/clipboard_win.cc
@@ -905,9 +905,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap, @@ -913,9 +913,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
} }
void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) { void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {

View file

@ -133,7 +133,7 @@ index 47401abc984e6fe26c7f4c5399aa565c687060b0..ca6a527ffac877c27aac94337ec5a7b5
protected: protected:
virtual ~DesktopMediaListObserver() {} virtual ~DesktopMediaListObserver() {}
diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc diff --git a/chrome/browser/media/webrtc/native_desktop_media_list.cc b/chrome/browser/media/webrtc/native_desktop_media_list.cc
index 5eac54ba5336d51b15da1e084df0fc7f6dc09deb..e7c2478850d5231e258fb4c54dd57db555273efc 100644 index 867c10fb396c3c41cb68c4362c7a5175603489b9..13862dbeb06d933f1244d13148d040094d544086 100644
--- a/chrome/browser/media/webrtc/native_desktop_media_list.cc --- a/chrome/browser/media/webrtc/native_desktop_media_list.cc
+++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc +++ b/chrome/browser/media/webrtc/native_desktop_media_list.cc
@@ -6,14 +6,15 @@ @@ -6,14 +6,15 @@

View file

@ -15,10 +15,10 @@ the redraw locking mechanism, which fixes these issues. The electron issue
can be found at https://github.com/electron/electron/issues/1821 can be found at https://github.com/electron/electron/issues/1821
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 9afbcf6ca30a6282cfa0ade76fe07467d497ac2e..2945f4fe3744b0d8ae56393d935125e3118189b4 100644 index b3c01542f183a247df30e5b96bbba8298d828153..8fe7e1142cb79cb3abf3cbc1cabc73b27695a63a 100644
--- a/ui/views/win/hwnd_message_handler.cc --- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc
@@ -282,6 +282,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500; @@ -288,6 +288,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
} // namespace } // namespace
@ -29,7 +29,7 @@ index 9afbcf6ca30a6282cfa0ade76fe07467d497ac2e..2945f4fe3744b0d8ae56393d935125e3
// A scoping class that prevents a window from being able to redraw in response // A scoping class that prevents a window from being able to redraw in response
// to invalidations that may occur within it for the lifetime of the object. // to invalidations that may occur within it for the lifetime of the object.
// //
@@ -333,6 +337,7 @@ class HWNDMessageHandler::ScopedRedrawLock { @@ -339,6 +343,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
cancel_unlock_(false), cancel_unlock_(false),
should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() && should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
::IsWindow(hwnd_) && ::IsWindow(hwnd_) &&
@ -37,7 +37,7 @@ index 9afbcf6ca30a6282cfa0ade76fe07467d497ac2e..2945f4fe3744b0d8ae56393d935125e3
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) || (!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
!ui::win::IsAeroGlassEnabled())) { !ui::win::IsAeroGlassEnabled())) {
if (should_lock_) if (should_lock_)
@@ -933,6 +938,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() { @@ -940,6 +945,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
hwnd()); hwnd());
} }
@ -49,7 +49,7 @@ index 9afbcf6ca30a6282cfa0ade76fe07467d497ac2e..2945f4fe3744b0d8ae56393d935125e3
// HWNDMessageHandler, gfx::WindowImpl overrides: // HWNDMessageHandler, gfx::WindowImpl overrides:
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index 593c3c0e95b50c9847994af705c053586e78689f..43e4a26502d837972d8acc68a1e7e7550766ddf6 100644 index 2efafcdba85f2f8c940bb5fc2b07f1ec1abdb3c9..ce3fdf8ec003f0b18fe94368b18f6efca5d6d7b4 100644
--- a/ui/views/win/hwnd_message_handler.h --- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h +++ b/ui/views/win/hwnd_message_handler.h
@@ -182,6 +182,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl, @@ -182,6 +182,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
@ -62,10 +62,10 @@ index 593c3c0e95b50c9847994af705c053586e78689f..43e4a26502d837972d8acc68a1e7e755
HICON GetDefaultWindowIcon() const override; HICON GetDefaultWindowIcon() const override;
HICON GetSmallWindowIcon() const override; HICON GetSmallWindowIcon() const override;
diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h diff --git a/ui/views/win/hwnd_message_handler_delegate.h b/ui/views/win/hwnd_message_handler_delegate.h
index b3f670dddf8936e29932345ef0516318b904d0ef..a63d727930a43c680ef3672921e63c35fc34191d 100644 index 17907e675bb1d9cf4bf2bff1d0668d36fdf42df0..0ca9cb470df588bb952faada6c658335dc76ed06 100644
--- a/ui/views/win/hwnd_message_handler_delegate.h --- a/ui/views/win/hwnd_message_handler_delegate.h
+++ b/ui/views/win/hwnd_message_handler_delegate.h +++ b/ui/views/win/hwnd_message_handler_delegate.h
@@ -46,6 +46,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate { @@ -45,6 +45,8 @@ class VIEWS_EXPORT HWNDMessageHandlerDelegate {
// True if the widget associated with this window has a non-client view. // True if the widget associated with this window has a non-client view.
virtual bool HasNonClientView() const = 0; virtual bool HasNonClientView() const = 0;

View file

@ -19,10 +19,10 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107. https://crbug.com/634542 and https://crbug.com/711107.
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index f51e30c0d2a55f104ca0912e487484102e443c85..fbec9767bdefc3b90335ecc423ffd4ea31bf914d 100644 index dcfc217ced6adb75d6029b228f10bc8572d0018f..7882c60a5105ef28b9af776a9e406d37be70996d 100644
--- a/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -1578,6 +1578,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( @@ -1607,6 +1607,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
} }
RasterColorSpace LayerTreeHostImpl::GetRasterColorSpace() const { RasterColorSpace LayerTreeHostImpl::GetRasterColorSpace() const {
@ -34,7 +34,7 @@ index f51e30c0d2a55f104ca0912e487484102e443c85..fbec9767bdefc3b90335ecc423ffd4ea
// The pending tree will have the most recently updated color space, so // The pending tree will have the most recently updated color space, so
// prefer that. // prefer that.
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index e124035096b02e82d526d7dfd0e70d4cf73819be..4f182c826a8d08a8674e3ca2f0bf833aa49a1309 100644 index 7f074dd977e51270fa148df683efeffbce435a4b..fb982f81d082552225d9411dc764c7756cf50e02 100644
--- a/cc/trees/layer_tree_settings.h --- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h +++ b/cc/trees/layer_tree_settings.h
@@ -98,6 +98,8 @@ class CC_EXPORT LayerTreeSettings { @@ -98,6 +98,8 @@ class CC_EXPORT LayerTreeSettings {
@ -47,10 +47,10 @@ index e124035096b02e82d526d7dfd0e70d4cf73819be..4f182c826a8d08a8674e3ca2f0bf833a
// Image Decode Service and raster tiles without images until the decode is // Image Decode Service and raster tiles without images until the decode is
// ready. // ready.
diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
index 1327e8607c5192f2440341a33fc210aecd47ced5..543d6937a908560270c6bba431a255436b522608 100644 index 9539d2b5ad1af0450475d411cd43bfb1d37c11a6..aa3412a257851f235eae546a5d4e753a4e41d345 100644
--- a/components/viz/common/display/renderer_settings.h --- a/components/viz/common/display/renderer_settings.h
+++ b/components/viz/common/display/renderer_settings.h +++ b/components/viz/common/display/renderer_settings.h
@@ -18,6 +18,7 @@ class VIZ_COMMON_EXPORT RendererSettings { @@ -19,6 +19,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
RendererSettings(const RendererSettings& other); RendererSettings(const RendererSettings& other);
~RendererSettings(); ~RendererSettings();
@ -59,7 +59,7 @@ index 1327e8607c5192f2440341a33fc210aecd47ced5..543d6937a908560270c6bba431a25543
bool force_antialiasing = false; bool force_antialiasing = false;
bool force_blending_with_shaders = false; bool force_blending_with_shaders = false;
diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
index eca6020535249e51b428de9dd6454273e6c9dd71..e190d2fb2e2cc41135c119485c2d447522134da1 100644 index 5c3ae3641af9648462b10bbe144df69196922934..5fb234b7c833f97e1d61fab76f2f6d7d7c9f0c9f 100644
--- a/components/viz/host/renderer_settings_creation.cc --- a/components/viz/host/renderer_settings_creation.cc
+++ b/components/viz/host/renderer_settings_creation.cc +++ b/components/viz/host/renderer_settings_creation.cc
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
@ -80,7 +80,7 @@ index eca6020535249e51b428de9dd6454273e6c9dd71..e190d2fb2e2cc41135c119485c2d4475
!command_line->HasSwitch(switches::kUIDisablePartialSwap); !command_line->HasSwitch(switches::kUIDisablePartialSwap);
#if defined(OS_WIN) #if defined(OS_WIN)
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637b980139b 100644 index 42b51fe23966118c85a69d76b44ae1b533de8fe0..e1e9290629e94bfb3c00269a7bb3846733dba8e7 100644
--- a/components/viz/service/display/gl_renderer.cc --- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc
@@ -77,6 +77,9 @@ @@ -77,6 +77,9 @@
@ -93,7 +93,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
namespace viz { namespace viz {
namespace { namespace {
@@ -516,8 +519,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, @@ -519,8 +522,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) { void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
SetBlendEnabled(quad->ShouldDrawWithBlending()); SetBlendEnabled(quad->ShouldDrawWithBlending());
@ -105,7 +105,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
// Use the full quad_rect for debug quads to not move the edges based on // Use the full quad_rect for debug quads to not move the edges based on
// partial swaps. // partial swaps.
@@ -1289,7 +1293,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, @@ -1262,7 +1266,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
tex_coord_precision, sampler_type, shader_blend_mode, tex_coord_precision, sampler_type, shader_blend_mode,
params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background, params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background,
params->use_color_matrix, tint_gl_composited_content_), params->use_color_matrix, tint_gl_composited_content_),
@ -115,7 +115,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
} }
void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
@@ -1750,8 +1755,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, @@ -1725,8 +1730,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB(); gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA, SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
tint_gl_composited_content_), tint_gl_composited_content_),
@ -126,7 +126,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
SetShaderColor(color, opacity); SetShaderColor(color, opacity);
if (current_program_->tint_color_matrix_location() != -1) { if (current_program_->tint_color_matrix_location() != -1) {
@@ -1901,8 +1906,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, @@ -1876,8 +1881,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
quad->is_premultiplied ? PREMULTIPLIED_ALPHA quad->is_premultiplied ? PREMULTIPLIED_ALPHA
: NON_PREMULTIPLIED_ALPHA, : NON_PREMULTIPLIED_ALPHA,
false, false, tint_gl_composited_content_), false, false, tint_gl_composited_content_),
@ -137,7 +137,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
if (current_program_->tint_color_matrix_location() != -1) { if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -1990,8 +1995,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, @@ -1965,8 +1970,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
: NON_PREMULTIPLIED_ALPHA, : NON_PREMULTIPLIED_ALPHA,
!quad->ShouldDrawWithBlending(), has_tex_clamp_rect, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
tint_gl_composited_content_), tint_gl_composited_content_),
@ -148,7 +148,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
if (current_program_->tint_color_matrix_location() != -1) { if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2086,7 +2091,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, @@ -2061,7 +2066,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB()); DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
gfx::ColorSpace dst_color_space = gfx::ColorSpace dst_color_space =
@ -157,7 +157,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
// Force sRGB output on Windows for overlay candidate video quads to match // Force sRGB output on Windows for overlay candidate video quads to match
// DirectComposition behavior in case these switch between overlays and // DirectComposition behavior in case these switch between overlays and
// compositing. See https://crbug.com/811118 for details. // compositing. See https://crbug.com/811118 for details.
@@ -2234,8 +2239,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, @@ -2209,8 +2214,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
quad->resource_id()); quad->resource_id());
SetUseProgram(ProgramKey::VideoStream(tex_coord_precision), SetUseProgram(ProgramKey::VideoStream(tex_coord_precision),
@ -168,7 +168,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
@@ -2287,8 +2292,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { @@ -2262,8 +2267,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR); draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
// Bind the program to the GL state. // Bind the program to the GL state.
@ -179,7 +179,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(locked_quad.target(), locked_quad.texture_id()); gl_->BindTexture(locked_quad.target(), locked_quad.texture_id());
@@ -2938,7 +2943,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { @@ -2911,7 +2916,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color, void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
const gfx::ColorSpace& src_color_space, const gfx::ColorSpace& src_color_space,
const gfx::ColorSpace& dst_color_space) { const gfx::ColorSpace& dst_color_space) {
@ -190,7 +190,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
ProgramKey program_key = program_key_no_color; ProgramKey program_key = program_key_no_color;
const gfx::ColorTransform* color_transform = const gfx::ColorTransform* color_transform =
@@ -3306,7 +3313,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( @@ -3281,7 +3288,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
*overlay_texture = FindOrCreateOverlayTexture( *overlay_texture = FindOrCreateOverlayTexture(
params.quad->render_pass_id, iosurface_width, iosurface_height, params.quad->render_pass_id, iosurface_width, iosurface_height,
@ -199,7 +199,7 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
*new_bounds = gfx::RectF(updated_dst_rect.origin(), *new_bounds = gfx::RectF(updated_dst_rect.origin(),
gfx::SizeF((*overlay_texture)->texture.size())); gfx::SizeF((*overlay_texture)->texture.size()));
@@ -3511,8 +3518,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { @@ -3485,8 +3492,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
PrepareGeometry(SHARED_BINDING); PrepareGeometry(SHARED_BINDING);
@ -211,17 +211,17 @@ index a9ba5ca388b8d0979a1235a0d976b8cb3277f6d3..574deb6ad7d1b088eea43d87b8fe4637
gfx::Transform render_matrix; gfx::Transform render_matrix;
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
@@ -3671,3 +3679,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( @@ -3645,3 +3653,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
} }
} // namespace viz } // namespace viz
+ +
+#undef PATCH_CS +#undef PATCH_CS
diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc
index 0544d031b60d38279104a4ca9c6dc25126dea185..1acb3dfa55f39b8ecb9fccaa4627ac25cac81f1f 100644 index d911ebaf778124a515486cedd5aa02aab09c3b0d..1a78ddc3adcbc656f34f015a1d39646763bdac4a 100644
--- a/components/viz/service/display/skia_renderer.cc --- a/components/viz/service/display/skia_renderer.cc
+++ b/components/viz/service/display/skia_renderer.cc +++ b/components/viz/service/display/skia_renderer.cc
@@ -584,9 +584,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad) { @@ -709,9 +709,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad,
std::unique_ptr<SkCanvas> color_transform_canvas; std::unique_ptr<SkCanvas> color_transform_canvas;
// TODO(enne): color transform needs to be replicated in gles2_cmd_decoder // TODO(enne): color transform needs to be replicated in gles2_cmd_decoder
@ -237,7 +237,7 @@ index 0544d031b60d38279104a4ca9c6dc25126dea185..1acb3dfa55f39b8ecb9fccaa4627ac25
base::Optional<skia::OpacityFilterCanvas> opacity_canvas; base::Optional<skia::OpacityFilterCanvas> opacity_canvas;
if (needs_transparency || disable_image_filtering) { if (needs_transparency || disable_image_filtering) {
diff --git a/components/viz/service/display/software_renderer.cc b/components/viz/service/display/software_renderer.cc diff --git a/components/viz/service/display/software_renderer.cc b/components/viz/service/display/software_renderer.cc
index 5c41958ed259b1d3ae076312b97a802746897c98..4cb9801a859c12dae03e03073085ff82ea0e4a32 100644 index 1b2c335bfe960db99fefd570b88f57d1596aee94..e0fcc5205ad07eb4c8b74a925d569a14dabf424e 100644
--- a/components/viz/service/display/software_renderer.cc --- a/components/viz/service/display/software_renderer.cc
+++ b/components/viz/service/display/software_renderer.cc +++ b/components/viz/service/display/software_renderer.cc
@@ -334,9 +334,11 @@ void SoftwareRenderer::DrawPictureQuad(const PictureDrawQuad* quad) { @@ -334,9 +334,11 @@ void SoftwareRenderer::DrawPictureQuad(const PictureDrawQuad* quad) {
@ -256,7 +256,7 @@ index 5c41958ed259b1d3ae076312b97a802746897c98..4cb9801a859c12dae03e03073085ff82
base::Optional<skia::OpacityFilterCanvas> opacity_canvas; base::Optional<skia::OpacityFilterCanvas> opacity_canvas;
if (needs_transparency || disable_image_filtering) { if (needs_transparency || disable_image_filtering) {
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 9511100e6077b6788abfead4b1962773a22ae40b..db2d8a4fc979b20810776cf2a31018d197cdba7d 100644 index 2235eef2fc6ab449c16b3b4fd526adad910f0261..b2cca7287b3a0726c51e64cbc7e17136d31733a0 100644
--- a/content/browser/gpu/gpu_process_host.cc --- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc
@@ -193,6 +193,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus( @@ -193,6 +193,7 @@ GpuTerminationStatus ConvertToGpuTerminationStatus(
@ -268,18 +268,18 @@ index 9511100e6077b6788abfead4b1962773a22ae40b..db2d8a4fc979b20810776cf2a31018d1
service_manager::switches::kGpuSandboxAllowSysVShm, service_manager::switches::kGpuSandboxAllowSysVShm,
service_manager::switches::kGpuSandboxFailuresFatal, service_manager::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 1f2897aabf94124f108a0f0449e4d687b084f1a4..4f88e4425ceada8af6b412b087ac134572222824 100644 index fe73adb24cf444a942c7cdd1c1f6d25d869d5277..e26057ffdc5fffc96ceb944120473d3061d83132 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -218,6 +218,7 @@ @@ -222,6 +222,7 @@
#include "ui/base/ui_base_switches.h" #include "ui/base/ui_base_switches.h"
#include "ui/base/ui_base_switches_util.h" #include "ui/base/ui_base_switches_util.h"
#include "ui/display/display_switches.h" #include "ui/display/display_switches.h"
+#include "ui/gfx/switches.h" +#include "ui/gfx/switches.h"
#include "ui/gl/gl_switches.h" #include "ui/gl/gl_switches.h"
#include "ui/gl/gpu_switching_manager.h"
#include "ui/native_theme/native_theme_features.h" #include "ui/native_theme/native_theme_features.h"
@@ -2931,6 +2932,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -2966,6 +2967,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along // Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line. // with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = { static const char* const kSwitchNames[] = {
@ -288,10 +288,10 @@ index 1f2897aabf94124f108a0f0449e4d687b084f1a4..4f88e4425ceada8af6b412b087ac1345
service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableInProcessStackTraces,
service_manager::switches::kDisableSeccompFilterSandbox, service_manager::switches::kDisableSeccompFilterSandbox,
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6d0580d5b0b76109bbaf0d058ce4201dc970adf0..f0271310ec6112ca7276c5af13ee6677d393109e 100644 index 121519c661b4e5f42316b03c6db25ab451d00539..479cf5a7ad17f8a3b8ca6acf9ddf4307a14f9f8c 100644
--- a/content/renderer/render_widget.cc --- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc
@@ -2565,6 +2565,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( @@ -2619,6 +2619,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
settings.main_frame_before_activation_enabled = settings.main_frame_before_activation_enabled =
cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);
@ -302,7 +302,7 @@ index 6d0580d5b0b76109bbaf0d058ce4201dc970adf0..f0271310ec6112ca7276c5af13ee6677
// is what the renderer uses if its not threaded. // is what the renderer uses if its not threaded.
settings.enable_checker_imaging = settings.enable_checker_imaging =
diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc diff --git a/ui/gfx/mac/io_surface.cc b/ui/gfx/mac/io_surface.cc
index 00ad38db090096645d9ef9e3220a48661b6401df..af50266b42abd514bfca3379191675e022002406 100644 index 8d9f38b1f3dfd5c2281459ec7620a9eef6861f21..a0ff3ccf56b1f925233875b6088a878423191c8f 100644
--- a/ui/gfx/mac/io_surface.cc --- a/ui/gfx/mac/io_surface.cc
+++ b/ui/gfx/mac/io_surface.cc +++ b/ui/gfx/mac/io_surface.cc
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@ -313,7 +313,7 @@ index 00ad38db090096645d9ef9e3220a48661b6401df..af50266b42abd514bfca3379191675e0
namespace gfx { namespace gfx {
@@ -199,6 +200,11 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size, @@ -189,6 +190,11 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
// Ensure that all IOSurfaces start as sRGB. // Ensure that all IOSurfaces start as sRGB.
CGColorSpaceRef color_space = base::mac::GetSRGBColorSpace(); CGColorSpaceRef color_space = base::mac::GetSRGBColorSpace();
@ -325,7 +325,7 @@ index 00ad38db090096645d9ef9e3220a48661b6401df..af50266b42abd514bfca3379191675e0
base::ScopedCFTypeRef<CFDataRef> color_space_icc( base::ScopedCFTypeRef<CFDataRef> color_space_icc(
CGColorSpaceCopyICCProfile(color_space)); CGColorSpaceCopyICCProfile(color_space));
IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), color_space_icc); IOSurfaceSetValue(surface, CFSTR("IOSurfaceColorSpace"), color_space_icc);
@@ -210,6 +216,14 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size, @@ -200,6 +206,14 @@ IOSurfaceRef CreateIOSurface(const gfx::Size& size,
void IOSurfaceSetColorSpace(IOSurfaceRef io_surface, void IOSurfaceSetColorSpace(IOSurfaceRef io_surface,
const ColorSpace& color_space) { const ColorSpace& color_space) {
@ -341,7 +341,7 @@ index 00ad38db090096645d9ef9e3220a48661b6401df..af50266b42abd514bfca3379191675e0
if (color_space == ColorSpace::CreateSRGB()) { if (color_space == ColorSpace::CreateSRGB()) {
base::ScopedCFTypeRef<CFDataRef> srgb_icc( base::ScopedCFTypeRef<CFDataRef> srgb_icc(
diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc diff --git a/ui/gfx/switches.cc b/ui/gfx/switches.cc
index e1943d5970ac37a19430b45f54a5608386433ef8..d4f56057b50fb8925371ad109727cc25f05c6d18 100644 index 606cbb42070be3a826f73269cd2bf40454358b3d..bd31d565b002b653a6b104114c9616416ac86649 100644
--- a/ui/gfx/switches.cc --- a/ui/gfx/switches.cc
+++ b/ui/gfx/switches.cc +++ b/ui/gfx/switches.cc
@@ -7,6 +7,8 @@ @@ -7,6 +7,8 @@
@ -354,7 +354,7 @@ index e1943d5970ac37a19430b45f54a5608386433ef8..d4f56057b50fb8925371ad109727cc25
// Disables DirectWrite font rendering for general UI elements. // Disables DirectWrite font rendering for general UI elements.
const char kDisableDirectWriteForUI[] = "disable-directwrite-for-ui"; const char kDisableDirectWriteForUI[] = "disable-directwrite-for-ui";
diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h diff --git a/ui/gfx/switches.h b/ui/gfx/switches.h
index dc4921dbf0cc4a2c0454269bd03b79cef7f97b72..019e39bb16623c25fc173e215982b45035db4db3 100644 index b206f18ad77c21774073c2fa07372d2234926414..992468ce95b2829702fcdb26c26362eccb5556c7 100644
--- a/ui/gfx/switches.h --- a/ui/gfx/switches.h
+++ b/ui/gfx/switches.h +++ b/ui/gfx/switches.h
@@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@

View file

@ -10,7 +10,7 @@ We should revisit this bug after upgrading to newer versions of Chrome,
this patch was introduced in Chrome 66. this patch was introduced in Chrome 66.
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 80d51c9baf63ab1dc005e44854f4eca497d8b7dd..f5bec5d54dd0ee826cbf6559fbbc0fece1398118 100644 index cfa3fd15714c3743cb9d2900b35570c94545fa87..80785902890c57ffae2fa841831d3bd60a8fa11a 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc --- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc +++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -259,6 +259,12 @@ void RenderFrameProxyHost::SetDestructionCallback( @@ -259,6 +259,12 @@ void RenderFrameProxyHost::SetDestructionCallback(

View file

@ -5,10 +5,10 @@ Subject: disable_hidden.patch
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 807466aeeda0b504098a5455bf6e5e0aab9735f0..85be4a6900632f336868f9b585ca735468ce12eb 100644 index 9832053c72a8dfc827d96794ba0de7355e8d2f40..e94935246fb0a82bf91a12bce57ba8f5912c7b6b 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc --- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -685,6 +685,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -755,6 +755,9 @@ void RenderWidgetHostImpl::WasHidden() {
if (is_hidden_) if (is_hidden_)
return; return;
@ -19,7 +19,7 @@ index 807466aeeda0b504098a5455bf6e5e0aab9735f0..85be4a6900632f336868f9b585ca7354
TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden"); TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index dba7b4276f5e6c0543a8e65b2bb01ad714fe0c79..f0126b89fffaad13ab44732062c435d18bda0e4e 100644 index 130e988cbd7459f7ddf67bc81f4f1989e08b0513..d4fa0c1a2fc1df713f06415a4970298306a52699 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h --- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -153,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl @@ -153,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl

View file

@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
See https://github.com/electron/electron/issues/10754 See https://github.com/electron/electron/issues/10754
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 7ba01ff026e3da711ee3e291385cb5c1086a2f08..eb2e3288c761957975ab9b5b8b43f3fee3337afa 100644 index ca5e41dc1beda6a59e41c28302cd4201e08fa216..a608916ddeee16aa3556fb5da3267de08febada3 100644
--- a/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3644,7 +3644,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client, @@ -3658,7 +3658,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
"frame that never had a user gesture since its load. " "frame that never had a user gesture since its load. "
"https://www.chromestatus.com/feature/5082396709879808"; "https://www.chromestatus.com/feature/5082396709879808";
Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message); Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);

View file

@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68.
Remove the patch during the Chromium 69 upgrade. Remove the patch during the Chromium 69 upgrade.
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 1f0518e9cc2456d9299b16437be36041c98e8a92..e492c7fe90504314f1116607c1f543e68ddf2ad8 100644 index ba938f7d75072c6d15de08528d6b1cac94ecdbb1..5878cbf7767adad6365d02e389b8b4a1774a3539 100644
--- a/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1729,7 +1729,7 @@ jumbo_source_set("blink_platform_unittests_sources") { @@ -1737,7 +1737,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
"graphics/paint/drawing_display_item_test.cc", "graphics/paint/drawing_display_item_test.cc",
"graphics/paint/drawing_recorder_test.cc", "graphics/paint/drawing_recorder_test.cc",
"graphics/paint/float_clip_rect_test.cc", "graphics/paint/float_clip_rect_test.cc",

View file

@ -1,240 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Mon, 26 Nov 2018 09:32:14 +0900
Subject: fix_trackpad_scrolling.patch
Backport https://chromium-review.googlesource.com/c/chromium/src/+/1299342.
This patch fixes https://github.com/electron/electron/issues/8960, and can be
removed after upgraded to Chrome 72.
diff --git a/gpu/ipc/service/child_window_win.cc b/gpu/ipc/service/child_window_win.cc
index 0f432fe2233e0ba90950f4ea9164d03df4ac9cf6..8bf56a44543be44cda74c341ba59dab87c8f69cb 100644
--- a/gpu/ipc/service/child_window_win.cc
+++ b/gpu/ipc/service/child_window_win.cc
@@ -9,7 +9,6 @@
#include "base/compiler_specific.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
-#include "base/threading/thread.h"
#include "base/win/scoped_hdc.h"
#include "base/win/wrapped_window_proc.h"
#include "gpu/ipc/common/gpu_messages.h"
@@ -21,48 +20,10 @@
namespace gpu {
-// This owns the thread and contains data that's shared between the threads.
-struct SharedData {
- SharedData() : thread("Window owner thread") {}
-
- base::Lock rect_lock;
- gfx::Rect rect_to_clear;
-
- base::Thread thread;
-};
-
namespace {
ATOM g_window_class;
-// This runs on the window owner thread.
-LRESULT CALLBACK IntermediateWindowProc(HWND window,
- UINT message,
- WPARAM w_param,
- LPARAM l_param) {
- switch (message) {
- case WM_ERASEBKGND:
- // Prevent windows from erasing the background.
- return 1;
- case WM_PAINT:
- PAINTSTRUCT paint;
- if (BeginPaint(window, &paint)) {
- SharedData* shared_data =
- reinterpret_cast<SharedData*>(gfx::GetWindowUserData(window));
- DCHECK(shared_data);
- {
- base::AutoLock lock(shared_data->rect_lock);
- shared_data->rect_to_clear.Union(gfx::Rect(paint.rcPaint));
- }
-
- EndPaint(window, &paint);
- }
- return 0;
- default:
- return DefWindowProc(window, message, w_param, l_param);
- }
-}
-
// This runs on the window owner thread.
void InitializeWindowClass() {
if (g_window_class)
@@ -71,9 +32,9 @@ void InitializeWindowClass() {
WNDCLASSEX intermediate_class;
base::win::InitializeWindowClass(
L"Intermediate D3D Window",
- &base::win::WrappedWindowProc<IntermediateWindowProc>, CS_OWNDC, 0, 0,
- nullptr, reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)), nullptr,
- nullptr, nullptr, &intermediate_class);
+ &base::win::WrappedWindowProc<::DefWindowProc>, CS_OWNDC, 0, 0, nullptr,
+ reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)), nullptr, nullptr,
+ nullptr, &intermediate_class);
g_window_class = RegisterClassEx(&intermediate_class);
if (!g_window_class) {
LOG(ERROR) << "RegisterClass failed.";
@@ -122,7 +83,6 @@ class HiddenPopupWindow : public gfx::WindowImpl {
// This runs on the window owner thread.
void CreateWindowsOnThread(const gfx::Size& size,
base::WaitableEvent* event,
- SharedData* shared_data,
HWND* child_window,
HWND* parent_window) {
InitializeWindowClass();
@@ -131,20 +91,25 @@ void CreateWindowsOnThread(const gfx::Size& size,
// Create hidden parent window on the current thread.
*parent_window = HiddenPopupWindow::Create();
// Create child window.
+ // WS_EX_NOPARENTNOTIFY and WS_EX_LAYERED make the window transparent for
+ // input. WS_EX_NOREDIRECTIONBITMAP avoids allocating a
+ // bitmap that would otherwise be allocated with WS_EX_LAYERED, the bitmap is
+ // only necessary if using Gdi objects with the window.
HWND window = CreateWindowEx(
- WS_EX_NOPARENTNOTIFY, reinterpret_cast<wchar_t*>(g_window_class), L"",
+ WS_EX_NOPARENTNOTIFY | WS_EX_LAYERED | WS_EX_TRANSPARENT |
+ WS_EX_NOREDIRECTIONBITMAP,
+ reinterpret_cast<wchar_t*>(g_window_class), L"",
WS_CHILDWINDOW | WS_DISABLED | WS_VISIBLE, 0, 0, size.width(),
size.height(), *parent_window, nullptr, nullptr, nullptr);
CHECK(window);
*child_window = window;
- gfx::SetWindowUserData(window, shared_data);
event->Signal();
}
// This runs on the main thread after the window was destroyed on window owner
// thread.
-void DestroySharedData(std::unique_ptr<SharedData> shared_data) {
- shared_data->thread.Stop();
+void DestroyThread(std::unique_ptr<base::Thread> thread) {
+ thread->Stop();
}
// This runs on the window owner thread.
@@ -164,10 +129,9 @@ bool ChildWindowWin::Initialize() {
if (window_)
return true;
- shared_data_ = std::make_unique<SharedData>();
-
+ thread_ = std::make_unique<base::Thread>("Window owner thread");
base::Thread::Options options(base::MessageLoop::TYPE_UI, 0);
- shared_data_->thread.StartWithOptions(options);
+ thread_->StartWithOptions(options);
base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED);
@@ -175,44 +139,30 @@ bool ChildWindowWin::Initialize() {
RECT window_rect;
GetClientRect(parent_window_, &window_rect);
- shared_data_->thread.task_runner()->PostTask(
+ thread_->task_runner()->PostTask(
FROM_HERE,
base::Bind(&CreateWindowsOnThread, gfx::Rect(window_rect).size(), &event,
- shared_data_.get(), &window_, &initial_parent_window_));
+ &window_, &initial_parent_window_));
event.Wait();
delegate_->DidCreateAcceleratedSurfaceChildWindow(parent_window_, window_);
return true;
}
-void ChildWindowWin::ClearInvalidContents() {
- base::AutoLock lock(shared_data_->rect_lock);
- if (!shared_data_->rect_to_clear.IsEmpty()) {
- base::win::ScopedGetDC dc(window_);
-
- RECT rect = shared_data_->rect_to_clear.ToRECT();
-
- // DirectComposition composites with the contents under the SwapChain,
- // so ensure that's cleared. GDI treats black as transparent.
- FillRect(dc, &rect, reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH)));
- shared_data_->rect_to_clear = gfx::Rect();
- }
-}
-
ChildWindowWin::~ChildWindowWin() {
- if (shared_data_) {
- scoped_refptr<base::TaskRunner> task_runner =
- shared_data_->thread.task_runner();
+ if (thread_) {
+ scoped_refptr<base::TaskRunner> task_runner = thread_->task_runner();
task_runner->PostTaskAndReply(
FROM_HERE,
- base::Bind(&DestroyWindowsOnThread, window_, initial_parent_window_),
- base::Bind(&DestroySharedData, base::Passed(std::move(shared_data_))));
+ base::BindOnce(&DestroyWindowsOnThread, window_,
+ initial_parent_window_),
+ base::BindOnce(&DestroyThread, base::Passed(std::move(thread_))));
}
}
scoped_refptr<base::TaskRunner> ChildWindowWin::GetTaskRunnerForTesting() {
- DCHECK(shared_data_);
- return shared_data_->thread.task_runner();
+ DCHECK(thread_);
+ return thread_->task_runner();
}
} // namespace gpu
diff --git a/gpu/ipc/service/child_window_win.h b/gpu/ipc/service/child_window_win.h
index c11202b12da8fc540a78c3b13f731fc33d2d63b3..2b29fc641a810d2b521fa14e40da5bffb42ad722 100644
--- a/gpu/ipc/service/child_window_win.h
+++ b/gpu/ipc/service/child_window_win.h
@@ -7,14 +7,13 @@
#include "base/memory/weak_ptr.h"
#include "base/task_runner.h"
+#include "base/threading/thread.h"
#include "gpu/ipc/service/image_transport_surface_delegate.h"
#include <windows.h>
namespace gpu {
-struct SharedData;
-
// The window DirectComposition renders into needs to be owned by the process
// that's currently doing the rendering. The class creates and owns a window
// which is reparented by the browser to be a child of its window.
@@ -25,15 +24,13 @@ class ChildWindowWin {
~ChildWindowWin();
bool Initialize();
- void ClearInvalidContents();
HWND window() const { return window_; }
scoped_refptr<base::TaskRunner> GetTaskRunnerForTesting();
private:
- // This member contains all the data that can be accessed from the main or
- // window owner threads.
- std::unique_ptr<SharedData> shared_data_;
+ // The window owner thread.
+ std::unique_ptr<base::Thread> thread_;
// The eventual parent of the window living in the browser process.
HWND parent_window_;
HWND window_;
diff --git a/gpu/ipc/service/direct_composition_surface_win.cc b/gpu/ipc/service/direct_composition_surface_win.cc
index faf9e3a2ab0c1e11bf25803084dc1c4213143ab8..1e667e04605de6e105bcd485f3c84c444546b044 100644
--- a/gpu/ipc/service/direct_composition_surface_win.cc
+++ b/gpu/ipc/service/direct_composition_surface_win.cc
@@ -1674,8 +1674,6 @@ gfx::SwapResult DirectCompositionSurfaceWin::SwapBuffers(
gl::GLSurfacePresentationHelper::ScopedSwapBuffers scoped_swap_buffers(
presentation_helper_.get(), callback);
- child_window_.ClearInvalidContents();
-
bool succeeded = true;
if (root_surface_->SwapBuffers(PresentationCallback()) ==

View file

@ -7,10 +7,10 @@ Allows embedder to intercept site instances chosen by chromium
and respond with custom instance. and respond with custom instance.
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 69913022bb1955a22d93acabbdda84e8090de29d..20db3861e67290787fd8c45e5dbeb7507064bdf9 100644 index fd7d05e26fa5ecdab370c8edf984f92dfaacfc28..4ad4fc9e7881ff6b432e5f61fa72fbabef752015 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc --- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1933,6 +1933,16 @@ bool RenderFrameHostManager::InitRenderView( @@ -1932,6 +1932,16 @@ bool RenderFrameHostManager::InitRenderView(
scoped_refptr<SiteInstance> scoped_refptr<SiteInstance>
RenderFrameHostManager::GetSiteInstanceForNavigationRequest( RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
const NavigationRequest& request) { const NavigationRequest& request) {
@ -27,7 +27,7 @@ index 69913022bb1955a22d93acabbdda84e8090de29d..20db3861e67290787fd8c45e5dbeb750
// First, check if the navigation can switch SiteInstances. If not, the // First, check if the navigation can switch SiteInstances. If not, the
// navigation should use the current SiteInstance. // navigation should use the current SiteInstance.
SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance(); SiteInstance* current_site_instance = render_frame_host_->GetSiteInstance();
@@ -1965,6 +1975,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( @@ -1964,6 +1974,51 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request.common_params().url); request.common_params().url);
no_renderer_swap_allowed |= no_renderer_swap_allowed |=
request.from_begin_navigation() && !can_renderer_initiate_transfer; request.from_begin_navigation() && !can_renderer_initiate_transfer;
@ -79,7 +79,7 @@ index 69913022bb1955a22d93acabbdda84e8090de29d..20db3861e67290787fd8c45e5dbeb750
} else { } else {
// Subframe navigations will use the current renderer, unless specifically // Subframe navigations will use the current renderer, unless specifically
// allowed to swap processes. // allowed to swap processes.
@@ -1976,23 +2031,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest( @@ -1975,23 +2030,17 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
if (no_renderer_swap_allowed && !should_swap_for_error_isolation) if (no_renderer_swap_allowed && !should_swap_for_error_isolation)
return scoped_refptr<SiteInstance>(current_site_instance); return scoped_refptr<SiteInstance>(current_site_instance);
@ -108,10 +108,10 @@ index 69913022bb1955a22d93acabbdda84e8090de29d..20db3861e67290787fd8c45e5dbeb750
} }
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index abfb6afec00a691ea2ff27e7797921e3eb25d8ea..ae4bfc6553f347ad5a7e5327d64155e700e6584e 100644 index 543e9d90098e65286482b82a98a116d3224925a9..f564df8841d1eaea29d4f09c679263ec97552e3b 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -49,6 +49,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info, @@ -48,6 +48,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info,
handle); handle);
} }
@ -129,10 +129,10 @@ index abfb6afec00a691ea2ff27e7797921e3eb25d8ea..ae4bfc6553f347ad5a7e5327d64155e7
const MainFunctionParams& parameters) { const MainFunctionParams& parameters) {
return nullptr; return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index eb2f9a8f240f8805e4bcbde0465ec445dd7539e7..5f6fdb2d66acfa73c895cac18714d0998eed2ab2 100644 index 6962a00811a20a8dd78ee3688fac31a87500b4dc..af64896d0567870672bf4e2f45f7d76e1df68844 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -202,8 +202,37 @@ CONTENT_EXPORT void OverrideOnBindInterface( @@ -204,8 +204,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(
// the observer interfaces.) // the observer interfaces.)
class CONTENT_EXPORT ContentBrowserClient { class CONTENT_EXPORT ContentBrowserClient {
public: public:

View file

@ -5,10 +5,10 @@ Subject: gin_enable_disable_v8_platform.patch
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
index 4491b392412caac052bf9e41c70a28086ada8a17..8ec7775b78b3645dbac5ee518404ca9a70122153 100644 index 5670a2e55ef827068c547f4a76de18a12936d115..3332f4936c633f834576ae2eb0a4c59de482881e 100644
--- a/gin/isolate_holder.cc --- a/gin/isolate_holder.cc
+++ b/gin/isolate_holder.cc +++ b/gin/isolate_holder.cc
@@ -122,9 +122,10 @@ IsolateHolder::~IsolateHolder() { @@ -121,9 +121,10 @@ IsolateHolder::~IsolateHolder() {
void IsolateHolder::Initialize(ScriptMode mode, void IsolateHolder::Initialize(ScriptMode mode,
V8ExtrasMode v8_extras_mode, V8ExtrasMode v8_extras_mode,
v8::ArrayBuffer::Allocator* allocator, v8::ArrayBuffer::Allocator* allocator,
@ -36,7 +36,7 @@ index 8cb2646bdd7dc3f5013d197f4b76e8707afb6817..95844885e478e460b1f03a7d98942bff
v8::Isolate* isolate() { return isolate_; } v8::Isolate* isolate() { return isolate_; }
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 48116401c0be193261811e14db31844727f980fb..3ae68bdd35f386292de218985a5ab6890fd73c83 100644 index 4b3ef5cfa0684b31cf2e35acb27a1adee9dddfbb..ce0be2126d62754662c706698fc75e91e64af7f7 100644
--- a/gin/v8_initializer.cc --- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc
@@ -205,12 +205,14 @@ enum LoadV8FileResult { @@ -205,12 +205,14 @@ enum LoadV8FileResult {

View file

@ -6,11 +6,11 @@ Subject: gritsettings_resource_ids.patch
Add electron resources file to the list of resource ids generation. Add electron resources file to the list of resource ids generation.
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 0d621a15e32b9d354bf21af92f4d4cf8bfdeec67..a6f2e9e76eb82b1b45e3cd8b0662211904dc70ae 100644 index 95e9bf70c41e68fc43326f4545cfc7f65b265083..44b0131431983cee35dbd6af1b979fc53c0507b9 100644
--- a/tools/gritsettings/resource_ids --- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids +++ b/tools/gritsettings/resource_ids
@@ -424,6 +424,11 @@ @@ -422,6 +422,11 @@
"includes": [28900], "includes": [28850],
}, },
+ "electron/electron_resources.grd": { + "electron/electron_resources.grd": {

View file

@ -7,10 +7,10 @@ Dont compare RC.exe and RC.py output.
FIXME: It has to be reverted once the script is fixed. FIXME: It has to be reverted once the script is fixed.
diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
index cb0393ecd507b865169e9d7c3037d7d5523ae30e..34eebb06295b38dfa0b567f66780ce144b6b5f34 100644 index 6f01ebf4026444d405cb3b837b21a6370c357180..d03be4244bfa37953b55783f2e245df76b634522 100644
--- a/build/toolchain/win/tool_wrapper.py --- a/build/toolchain/win/tool_wrapper.py
+++ b/build/toolchain/win/tool_wrapper.py +++ b/build/toolchain/win/tool_wrapper.py
@@ -231,7 +231,11 @@ class WinTool(object): @@ -220,7 +220,11 @@ class WinTool(object):
if rc_exe_exit_code == 0: if rc_exe_exit_code == 0:
import filecmp import filecmp
# Strip "/fo" prefix. # Strip "/fo" prefix.

View file

@ -8,7 +8,7 @@ needs to register on an isolate so that it can be used later
down in the initialization process of an isolate. down in the initialization process of an isolate.
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
index 8ec7775b78b3645dbac5ee518404ca9a70122153..c82ca4d00398cb01ffea20b8d8d937329e764e45 100644 index 3332f4936c633f834576ae2eb0a4c59de482881e..801383dffd6d49b174b6b5a4b89e6a1a498da499 100644
--- a/gin/isolate_holder.cc --- a/gin/isolate_holder.cc
+++ b/gin/isolate_holder.cc +++ b/gin/isolate_holder.cc
@@ -52,7 +52,8 @@ IsolateHolder::IsolateHolder( @@ -52,7 +52,8 @@ IsolateHolder::IsolateHolder(

View file

@ -6,7 +6,7 @@ Subject: mas-audiodeviceduck.patch
Removes usage of the AudioDeviceDuck private API. Removes usage of the AudioDeviceDuck private API.
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index b7bcfa7b01dd5072685aaa1176d6277405742d94..df34137985d36ea2a48b2afe45c3cc253d4aa95b 100644 index b8e4e68e9b8f6ac040939a97bdf040c3351efa13..abff176679f7dde30a65528be7e9a2568f68972a 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc --- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc +++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -33,19 +33,23 @@ @@ -33,19 +33,23 @@

View file

@ -9,7 +9,7 @@ diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
index 15fc15ba307e18f438852f00f41b2f5ecf7ff85f..7ca4e0ec5ca87f34e0baa22ba0b704e25fe7ca21 100644 index 15fc15ba307e18f438852f00f41b2f5ecf7ff85f..7ca4e0ec5ca87f34e0baa22ba0b704e25fe7ca21 100644
--- a/base/mac/foundation_util.mm --- a/base/mac/foundation_util.mm
+++ b/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm
@@ -26,7 +26,6 @@ @@ -26,7 +26,6 @@ CFTypeID SecKeyGetTypeID();
#if !defined(OS_IOS) #if !defined(OS_IOS)
CFTypeID SecACLGetTypeID(); CFTypeID SecACLGetTypeID();
CFTypeID SecTrustedApplicationGetTypeID(); CFTypeID SecTrustedApplicationGetTypeID();
@ -17,7 +17,7 @@ index 15fc15ba307e18f438852f00f41b2f5ecf7ff85f..7ca4e0ec5ca87f34e0baa22ba0b704e2
#endif #endif
} // extern "C" } // extern "C"
@@ -325,8 +324,7 @@ void SetBaseBundleID(const char* new_base_bundle_id) { @@ -325,8 +324,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) {
const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val)); const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
DCHECK(!cf_val || DCHECK(!cf_val ||
CTFontGetTypeID() == CFGetTypeID(cf_val) || CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@ -27,7 +27,7 @@ index 15fc15ba307e18f438852f00f41b2f5ecf7ff85f..7ca4e0ec5ca87f34e0baa22ba0b704e2
return ns_val; return ns_val;
} }
@@ -394,9 +392,6 @@ CTFontRef NSToCFCast(NSFont* ns_val) { @@ -394,9 +392,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) {
return (CTFontRef)(cf_val); return (CTFontRef)(cf_val);
} }

View file

@ -6,7 +6,7 @@ Subject: mas-cgdisplayusesforcetogray.patch
Removes usage of the CGDisplayUsesForceToGray private API. Removes usage of the CGDisplayUsesForceToGray private API.
diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
index ec1fc4edf55d8b5893dece146ddb0d39231f547d..05d8c811b913d88b71017a91eb3f2f993ccadd74 100644 index ff92b9fad59beedb8510c112f6e87e61090d2eb9..ea1804fc13660ee097ef2fa298098155d6677ceb 100644
--- a/ui/display/mac/screen_mac.mm --- a/ui/display/mac/screen_mac.mm
+++ b/ui/display/mac/screen_mac.mm +++ b/ui/display/mac/screen_mac.mm
@@ -106,7 +106,17 @@ Display BuildDisplayForScreen(NSScreen* screen) { @@ -106,7 +106,17 @@ Display BuildDisplayForScreen(NSScreen* screen) {

View file

@ -7,7 +7,7 @@ Removes usage of the _LSSetApplicationLaunchServicesServerConnectionStatus
private API. private API.
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 8397889b61e20febeee1dd3c0fe8732186e29b28..13e6da203846de6c93ab656b6c9e0399bce24110 100644 index c2061485c91dec043c6047d4640f5765a20a4248..d39465b0b2dd8bf4ac26335c44b78b1051659113 100644
--- a/content/gpu/gpu_main.cc --- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc
@@ -274,8 +274,10 @@ int GpuMain(const MainFunctionParams& parameters) { @@ -274,8 +274,10 @@ int GpuMain(const MainFunctionParams& parameters) {

View file

@ -18,7 +18,7 @@ index 94afefcee81b87c05bf9b1199d90d3d4b5ea84a6..2ec7f04c71824b47de1ddbf1f0e8625d
extern "C" { extern "C" {
// Kill ring calls. Would be better to use NSKillRing.h, but that's not // Kill ring calls. Would be better to use NSKillRing.h, but that's not
@@ -39,38 +40,53 @@ @@ -39,38 +40,53 @@ NSString* _NSYankFromKillRing();
void _NSNewKillRingSequence(); void _NSNewKillRingSequence();
void _NSSetKillRingToYankedState(); void _NSSetKillRingToYankedState();
} }
@ -92,7 +92,7 @@ index 7a1260db0a139f9f3f8a823af2c220f36162812a..bf9cf7046e2fc9cdfee5b92f2a348185
namespace blink { namespace blink {
@@ -73,10 +75,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, @@ -73,10 +75,12 @@ bool ThemePainterMac::PaintTextField(const Node* node,
// behavior change while remaining a fragile solution. // behavior change while remaining a fragile solution.
// https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3 // https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3
if (!use_ns_text_field_cell) { if (!use_ns_text_field_cell) {
@ -105,7 +105,7 @@ index 7a1260db0a139f9f3f8a823af2c220f36162812a..bf9cf7046e2fc9cdfee5b92f2a348185
return false; return false;
} }
@@ -162,10 +166,12 @@ void _NSDrawCarbonThemeListBox(NSRect frame, @@ -162,10 +166,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node,
const PaintInfo& paint_info, const PaintInfo& paint_info,
const IntRect& r) { const IntRect& r) {
LocalCurrentGraphicsContext local_context(paint_info.context, r); LocalCurrentGraphicsContext local_context(paint_info.context, r);

View file

@ -7,10 +7,10 @@ Guard usages in blink of private Mac APIs by MAS_BUILD, so they can be
excluded for people who want to submit their apps to the Mac App store. excluded for people who want to submit their apps to the Mac App store.
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
index 44c85b5ad571c39c4580cb9d0cdf08f694c1dfb4..1714c403edf21092e43192f25cf0c19f50dd8486 100644 index d38fa48b8b890d90f2911995a2a51c249005c827..5fe68c71fe101a307ef565013a91b109393457dd 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.h --- a/content/browser/accessibility/browser_accessibility_cocoa.h
+++ b/content/browser/accessibility/browser_accessibility_cocoa.h +++ b/content/browser/accessibility/browser_accessibility_cocoa.h
@@ -111,7 +111,9 @@ struct AXTextEdit { @@ -109,7 +109,9 @@ struct AXTextEdit {
@property(nonatomic, readonly) NSNumber* enabled; @property(nonatomic, readonly) NSNumber* enabled;
// Returns a text marker that points to the last character in the document that // Returns a text marker that points to the last character in the document that
// can be selected with Voiceover. // can be selected with Voiceover.
@ -20,7 +20,7 @@ index 44c85b5ad571c39c4580cb9d0cdf08f694c1dfb4..1714c403edf21092e43192f25cf0c19f
@property(nonatomic, readonly) NSNumber* expanded; @property(nonatomic, readonly) NSNumber* expanded;
@property(nonatomic, readonly) NSNumber* focused; @property(nonatomic, readonly) NSNumber* focused;
@property(nonatomic, readonly) NSNumber* grabbed; @property(nonatomic, readonly) NSNumber* grabbed;
@@ -147,12 +149,16 @@ struct AXTextEdit { @@ -145,12 +147,16 @@ struct AXTextEdit {
@property(nonatomic, readonly) NSArray* selectedChildren; @property(nonatomic, readonly) NSArray* selectedChildren;
@property(nonatomic, readonly) NSString* selectedText; @property(nonatomic, readonly) NSString* selectedText;
@property(nonatomic, readonly) NSValue* selectedTextRange; @property(nonatomic, readonly) NSValue* selectedTextRange;
@ -38,10 +38,10 @@ index 44c85b5ad571c39c4580cb9d0cdf08f694c1dfb4..1714c403edf21092e43192f25cf0c19f
// is concerned. // is concerned.
@property(nonatomic, readonly) NSString* subrole; @property(nonatomic, readonly) NSString* subrole;
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c395228d33e4e 100644 index eba85655c0bae04c75a9f2fd1941c86f229a1195..b092982305132fc54d26008934eed38fe2ee0e38 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm --- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm +++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -135,6 +135,7 @@ @@ -136,6 +136,7 @@ NSDictionary* attributeToMethodNameMap = nil;
// VoiceOver uses -1 to mean "no limit" for AXResultsLimit. // VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
const int kAXResultsLimitNoLimit = -1; const int kAXResultsLimitNoLimit = -1;
@ -49,7 +49,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
extern "C" { extern "C" {
// The following are private accessibility APIs required for cursor navigation // The following are private accessibility APIs required for cursor navigation
@@ -341,6 +342,7 @@ void AddMisspelledTextAttributes( @@ -342,6 +343,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(
AddMisspelledTextAttributes(text_only_objects, attributed_text); AddMisspelledTextAttributes(text_only_objects, attributed_text);
return [attributed_text attributedSubstringFromRange:range]; return [attributed_text attributedSubstringFromRange:range];
} }
@ -57,7 +57,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
// Returns an autoreleased copy of the AXNodeData's attribute. // Returns an autoreleased copy of the AXNodeData's attribute.
NSString* NSStringForStringAttribute( NSString* NSStringForStringAttribute(
@@ -595,7 +597,9 @@ + (void)initialize { @@ -596,7 +598,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
{NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"}, {NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"},
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"}, {NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
{NSAccessibilityEnabledAttribute, @"enabled"}, {NSAccessibilityEnabledAttribute, @"enabled"},
@ -67,7 +67,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
{NSAccessibilityExpandedAttribute, @"expanded"}, {NSAccessibilityExpandedAttribute, @"expanded"},
{NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"}, {NSAccessibilityFocusableAncestorAttribute, @"focusableAncestor"},
{NSAccessibilityFocusedAttribute, @"focused"}, {NSAccessibilityFocusedAttribute, @"focused"},
@@ -630,13 +634,17 @@ + (void)initialize { @@ -631,13 +635,17 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
{NSAccessibilityRowsAttribute, @"rows"}, {NSAccessibilityRowsAttribute, @"rows"},
// TODO(aboxhall): expose // TODO(aboxhall): expose
// NSAccessibilityServesAsTitleForUIElementsAttribute // NSAccessibilityServesAsTitleForUIElementsAttribute
@ -85,7 +85,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
{NSAccessibilitySizeAttribute, @"size"}, {NSAccessibilitySizeAttribute, @"size"},
{NSAccessibilitySortDirectionAttribute, @"sortDirection"}, {NSAccessibilitySortDirectionAttribute, @"sortDirection"},
{NSAccessibilitySubroleAttribute, @"subrole"}, {NSAccessibilitySubroleAttribute, @"subrole"},
@@ -1117,6 +1125,7 @@ - (NSNumber*)enabled { @@ -1071,6 +1079,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
ax::mojom::Restriction::kDisabled]; ax::mojom::Restriction::kDisabled];
} }
@ -93,7 +93,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
// Returns a text marker that points to the last character in the document that // Returns a text marker that points to the last character in the document that
// can be selected with VoiceOver. // can be selected with VoiceOver.
- (id)endTextMarker { - (id)endTextMarker {
@@ -1127,6 +1136,7 @@ - (id)endTextMarker { @@ -1081,6 +1090,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtEndOfAnchor()); return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
} }
@ -101,7 +101,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
- (NSNumber*)expanded { - (NSNumber*)expanded {
if (![self instanceActive]) if (![self instanceActive])
@@ -2036,6 +2046,7 @@ - (NSValue*)selectedTextRange { @@ -1943,6 +1953,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)]; return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
} }
@ -109,7 +109,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
- (id)selectedTextMarkerRange { - (id)selectedTextMarkerRange {
if (![self instanceActive]) if (![self instanceActive])
return nil; return nil;
@@ -2068,6 +2079,7 @@ - (id)selectedTextMarkerRange { @@ -1975,6 +1986,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
anchorAffinity, *focusObject, anchorAffinity, *focusObject,
focusOffset, focusAffinity)); focusOffset, focusAffinity));
} }
@ -117,7 +117,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
- (NSValue*)size { - (NSValue*)size {
if (![self instanceActive]) if (![self instanceActive])
@@ -2100,6 +2112,7 @@ - (NSString*)sortDirection { @@ -2007,6 +2019,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return nil; return nil;
} }
@ -125,7 +125,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
// Returns a text marker that points to the first character in the document that // Returns a text marker that points to the first character in the document that
// can be selected with VoiceOver. // can be selected with VoiceOver.
- (id)startTextMarker { - (id)startTextMarker {
@@ -2110,6 +2123,7 @@ - (id)startTextMarker { @@ -2017,6 +2030,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0); BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtStartOfAnchor()); return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
} }
@ -133,7 +133,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
// Returns a subrole based upon the role. // Returns a subrole based upon the role.
- (NSString*) subrole { - (NSString*) subrole {
@@ -2418,12 +2432,14 @@ - (NSAttributedString*)attributedValueForRange:(NSRange)range { @@ -2338,12 +2352,14 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
NSMutableAttributedString* attributedValue = NSMutableAttributedString* attributedValue =
[[[NSMutableAttributedString alloc] initWithString:value] autorelease]; [[[NSMutableAttributedString alloc] initWithString:value] autorelease];
@ -148,15 +148,15 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
return [attributedValue attributedSubstringFromRange:range]; return [attributedValue attributedSubstringFromRange:range];
} }
@@ -2540,6 +2556,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute @@ -2429,6 +2445,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return nil; return ToBrowserAccessibilityCocoa(cell);
} }
+#ifndef MAS_BUILD +#ifndef MAS_BUILD
if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) { if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
BrowserAccessibilityPositionInstance position = BrowserAccessibilityPositionInstance position =
CreatePositionFromTextMarker(parameter); CreatePositionFromTextMarker(parameter);
@@ -2717,6 +2734,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute @@ -2606,6 +2623,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
NSString* text = GetTextForTextMarkerRange(parameter); NSString* text = GetTextForTextMarkerRange(parameter);
return [NSNumber numberWithInt:[text length]]; return [NSNumber numberWithInt:[text length]];
} }
@ -164,7 +164,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
if ([attribute isEqualToString: if ([attribute isEqualToString:
NSAccessibilityBoundsForRangeParameterizedAttribute]) { NSAccessibilityBoundsForRangeParameterizedAttribute]) {
@@ -2754,6 +2772,7 @@ - (id)accessibilityAttributeValue:(NSString*)attribute @@ -2639,6 +2657,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return nil; return nil;
} }
@ -172,7 +172,7 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
if ([attribute isEqualToString: if ([attribute isEqualToString:
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) { NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
BrowserAccessibilityPositionInstance position = BrowserAccessibilityPositionInstance position =
@@ -2833,6 +2852,7 @@ AXPlatformRange range(position->CreatePreviousLineStartPosition( @@ -2714,6 +2733,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return @(child->GetIndexInParent()); return @(child->GetIndexInParent());
} }
@ -181,10 +181,10 @@ index ec60dd6b8f2500ac812654817f76cef26636d911..4c8c2cca0a15ad27c655fad98a6c3952
return nil; return nil;
} }
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm
index ace4792b6861452555e819a2412303e3495c2018..b258a8302e85e8eee04b23106616a825b344e32f 100644 index e61ed97ed0c5652f5b8bd5763a401a32a3b8118d..6e51684b8641ec452bf430850a52556af5d73066 100644
--- a/content/browser/accessibility/browser_accessibility_manager_mac.mm --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm
+++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -462,6 +462,7 @@ void PostAnnouncementNotification(NSString* announcement) { @@ -462,6 +462,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
[user_info setObject:native_focus_object [user_info setObject:native_focus_object
forKey:NSAccessibilityTextChangeElement]; forKey:NSAccessibilityTextChangeElement];
@ -192,7 +192,7 @@ index ace4792b6861452555e819a2412303e3495c2018..b258a8302e85e8eee04b23106616a825
id selected_text = [native_focus_object selectedTextMarkerRange]; id selected_text = [native_focus_object selectedTextMarkerRange];
if (selected_text) { if (selected_text) {
NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute = NSString* const NSAccessibilitySelectedTextMarkerRangeAttribute =
@@ -469,6 +470,7 @@ void PostAnnouncementNotification(NSString* announcement) { @@ -469,6 +470,7 @@ NSDictionary* BrowserAccessibilityManagerMac::
[user_info setObject:selected_text [user_info setObject:selected_text
forKey:NSAccessibilitySelectedTextMarkerRangeAttribute]; forKey:NSAccessibilitySelectedTextMarkerRangeAttribute];
} }
@ -216,7 +216,7 @@ index b7142c2871faf4a0ba8be79266e9515d81585bdd..3d80c332e9af280a166612f6be54b6f7
namespace content { namespace content {
@@ -35,6 +37,7 @@ @@ -35,6 +37,7 @@ namespace {
// verifies there are no existing open connections), and then indicates that // verifies there are no existing open connections), and then indicates that
// Chrome should continue execution without access to launchservicesd. // Chrome should continue execution without access to launchservicesd.
void DisableSystemServices() { void DisableSystemServices() {
@ -233,10 +233,10 @@ index b7142c2871faf4a0ba8be79266e9515d81585bdd..3d80c332e9af280a166612f6be54b6f7
// You are about to read a pretty disgusting hack. In a static initializer, // You are about to read a pretty disgusting hack. In a static initializer,
diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm diff --git a/device/bluetooth/bluetooth_adapter_mac.mm b/device/bluetooth/bluetooth_adapter_mac.mm
index 24a63be8a4be4f74f78fec810490d16cffaf43c1..414423de009d14ac6ac7bab2a260b3e0d7085d1f 100644 index fafb98764b562c335733eac9998d9edfda69e38d..43666a8e70808297ecbd2b65d6f2c73029e40677 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm --- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm +++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -34,6 +34,7 @@ @@ -37,6 +37,7 @@
#include "device/bluetooth/bluetooth_low_energy_peripheral_manager_delegate.h" #include "device/bluetooth/bluetooth_low_energy_peripheral_manager_delegate.h"
#include "device/bluetooth/bluetooth_socket_mac.h" #include "device/bluetooth/bluetooth_socket_mac.h"
@ -244,7 +244,7 @@ index 24a63be8a4be4f74f78fec810490d16cffaf43c1..414423de009d14ac6ac7bab2a260b3e0
extern "C" { extern "C" {
// Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and // Undocumented IOBluetooth Preference API [1]. Used by `blueutil` [2] and
// `Karabiner` [3] to programmatically control the Bluetooth state. Calling the // `Karabiner` [3] to programmatically control the Bluetooth state. Calling the
@@ -47,6 +48,7 @@ @@ -50,6 +51,7 @@ extern "C" {
// [4] https://support.apple.com/kb/PH25091 // [4] https://support.apple.com/kb/PH25091
void IOBluetoothPreferenceSetControllerPowerState(int state); void IOBluetoothPreferenceSetControllerPowerState(int state);
} }
@ -252,7 +252,7 @@ index 24a63be8a4be4f74f78fec810490d16cffaf43c1..414423de009d14ac6ac7bab2a260b3e0
namespace { namespace {
@@ -120,8 +122,10 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { @@ -129,8 +131,10 @@ BluetoothAdapterMac::BluetoothAdapterMac()
controller_state_function_( controller_state_function_(
base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState, base::BindRepeating(&BluetoothAdapterMac::GetHostControllerState,
base::Unretained(this))), base::Unretained(this))),
@ -263,7 +263,7 @@ index 24a63be8a4be4f74f78fec810490d16cffaf43c1..414423de009d14ac6ac7bab2a260b3e0
should_update_name_(true), should_update_name_(true),
classic_discovery_manager_( classic_discovery_manager_(
BluetoothDiscoveryManagerMac::CreateClassic(this)), BluetoothDiscoveryManagerMac::CreateClassic(this)),
@@ -317,8 +321,12 @@ CBCentralManagerState GetCBManagerState(CBCentralManager* manager) { @@ -328,8 +332,12 @@ bool BluetoothAdapterMac::IsLowEnergyAvailable() {
} }
bool BluetoothAdapterMac::SetPoweredImpl(bool powered) { bool BluetoothAdapterMac::SetPoweredImpl(bool powered) {
@ -277,10 +277,10 @@ index 24a63be8a4be4f74f78fec810490d16cffaf43c1..414423de009d14ac6ac7bab2a260b3e0
void BluetoothAdapterMac::RemovePairingDelegateInternal( void BluetoothAdapterMac::RemovePairingDelegateInternal(
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index 38e7bb1d7f4ac8ddede73fcb2d64ff3ea25205d7..c1a9026b1fb8610546b682b4d677871482327e63 100644 index 69dd2acc69142a5098b8583e7550044210375cc7..02c092c3f32707c0c889d02f086d45eede86e292 100644
--- a/media/audio/BUILD.gn --- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn
@@ -202,6 +202,12 @@ source_set("audio") { @@ -206,6 +206,12 @@ source_set("audio") {
"mac/scoped_audio_unit.cc", "mac/scoped_audio_unit.cc",
"mac/scoped_audio_unit.h", "mac/scoped_audio_unit.h",
] ]
@ -294,10 +294,10 @@ index 38e7bb1d7f4ac8ddede73fcb2d64ff3ea25205d7..c1a9026b1fb8610546b682b4d6778714
"AudioToolbox.framework", "AudioToolbox.framework",
"AudioUnit.framework", "AudioUnit.framework",
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 31f593c59087969c3879b1da5a3de1eedcffc3a3..3bc29f5a5560b4436ebe70924bf10354e0b6be99 100644 index a1091960873dad8bb1b0129d20a552bf8a51739f..50bb186d1474fd4c90723ac97ac93b1d271e7a3b 100644
--- a/media/audio/mac/audio_manager_mac.cc --- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc
@@ -868,7 +868,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters( @@ -877,7 +877,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
void AudioManagerMac::InitializeOnAudioThread() { void AudioManagerMac::InitializeOnAudioThread() {
DCHECK(GetTaskRunner()->BelongsToCurrentThread()); DCHECK(GetTaskRunner()->BelongsToCurrentThread());
@ -307,7 +307,7 @@ index 31f593c59087969c3879b1da5a3de1eedcffc3a3..3bc29f5a5560b4436ebe70924bf10354
} }
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index 1b947c5b63564ac87cc3fb5a0d060e41a5407b4a..2bf92efa3c77ac13383dd904ba2a24081deccd04 100644 index c51a6320b0a19f220ac3a210909df1f89ce979b1..c3ef7e7633cf0dc8af8cd3b1e828df549c7e48cb 100644
--- a/net/dns/dns_config_service_posix.cc --- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc
@@ -243,6 +243,7 @@ class DnsConfigServicePosix::Watcher { @@ -243,6 +243,7 @@ class DnsConfigServicePosix::Watcher {

View file

@ -5,10 +5,10 @@ Subject: net_url_request_job.patch
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 7a223958751012b2042a91edf85578b00702d565..08a3940915c61746c7bf80d24400875099f9686c 100644 index c75471c5dce778b2338290ae1fdfff5ebbc16f7b..df79df6d765d4957e2489e8ee6ddc1e77f07efc7 100644
--- a/net/url_request/url_request_job.h --- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h +++ b/net/url_request/url_request_job.h
@@ -292,6 +292,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver { @@ -293,6 +293,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
void OnCallToDelegate(NetLogEventType type); void OnCallToDelegate(NetLogEventType type);
void OnCallToDelegateComplete(); void OnCallToDelegateComplete();

View file

@ -7,10 +7,10 @@ Do not check for unique origin in CacheStorage, in Electron we may have
scripts running without an origin. scripts running without an origin.
diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
index 5371daf3c552d4ad506439ba6e37b80a353b1036..bd5a480552fd420d5d15f97a39b08e693edff22d 100644 index 334699f5f3832cbb90f595e31de0f443c6e62d26..4c5c7ec26b67afcf804649e3441cbb53c96e5956 100644
--- a/content/browser/cache_storage/cache_storage.cc --- a/content/browser/cache_storage/cache_storage.cc
+++ b/content/browser/cache_storage/cache_storage.cc +++ b/content/browser/cache_storage/cache_storage.cc
@@ -133,7 +133,7 @@ class CacheStorage::CacheLoader { @@ -130,7 +130,7 @@ class CacheStorage::CacheLoader {
cache_storage_(cache_storage), cache_storage_(cache_storage),
origin_(origin), origin_(origin),
owner_(owner) { owner_(owner) {

View file

@ -6,7 +6,7 @@ Subject: pass RenderProcessHost through to PlatformNotificationService
this is so Electron can identify which renderer a notification came from this is so Electron can identify which renderer a notification came from
diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc
index 2a4592f1565b99db37e91e090b5478fd1ad6e1a7..8a4144153789f4174763e3b23d47080521b0c20e 100644 index 8d742bb1ed991e386073879c33142bb93d3b4e29..bdc435353751241c528b7331e37f76e90cb1becb 100644
--- a/content/browser/notifications/blink_notification_service_impl.cc --- a/content/browser/notifications/blink_notification_service_impl.cc
+++ b/content/browser/notifications/blink_notification_service_impl.cc +++ b/content/browser/notifications/blink_notification_service_impl.cc
@@ -48,9 +48,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl( @@ -48,9 +48,11 @@ BlinkNotificationServiceImpl::BlinkNotificationServiceImpl(

View file

@ -5,10 +5,10 @@ Subject: out_of_process_instance.patch
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index 788082cd637aaf75f6ecc0a7d10977939f2b3e18..1a831ae135084f8cd04c2df62288300070585959 100644 index ef12260b6a7fd996ac5601f0c3a2db6bca38a46b..12e25f4332eb421cac8797f2d1403592771547f0 100644
--- a/pdf/out_of_process_instance.cc --- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc
@@ -468,7 +468,9 @@ bool OutOfProcessInstance::Init(uint32_t argc, @@ -462,7 +462,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
std::string document_url = document_url_var.AsString(); std::string document_url = document_url_var.AsString();
base::StringPiece document_url_piece(document_url); base::StringPiece document_url_piece(document_url);
is_print_preview_ = IsPrintPreviewUrl(document_url_piece); is_print_preview_ = IsPrintPreviewUrl(document_url_piece);

View file

@ -435,12 +435,12 @@ index d63e90b6c5079ab3237c4bad3d5e63ce2f99c657..c98a7bd07ddd9527fc67b05b24463ed4
return nullptr; return nullptr;
} }
diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 66a532e2cb41cdbae83410dad95984cf02de4a67..e776d0e96c4a5e6523161a66a5c9a1c0e4ad2132 100644 index 42248eae343754988e2461ef0fb080b6d0edafdf..bb768481e0721d742c105bf18405ddcd357f794d 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc --- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc +++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -13,7 +13,9 @@ @@ -13,7 +13,9 @@
#include "base/macros.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "base/no_destructor.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
+#if 0 +#if 0
#include "components/pdf/renderer/pepper_pdf_host.h" #include "components/pdf/renderer/pepper_pdf_host.h"
@ -448,7 +448,7 @@ index 66a532e2cb41cdbae83410dad95984cf02de4a67..e776d0e96c4a5e6523161a66a5c9a1c0
#include "content/public/renderer/pepper_plugin_instance.h" #include "content/public/renderer/pepper_plugin_instance.h"
#include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_thread.h"
#include "content/public/renderer/renderer_ppapi_host.h" #include "content/public/renderer/renderer_ppapi_host.h"
@@ -130,9 +132,11 @@ bool IsSimpleHeader(const std::string& lower_case_header_name, @@ -132,9 +134,11 @@ bool IsSimpleHeader(const std::string& lower_case_header_name,
} }
void RecordFlashNavigateUsage(FlashNavigateUsage usage) { void RecordFlashNavigateUsage(FlashNavigateUsage usage) {
@ -460,7 +460,7 @@ index 66a532e2cb41cdbae83410dad95984cf02de4a67..e776d0e96c4a5e6523161a66a5c9a1c0
} }
} // namespace } // namespace
@@ -374,6 +378,8 @@ int32_t PepperFlashRendererHost::OnIsRectTopmost( @@ -376,6 +380,8 @@ int32_t PepperFlashRendererHost::OnIsRectTopmost(
int32_t PepperFlashRendererHost::OnInvokePrinting( int32_t PepperFlashRendererHost::OnInvokePrinting(
ppapi::host::HostMessageContext* host_context) { ppapi::host::HostMessageContext* host_context) {

View file

@ -166,7 +166,7 @@ index fa8d5a178aee2399c05d4f31b42edbc563883355..a6d1430c74e6d52abf3ceaf95678fef0
bool printing_succeeded_; bool printing_succeeded_;
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index b21042ead358362267d81dc0c5a76ab35dccd9b8..2db39f368950b73a8df9dc7127b7d3d93d9a7dd0 100644 index e415483aaee80c0c797b04f49b69060e33253546..77dce4d5acbc6c3d9e7167480771db7ca64314fc 100644
--- a/chrome/browser/printing/printing_message_filter.cc --- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -177,7 +177,7 @@ index b21042ead358362267d81dc0c5a76ab35dccd9b8..2db39f368950b73a8df9dc7127b7d3d9
#include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents.h"
#include "content/public/common/child_process_host.h" #include "content/public/common/child_process_host.h"
@@ -96,20 +97,23 @@ PrintViewManager* GetPrintViewManager(int render_process_id, @@ -100,20 +101,23 @@ PrintViewManager* GetPrintViewManager(int render_process_id,
} // namespace } // namespace
@ -204,7 +204,7 @@ index b21042ead358362267d81dc0c5a76ab35dccd9b8..2db39f368950b73a8df9dc7127b7d3d9
} }
PrintingMessageFilter::~PrintingMessageFilter() { PrintingMessageFilter::~PrintingMessageFilter() {
@@ -190,11 +194,13 @@ void PrintingMessageFilter::OnTempFileForPrintingWritten(int render_frame_id, @@ -194,11 +198,13 @@ void PrintingMessageFilter::OnTempFileForPrintingWritten(int render_frame_id,
void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { void PrintingMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
scoped_refptr<PrinterQuery> printer_query; scoped_refptr<PrinterQuery> printer_query;
@ -218,7 +218,7 @@ index b21042ead358362267d81dc0c5a76ab35dccd9b8..2db39f368950b73a8df9dc7127b7d3d9
printer_query = queue_->PopPrinterQuery(0); printer_query = queue_->PopPrinterQuery(0);
if (!printer_query.get()) { if (!printer_query.get()) {
printer_query = printer_query =
@@ -303,11 +309,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings( @@ -311,11 +317,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(
std::unique_ptr<base::DictionaryValue> new_settings(job_settings.DeepCopy()); std::unique_ptr<base::DictionaryValue> new_settings(job_settings.DeepCopy());
scoped_refptr<PrinterQuery> printer_query; scoped_refptr<PrinterQuery> printer_query;
@ -232,7 +232,7 @@ index b21042ead358362267d81dc0c5a76ab35dccd9b8..2db39f368950b73a8df9dc7127b7d3d9
printer_query = queue_->PopPrinterQuery(document_cookie); printer_query = queue_->PopPrinterQuery(document_cookie);
if (!printer_query.get()) { if (!printer_query.get()) {
printer_query = queue_->CreatePrinterQuery( printer_query = queue_->CreatePrinterQuery(
@@ -366,7 +374,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( @@ -374,7 +382,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids, void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids,
bool* cancel) { bool* cancel) {
@ -283,21 +283,21 @@ index 7dd892feb181293d3c52fb6a3fd9600c899ee2d3..1ca51744e1046e5dfbedf5af8c6f7535
// Like PrintMsg_PrintPages, but using the print preview document's frame/node. // Like PrintMsg_PrintPages, but using the print preview document's frame/node.
IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog) IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08f762f9be 100644 index 9fb226cdf1db9a6651ca28f1bcfa7ec128bb6291..7f8907349e00b04dbdebb538ba4eb6cd89404fd4 100644
--- a/components/printing/renderer/print_render_frame_helper.cc --- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -1045,7 +1045,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { @@ -1132,7 +1132,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
web_frame->DispatchBeforePrintEvent(); web_frame->DispatchBeforePrintEvent();
if (!weak_this) if (!weak_this)
return; return;
- Print(web_frame, blink::WebNode(), true /* is_scripted? */); - Print(web_frame, blink::WebNode(), PrintRequestType::kScripted);
+ Print(web_frame, blink::WebNode(), true /* is_scripted? */, + Print(web_frame, blink::WebNode(), PrintRequestType::kScripted,
+ false /* silent */, false /* print_background */, + false /* silent */, false /* print_background */,
+ base::DictionaryValue() /* new_settings */); + base::DictionaryValue() /* new_settings */);
if (weak_this) if (weak_this)
web_frame->DispatchAfterPrintEvent(); web_frame->DispatchAfterPrintEvent();
} }
@@ -1093,7 +1095,10 @@ void PrintRenderFrameHelper::OnDestruct() { @@ -1180,7 +1182,10 @@ void PrintRenderFrameHelper::OnDestruct() {
delete this; delete this;
} }
@ -309,27 +309,26 @@ index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
return; return;
@@ -1106,7 +1111,8 @@ void PrintRenderFrameHelper::OnPrintPages() { @@ -1193,7 +1198,8 @@ void PrintRenderFrameHelper::OnPrintPages() {
// If we are printing a PDF extension frame, find the plugin node and print // If we are printing a PDF extension frame, find the plugin node and print
// that instead. // that instead.
auto plugin = delegate_->GetPdfElement(frame); auto plugin = delegate_->GetPdfElement(frame);
- Print(frame, plugin, false /* is_scripted? */); - Print(frame, plugin, PrintRequestType::kRegular);
+ Print(frame, plugin, false /* is_scripted? */, + Print(frame, plugin, PrintRequestType::kRegular,
+ silent, print_background, settings); + silent, print_background, settings);
if (weak_this) if (weak_this)
frame->DispatchAfterPrintEvent(); frame->DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and // WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1122,7 +1128,8 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() { @@ -1210,7 +1216,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() {
return;
} }
auto weak_this = weak_ptr_factory_.GetWeakPtr(); auto weak_this = weak_ptr_factory_.GetWeakPtr();
- Print(frame, print_preview_context_.source_node(), false); Print(frame, print_preview_context_.source_node(),
+ Print(frame, print_preview_context_.source_node(), false, - PrintRequestType::kRegular);
+ false, false, base::DictionaryValue()); + PrintRequestType::kRegular, false, false, base::DictionaryValue());
if (weak_this) if (weak_this)
frame->DispatchAfterPrintEvent(); frame->DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and // WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1158,6 +1165,8 @@ void PrintRenderFrameHelper::OnPrintPreview( @@ -1246,6 +1252,8 @@ void PrintRenderFrameHelper::OnPrintPreview(
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
return; return;
@ -338,30 +337,31 @@ index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08
print_preview_context_.OnPrintPreview(); print_preview_context_.OnPrintPreview();
UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent", UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
@@ -1543,7 +1552,9 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { @@ -1631,7 +1639,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
auto self = weak_ptr_factory_.GetWeakPtr(); auto self = weak_ptr_factory_.GetWeakPtr();
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
- false /* is_scripted? */); - PrintRequestType::kRegular);
+ false /* is_scripted? */, false /* silent */, + PrintRequestType::kRegular,
+ false /* silent */,
+ false /* print_background */, + false /* print_background */,
+ base::DictionaryValue() /* new_settings */); + base::DictionaryValue() /* new_settings */);
// Check if |this| is still valid. // Check if |this| is still valid.
if (!self) if (!self)
return; return;
@@ -1554,7 +1565,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { @@ -1642,7 +1653,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node, const blink::WebNode& node,
- bool is_scripted) { - PrintRequestType print_request_type) {
+ bool is_scripted, + PrintRequestType print_request_type,
+ bool silent, + bool silent,
+ bool print_background, + bool print_background,
+ const base::DictionaryValue& settings) { + const base::DictionaryValue& settings) {
// If still not finished with earlier print request simply ignore. // If still not finished with earlier print request simply ignore.
if (prep_frame_view_) if (prep_frame_view_)
return; return;
@@ -1562,7 +1576,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -1650,7 +1664,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
FrameReference frame_ref(frame); FrameReference frame_ref(frame);
int expected_page_count = 0; int expected_page_count = 0;
@ -370,19 +370,19 @@ index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08
DidFinishPrinting(FAIL_PRINT_INIT); DidFinishPrinting(FAIL_PRINT_INIT);
return; // Failed to init print page settings. return; // Failed to init print page settings.
} }
@@ -1582,8 +1596,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -1670,8 +1684,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
PrintMsg_PrintPages_Params print_settings; PrintMsg_PrintPages_Params print_settings;
auto self = weak_ptr_factory_.GetWeakPtr(); auto self = weak_ptr_factory_.GetWeakPtr();
- GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count, - GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
- is_scripted, &print_settings); - print_request_type, &print_settings);
+ if (!silent) + if (!silent)
+ GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count, + GetPrintSettingsFromUser(frame_ref.GetFrame(), node, expected_page_count,
+ is_scripted, &print_settings); + print_request_type, &print_settings);
// Check if |this| is still valid. // Check if |this| is still valid.
if (!self) if (!self)
return; return;
@@ -1593,6 +1608,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -1681,6 +1696,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
? blink::kWebPrintScalingOptionSourceSize ? blink::kWebPrintScalingOptionSourceSize
: scaling_option; : scaling_option;
SetPrintPagesParams(print_settings); SetPrintPagesParams(print_settings);
@ -390,7 +390,7 @@ index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08
if (print_settings.params.dpi.IsEmpty() || if (print_settings.params.dpi.IsEmpty() ||
!print_settings.params.document_cookie) { !print_settings.params.document_cookie) {
DidFinishPrinting(OK); // Release resources and fail silently on failure. DidFinishPrinting(OK); // Release resources and fail silently on failure.
@@ -1781,10 +1797,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages( @@ -1871,10 +1887,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
return printed_pages; return printed_pages;
} }
@ -418,7 +418,7 @@ index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08
// Check if the printer returned any settings, if the settings is empty, we // Check if the printer returned any settings, if the settings is empty, we
// can safely assume there are no printer drivers configured. So we safely // can safely assume there are no printer drivers configured. So we safely
// terminate. // terminate.
@@ -1804,12 +1834,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { @@ -1894,12 +1924,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
return result; return result;
} }
@ -431,17 +431,17 @@ index c888622c024fe3629705d136def7f8ef4cdc0cbf..d238b12d8409de01a7208c6bf404fc08
+ int* number_of_pages, + int* number_of_pages,
+ const base::DictionaryValue& settings) { + const base::DictionaryValue& settings) {
DCHECK(frame); DCHECK(frame);
bool fit_to_paper_size = !(PrintingNodeOrPdfFrame(frame, node)); bool fit_to_paper_size = !PrintingNodeOrPdfFrame(frame, node);
- if (!InitPrintSettings(fit_to_paper_size)) { - if (!InitPrintSettings(fit_to_paper_size)) {
+ if (!InitPrintSettings(fit_to_paper_size, settings)) { + if (!InitPrintSettings(fit_to_paper_size, settings)) {
notify_browser_of_print_failure_ = false; notify_browser_of_print_failure_ = false;
Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id())); Send(new PrintHostMsg_ShowInvalidPrinterSettingsError(routing_id()));
return false; return false;
diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
index ff6423d51151ce84c291ed31a8e99c1c6effcd4f..e4d3b382877318775554f1ffaf8885de1c21aade 100644 index 34690801675c8b049d195e37f4fa400c6b30a644..2587534c550612809a4235f4ff92cc6fa962765c 100644
--- a/components/printing/renderer/print_render_frame_helper.h --- a/components/printing/renderer/print_render_frame_helper.h
+++ b/components/printing/renderer/print_render_frame_helper.h +++ b/components/printing/renderer/print_render_frame_helper.h
@@ -187,7 +187,9 @@ class PrintRenderFrameHelper @@ -192,7 +192,9 @@ class PrintRenderFrameHelper
bool OnMessageReceived(const IPC::Message& message) override; bool OnMessageReceived(const IPC::Message& message) override;
// Message handlers --------------------------------------------------------- // Message handlers ---------------------------------------------------------
@ -452,19 +452,19 @@ index ff6423d51151ce84c291ed31a8e99c1c6effcd4f..e4d3b382877318775554f1ffaf8885de
void OnPrintForSystemDialog(); void OnPrintForSystemDialog();
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
void OnInitiatePrintPreview(bool has_selection); void OnInitiatePrintPreview(bool has_selection);
@@ -239,7 +241,10 @@ class PrintRenderFrameHelper @@ -243,7 +245,10 @@ class PrintRenderFrameHelper
// WARNING: |this| may be gone after this method returns. // WARNING: |this| may be gone after this method returns.
void Print(blink::WebLocalFrame* frame, void Print(blink::WebLocalFrame* frame,
const blink::WebNode& node, const blink::WebNode& node,
- bool is_scripted); - PrintRequestType print_request_type);
+ bool is_scripted, + PrintRequestType print_request_type,
+ bool silent, + bool silent,
+ bool print_background, + bool print_background,
+ const base::DictionaryValue& settings); + const base::DictionaryValue& settings);
// Notification when printing is done - signal tear-down/free resources. // Notification when printing is done - signal tear-down/free resources.
void DidFinishPrinting(PrintingResult result); void DidFinishPrinting(PrintingResult result);
@@ -248,12 +253,14 @@ class PrintRenderFrameHelper @@ -252,12 +257,14 @@ class PrintRenderFrameHelper
// Initialize print page settings with default settings. // Initialize print page settings with default settings.
// Used only for native printing workflow. // Used only for native printing workflow.

View file

@ -5,10 +5,10 @@ Subject: render_widget_host_view_base.patch
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index e155153ec1eec9d28242e9ab95c9d75a0d3f40d7..fab1bcd2d8176cdd7163e329552a0a848c601290 100644 index 20733af1a1d9cae2c13a381b61aa4aecfebb0877..1b7404c2f05a0225c6dd55aacc7e8b31290ef68f 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc --- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -656,6 +656,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint( @@ -657,6 +657,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint(
return frame_sink_id.is_valid() ? frame_sink_id : GetFrameSinkId(); return frame_sink_id.is_valid() ? frame_sink_id : GetFrameSinkId();
} }
@ -25,10 +25,10 @@ index e155153ec1eec9d28242e9ab95c9d75a0d3f40d7..fab1bcd2d8176cdd7163e329552a0a84
const blink::WebMouseEvent& event, const blink::WebMouseEvent& event,
const ui::LatencyInfo& latency) { const ui::LatencyInfo& latency) {
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
index c48b0aa86d8acea34dfece9212da4e7b11ffdb64..115b5647dfc13eb14e4d560c1fb71b926b5af829 100644 index 62bc30a0539f2e0d5b9e86716fe1be9b45726ff7..4b2111b57ca1bf10f5bc4d2589bd23964fa34d62 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h --- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -22,8 +22,10 @@ @@ -23,8 +23,10 @@
#include "components/viz/common/surfaces/surface_id.h" #include "components/viz/common/surfaces/surface_id.h"
#include "components/viz/host/hit_test/hit_test_query.h" #include "components/viz/host/hit_test/hit_test_query.h"
#include "content/browser/renderer_host/event_with_latency_info.h" #include "content/browser/renderer_host/event_with_latency_info.h"
@ -39,7 +39,7 @@ index c48b0aa86d8acea34dfece9212da4e7b11ffdb64..115b5647dfc13eb14e4d560c1fb71b92
#include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/render_widget_host_view.h"
#include "content/public/common/input_event_ack_state.h" #include "content/public/common/input_event_ack_state.h"
#include "content/public/common/screen_info.h" #include "content/public/common/screen_info.h"
@@ -83,10 +85,12 @@ class CursorManager; @@ -84,10 +86,12 @@ class CursorManager;
class MouseWheelPhaseHandler; class MouseWheelPhaseHandler;
class RenderWidgetHostImpl; class RenderWidgetHostImpl;
class RenderWidgetHostViewBaseObserver; class RenderWidgetHostViewBaseObserver;
@ -52,7 +52,7 @@ index c48b0aa86d8acea34dfece9212da4e7b11ffdb64..115b5647dfc13eb14e4d560c1fb71b92
class WebCursor; class WebCursor;
class DelegatedFrameHost; class DelegatedFrameHost;
struct TextInputState; struct TextInputState;
@@ -145,6 +149,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -142,6 +146,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
TouchSelectionControllerClientManager* TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override; GetTouchSelectionControllerClientManager() override;
@ -62,7 +62,7 @@ index c48b0aa86d8acea34dfece9212da4e7b11ffdb64..115b5647dfc13eb14e4d560c1fb71b92
// This only needs to be overridden by RenderWidgetHostViewBase subclasses // This only needs to be overridden by RenderWidgetHostViewBase subclasses
// that handle content embedded within other RenderWidgetHostViews. // that handle content embedded within other RenderWidgetHostViews.
gfx::PointF TransformPointToRootCoordSpaceF( gfx::PointF TransformPointToRootCoordSpaceF(
@@ -369,6 +376,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase @@ -363,6 +370,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event, virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
const ui::LatencyInfo& latency); const ui::LatencyInfo& latency);

View file

@ -5,10 +5,10 @@ Subject: render_widget_host_view_mac.patch
diff --git a/content/browser/renderer_host/render_widget_host_view_cocoa.mm b/content/browser/renderer_host/render_widget_host_view_cocoa.mm diff --git a/content/browser/renderer_host/render_widget_host_view_cocoa.mm b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
index ee6cde8137b105e0951098b1aba0196398e935d3..5b0a6dd36810fae8ca2e055bafe736cb964b9cef 100644 index 040b482030aa4dcc91fb4ed0b97ef51acb78cfa5..36f35ae5eba37a24951540057069e32ac88d2980 100644
--- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm --- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm
+++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm +++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
@@ -106,6 +106,11 @@ void ExtractUnderlines(NSAttributedString* string, @@ -142,6 +142,11 @@ void ExtractUnderlines(NSAttributedString* string,
} // namespace } // namespace
@ -20,7 +20,7 @@ index ee6cde8137b105e0951098b1aba0196398e935d3..5b0a6dd36810fae8ca2e055bafe736cb
// These are not documented, so use only after checking -respondsToSelector:. // These are not documented, so use only after checking -respondsToSelector:.
@interface NSApplication (UndocumentedSpeechMethods) @interface NSApplication (UndocumentedSpeechMethods)
- (void)speakString:(NSString*)string; - (void)speakString:(NSString*)string;
@@ -284,6 +289,9 @@ - (BOOL)acceptsMouseEventsWhenInactive { @@ -401,6 +406,9 @@ void ExtractUnderlines(NSAttributedString* string,
} }
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent { - (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@ -30,7 +30,7 @@ index ee6cde8137b105e0951098b1aba0196398e935d3..5b0a6dd36810fae8ca2e055bafe736cb
return [self acceptsMouseEventsWhenInactive]; return [self acceptsMouseEventsWhenInactive];
} }
@@ -647,6 +655,10 @@ - (void)keyEvent:(NSEvent*)theEvent wasKeyEquivalent:(BOOL)equiv { @@ -763,6 +771,10 @@ void ExtractUnderlines(NSAttributedString* string,
eventType == NSKeyDown && eventType == NSKeyDown &&
!(modifierFlags & NSCommandKeyMask); !(modifierFlags & NSCommandKeyMask);
@ -41,7 +41,7 @@ index ee6cde8137b105e0951098b1aba0196398e935d3..5b0a6dd36810fae8ca2e055bafe736cb
// We only handle key down events and just simply forward other events. // We only handle key down events and just simply forward other events.
if (eventType != NSKeyDown) { if (eventType != NSKeyDown) {
clientHelper_->ForwardKeyboardEvent(event, latency_info); clientHelper_->ForwardKeyboardEvent(event, latency_info);
@@ -1419,9 +1431,11 @@ - (id)accessibilityFocusedUIElement { @@ -1503,9 +1515,11 @@ void ExtractUnderlines(NSAttributedString* string,
// Since this implementation doesn't have to wait any IPC calls, this doesn't // Since this implementation doesn't have to wait any IPC calls, this doesn't
// make any key-typing jank. --hbono 7/23/09 // make any key-typing jank. --hbono 7/23/09
// //
@ -53,7 +53,7 @@ index ee6cde8137b105e0951098b1aba0196398e935d3..5b0a6dd36810fae8ca2e055bafe736cb
- (NSArray*)validAttributesForMarkedText { - (NSArray*)validAttributesForMarkedText {
// This code is just copied from WebKit except renaming variables. // This code is just copied from WebKit except renaming variables.
@@ -1430,7 +1444,10 @@ - (NSArray*)validAttributesForMarkedText { @@ -1514,7 +1528,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
initWithObjects:NSUnderlineStyleAttributeName, initWithObjects:NSUnderlineStyleAttributeName,
NSUnderlineColorAttributeName, NSUnderlineColorAttributeName,
NSMarkedClauseSegmentAttributeName, NSMarkedClauseSegmentAttributeName,
@ -66,10 +66,10 @@ index ee6cde8137b105e0951098b1aba0196398e935d3..5b0a6dd36810fae8ca2e055bafe736cb
return validAttributesForMarkedText_.get(); return validAttributesForMarkedText_.get();
} }
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 94d6e79377d354bc8c3041d4e9ffa21a29caea0c..38574877ab366c45a86e635adb4f39bcb7e05acb 100644 index 86e898d4591d3fd8af325f7f204d0f19b019238e..9103cb06553d86fb8fe4c22c05ad88925e09891d 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -55,6 +55,7 @@ @@ -61,6 +61,7 @@
#include "ui/events/keycodes/dom/dom_keyboard_layout_map.h" #include "ui/events/keycodes/dom/dom_keyboard_layout_map.h"
#include "ui/gfx/geometry/dip_util.h" #include "ui/gfx/geometry/dip_util.h"
#include "ui/gfx/mac/coordinate_conversion.h" #include "ui/gfx/mac/coordinate_conversion.h"

View file

@ -52,10 +52,19 @@ Some alternatives to this patch:
None of these options seems like a substantial maintainability win over this patch to me (@nornagon). None of these options seems like a substantial maintainability win over this patch to me (@nornagon).
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index abbab2664254c9be1ec5074463722c1365590cd0..03c3df58fb407a490ce3438cdc2f4168f3013a8f 100644 index b3ebd3da653f731094d1c1a88fdedeccfa9be682..dc0b51a3fd113ba363d1f7944d578fb85d174eb7 100644
--- a/chrome/BUILD.gn --- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn +++ b/chrome/BUILD.gn
@@ -1646,6 +1646,11 @@ if (is_chrome_branded && !is_android) { @@ -1634,7 +1634,7 @@ if (is_chrome_branded && !is_android) {
}
}
-if (!is_android) {
+if (!is_android && !is_electron_build) {
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1658,6 +1658,12 @@ if (!is_android) {
} }
} }
@ -63,15 +72,8 @@ index abbab2664254c9be1ec5074463722c1365590cd0..03c3df58fb407a490ce3438cdc2f4168
+ group("packed_resources") { + group("packed_resources") {
+ public_deps = [ "//electron:packed_resources" ] + public_deps = [ "//electron:packed_resources" ]
+ } + }
+} else {
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1667,6 +1672,7 @@ chrome_paks("packed_resources") {
]
}
}
+} +}
+
repack("browser_tests_pak") { repack("browser_tests_pak") {
sources = [ sources = [
"$root_gen_dir/chrome/webui_test_resources.pak",

View file

@ -6,10 +6,10 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work. Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index f2d704c09e6eb90409d6e8119fe1b7d65f2fbabd..db731036430048f6299c2d735e44a4bccc151579 100644 index 68682fd876dd8a07d2548e32a0ce453ca41a339b..341c74c6247f7cf7b119f4357cb80b0b6a688068 100644
--- a/content/renderer/render_thread_impl.cc --- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -1528,7 +1528,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() { @@ -1538,7 +1538,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
} }
bool RenderThreadImpl::IsElasticOverscrollEnabled() { bool RenderThreadImpl::IsElasticOverscrollEnabled() {

View file

@ -6,10 +6,10 @@ Subject: ssl_security_state_tab_helper.patch
Allows populating security tab info for devtools in Electron. Allows populating security tab info for devtools in Electron.
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5a5d531f4 100644 index 1da4480f5a154920e38754d02e197835f82a94c3..f3b2885793a8f3ba46da9914b97f70fff77fb858 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc --- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc +++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -13,17 +13,23 @@ @@ -13,16 +13,20 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "build/build_config.h" #include "build/build_config.h"
@ -22,18 +22,15 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
#include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h" #include "chrome/common/pref_names.h"
#include "chrome/common/secure_origin_whitelist.h" #include "chrome/common/secure_origin_whitelist.h"
#include "components/omnibox/browser/omnibox_field_trial.h"
#include "components/prefs/pref_service.h" #include "components/prefs/pref_service.h"
+#if 0 +#if 0
#include "components/safe_browsing/features.h" #include "components/safe_browsing/features.h"
+#endif +#endif
#include "components/security_state/content/content_utils.h" #include "components/security_state/content/content_utils.h"
+#if 0
#include "components/toolbar/toolbar_field_trial.h"
+#endif
#include "content/public/browser/browser_context.h" #include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_entry.h" #include "content/public/browser/navigation_entry.h"
#include "content/public/browser/navigation_handle.h" @@ -43,7 +47,7 @@
@@ -43,7 +49,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h" #include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS) #endif // defined(OS_CHROMEOS)
@ -42,7 +39,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" #include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif #endif
@@ -79,7 +85,9 @@ bool IsOriginSecureWithWhitelist( @@ -79,7 +83,9 @@ bool IsOriginSecureWithWhitelist(
} // namespace } // namespace
@ -52,7 +49,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
SecurityStateTabHelper::SecurityStateTabHelper( SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents) content::WebContents* web_contents)
@@ -87,8 +95,11 @@ SecurityStateTabHelper::SecurityStateTabHelper( @@ -87,8 +93,11 @@ SecurityStateTabHelper::SecurityStateTabHelper(
logged_http_warning_on_current_navigation_(false), logged_http_warning_on_current_navigation_(false),
is_incognito_(false) { is_incognito_(false) {
content::BrowserContext* context = web_contents->GetBrowserContext(); content::BrowserContext* context = web_contents->GetBrowserContext();
@ -66,7 +63,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
is_incognito_ = true; is_incognito_ = true;
} }
} }
@@ -173,6 +184,7 @@ void SecurityStateTabHelper::DidFinishNavigation( @@ -173,6 +182,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true); UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
} }
@ -74,7 +71,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
// Security indicator UI study (https://crbug.com/803501): Show a message in // Security indicator UI study (https://crbug.com/803501): Show a message in
// the console to reduce developer confusion about the experimental UI // the console to reduce developer confusion about the experimental UI
// treatments for HTTPS pages with EV certificates. // treatments for HTTPS pages with EV certificates.
@@ -200,6 +212,7 @@ void SecurityStateTabHelper::DidFinishNavigation( @@ -200,6 +210,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
"Validation is still valid."); "Validation is still valid.");
} }
} }
@ -82,7 +79,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
} }
void SecurityStateTabHelper::DidChangeVisibleSecurityState() { void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -273,6 +286,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -273,6 +284,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry(); web_contents()->GetController().GetVisibleEntry();
if (!entry) if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE; return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -90,7 +87,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
safe_browsing::SafeBrowsingService* sb_service = safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service(); g_browser_process->safe_browsing_service();
if (!sb_service) if (!sb_service)
@@ -341,6 +355,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const { @@ -341,6 +353,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break; break;
} }
} }
@ -98,7 +95,7 @@ index aebdb130ba687e0d0c0aa45a08b1820b67d3c25c..fdbeb9cd398eac5659b1dac4af9094c5
return security_state::MALICIOUS_CONTENT_STATUS_NONE; return security_state::MALICIOUS_CONTENT_STATUS_NONE;
} }
@@ -361,15 +376,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns() @@ -361,15 +374,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
const { const {
const base::CommandLine& command_line = const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess(); *base::CommandLine::ForCurrentProcess();

View file

@ -22,10 +22,10 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class. does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 05e0ee79e5ad..9a4522f59e6f 100644 index b5146d9180c970aed912c497aa319969cb563895..fe73adb24cf444a942c7cdd1c1f6d25d869d5277 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -466,6 +466,10 @@ class RendererSandboxedProcessLauncherDelegate @@ -473,6 +473,10 @@ class RendererSandboxedProcessLauncherDelegate
: public SandboxedProcessLauncherDelegate { : public SandboxedProcessLauncherDelegate {
public: public:
RendererSandboxedProcessLauncherDelegate() {} RendererSandboxedProcessLauncherDelegate() {}
@ -36,7 +36,7 @@ index 05e0ee79e5ad..9a4522f59e6f 100644
~RendererSandboxedProcessLauncherDelegate() override {} ~RendererSandboxedProcessLauncherDelegate() override {}
@@ -485,6 +489,9 @@ class RendererSandboxedProcessLauncherDelegate @@ -492,6 +496,9 @@ class RendererSandboxedProcessLauncherDelegate
#if BUILDFLAG(USE_ZYGOTE_HANDLE) #if BUILDFLAG(USE_ZYGOTE_HANDLE)
service_manager::ZygoteHandle GetZygote() override { service_manager::ZygoteHandle GetZygote() override {
@ -46,7 +46,7 @@ index 05e0ee79e5ad..9a4522f59e6f 100644
const base::CommandLine& browser_command_line = const base::CommandLine& browser_command_line =
*base::CommandLine::ForCurrentProcess(); *base::CommandLine::ForCurrentProcess();
base::CommandLine::StringType renderer_prefix = base::CommandLine::StringType renderer_prefix =
@@ -498,6 +505,11 @@ class RendererSandboxedProcessLauncherDelegate @@ -505,6 +512,11 @@ class RendererSandboxedProcessLauncherDelegate
service_manager::SandboxType GetSandboxType() override { service_manager::SandboxType GetSandboxType() override {
return service_manager::SANDBOX_TYPE_RENDERER; return service_manager::SANDBOX_TYPE_RENDERER;
} }
@ -58,7 +58,7 @@ index 05e0ee79e5ad..9a4522f59e6f 100644
}; };
const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
@@ -1731,11 +1743,18 @@ bool RenderProcessHostImpl::Init() { @@ -1827,11 +1839,18 @@ bool RenderProcessHostImpl::Init() {
cmd_line->PrependWrapper(renderer_prefix); cmd_line->PrependWrapper(renderer_prefix);
AppendRendererCommandLine(cmd_line.get()); AppendRendererCommandLine(cmd_line.get());

View file

@ -9,12 +9,12 @@ Subject: tts.patch
to remove reference to browser context when its signaled for to remove reference to browser context when its signaled for
destruction from content layer. destruction from content layer.
diff --git a/chrome/browser/speech/tts_controller_impl.cc b/chrome/browser/speech/tts_controller_impl.cc diff --git a/chrome/browser/speech/tts_controller_delegate_impl.cc b/chrome/browser/speech/tts_controller_delegate_impl.cc
index 46ea4689a38d1986055058c8bdeef088e732cf79..6156ddb10fba7fe8a1550f45bb364005bd225811 100644 index 9e071512872c1e9350b29e499a28e3033fa1b95f..905cd40368b029ed546af2fb37b42e6cd8cc1d8e 100644
--- a/chrome/browser/speech/tts_controller_impl.cc --- a/chrome/browser/speech/tts_controller_delegate_impl.cc
+++ b/chrome/browser/speech/tts_controller_impl.cc +++ b/chrome/browser/speech/tts_controller_delegate_impl.cc
@@ -607,12 +607,14 @@ const PrefService* TtsControllerImpl::GetPrefService( @@ -533,12 +533,14 @@ const PrefService* TtsControllerDelegateImpl::GetPrefService(
const Utterance* utterance) { const content::Utterance* utterance) {
const PrefService* prefs = nullptr; const PrefService* prefs = nullptr;
// The utterance->browser_context() is null in tests. // The utterance->browser_context() is null in tests.
+#if 0 +#if 0
@ -29,7 +29,7 @@ index 46ea4689a38d1986055058c8bdeef088e732cf79..6156ddb10fba7fe8a1550f45bb364005
} }
diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc diff --git a/chrome/browser/speech/tts_message_filter.cc b/chrome/browser/speech/tts_message_filter.cc
index 84d2dc145ece4d26c39a338b9a6fcf83a9a3a2da..ab911e1b7d29d675868d1476302d9b6dde7de288 100644 index 7ff9a9219beffc015ae8a96303595ee529715819..d2394892c2a0d2b4f88407cd412af143cf40881d 100644
--- a/chrome/browser/speech/tts_message_filter.cc --- a/chrome/browser/speech/tts_message_filter.cc
+++ b/chrome/browser/speech/tts_message_filter.cc +++ b/chrome/browser/speech/tts_message_filter.cc
@@ -10,8 +10,11 @@ @@ -10,8 +10,11 @@
@ -76,7 +76,7 @@ index 84d2dc145ece4d26c39a338b9a6fcf83a9a3a2da..ab911e1b7d29d675868d1476302d9b6d
browser_context_(browser_context), browser_context_(browser_context),
@@ -26,28 +52,27 @@ TtsMessageFilter::TtsMessageFilter(content::BrowserContext* browser_context) @@ -26,28 +52,27 @@ TtsMessageFilter::TtsMessageFilter(content::BrowserContext* browser_context)
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
TtsController::GetInstance()->AddVoicesChangedDelegate(this); content::TtsController::GetInstance()->AddVoicesChangedDelegate(this);
- // TODO(dmazzoni): make it so that we can listen for a BrowserContext - // TODO(dmazzoni): make it so that we can listen for a BrowserContext
- // being destroyed rather than a Profile. http://crbug.com/444668 - // being destroyed rather than a Profile. http://crbug.com/444668
@ -117,8 +117,8 @@ index 84d2dc145ece4d26c39a338b9a6fcf83a9a3a2da..ab911e1b7d29d675868d1476302d9b6d
} }
} }
@@ -209,10 +234,8 @@ void TtsMessageFilter::Cleanup() { @@ -211,10 +236,8 @@ void TtsMessageFilter::Cleanup() {
TtsController::GetInstance()->RemoveUtteranceEventDelegate(this); content::TtsController::GetInstance()->RemoveUtteranceEventDelegate(this);
} }
-void TtsMessageFilter::Observe( -void TtsMessageFilter::Observe(
@ -132,30 +132,18 @@ index 84d2dc145ece4d26c39a338b9a6fcf83a9a3a2da..ab911e1b7d29d675868d1476302d9b6d
+ browser_context_shutdown_notifier_.reset(); + browser_context_shutdown_notifier_.reset();
} }
diff --git a/chrome/browser/speech/tts_message_filter.h b/chrome/browser/speech/tts_message_filter.h diff --git a/chrome/browser/speech/tts_message_filter.h b/chrome/browser/speech/tts_message_filter.h
index cc9e2806b5c3942472785bf3a3a32e23d859971d..d21fb42f1aca2906b8d8968bd1a46721fbc55edb 100644 index 2fbbc4b4f2a79eac6b686894f2b6463abe404e50..c4712cebfba0efeb62a9061a997055c94ae41e3e 100644
--- a/chrome/browser/speech/tts_message_filter.h --- a/chrome/browser/speech/tts_message_filter.h
+++ b/chrome/browser/speech/tts_message_filter.h +++ b/chrome/browser/speech/tts_message_filter.h
@@ -9,10 +9,9 @@ @@ -21,7 +21,6 @@ class BrowserContext;
#include "base/memory/weak_ptr.h" struct TtsUtteranceRequest;
#include "base/synchronization/lock.h"
#include "chrome/browser/speech/tts_controller.h"
+#include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
#include "content/public/browser/browser_message_filter.h"
#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
namespace content { class TtsMessageFilter : public content::BrowserMessageFilter,
class BrowserContext;
@@ -22,7 +21,6 @@ struct TtsUtteranceRequest;
class TtsMessageFilter
: public content::BrowserMessageFilter,
- public content::NotificationObserver, - public content::NotificationObserver,
public UtteranceEventDelegate, public content::UtteranceEventDelegate,
public VoicesChangedDelegate { public content::VoicesChangedDelegate {
public: public:
@@ -64,15 +62,13 @@ class TtsMessageFilter @@ -63,15 +62,13 @@ class TtsMessageFilter : public content::BrowserMessageFilter,
// about to be deleted. // about to be deleted.
bool Valid(); bool Valid();

View file

@ -5,10 +5,10 @@ Subject: web_contents.patch
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index c9d8ca8da4934497ee71a2c4261a04e0a32d86c5..b50572db02fdd3def70d8c892b043f5db47cafe9 100644 index b7fed5f660c7fcd50f6ca1c583b87f78eed1f40b..51d309ebad100b0f5af3922fa51305141398c34d 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1993,6 +1993,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1980,6 +1980,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name; std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -21,7 +21,7 @@ index c9d8ca8da4934497ee71a2c4261a04e0a32d86c5..b50572db02fdd3def70d8c892b043f5d
WebContentsViewDelegate* delegate = WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2008,6 +2014,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -1995,6 +2001,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
&render_view_host_delegate_view_); &render_view_host_delegate_view_);
} }
} }
@ -90,10 +90,10 @@ index 5de4d7cf8a7a812ad3f6383cd60acbd39135924d..dca9ec76b44be34124a12f453d3c6ecb
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForChildWidget( RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForChildWidget(
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index f26f7e50166310d52fd1c1e45b3d956c28e63074..52735286515c5332c64bca8bf332ae8d65bc7e5c 100644 index 060e2194d9eae8ff35e981e0a04ad78f7e35157b..9edc7b536ff4e9fadd1d07a1c9d01e6abd9313ca 100644
--- a/content/public/browser/web_contents.h --- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h
@@ -74,9 +74,12 @@ class BrowserPluginGuestDelegate; @@ -73,9 +73,12 @@ class BrowserPluginGuestDelegate;
class InterstitialPage; class InterstitialPage;
class RenderFrameHost; class RenderFrameHost;
class RenderViewHost; class RenderViewHost;
@ -106,7 +106,7 @@ index f26f7e50166310d52fd1c1e45b3d956c28e63074..52735286515c5332c64bca8bf332ae8d
struct CustomContextMenuContext; struct CustomContextMenuContext;
struct DropData; struct DropData;
struct MHTMLGenerationParams; struct MHTMLGenerationParams;
@@ -213,6 +216,10 @@ class WebContents : public PageNavigator, @@ -212,6 +215,10 @@ class WebContents : public PageNavigator,
kInitializeAndWarmupRendererProcess, kInitializeAndWarmupRendererProcess,
} desired_renderer_state; } desired_renderer_state;

View file

@ -5,10 +5,10 @@ Subject: webgl_context_attributes.patch
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 907fd2f4f8567b828f1a45caa32cbd4dafdcac4e..8eb8b5a763c58da80ab826f629aa33e0d782ad14 100644 index d80d269e5cb4ca15c2bc2abfe1e617ee62d37cb1..c1b28e91fdae8ca9a8ccdc87610f3e949c7ce2f9 100644
--- a/content/renderer/renderer_blink_platform_impl.cc --- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1029,8 +1029,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider( @@ -998,8 +998,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider(
attributes.sample_buffers = 0; attributes.sample_buffers = 0;
attributes.bind_generates_resource = false; attributes.bind_generates_resource = false;
attributes.enable_raster_interface = web_attributes.enable_raster_interface; attributes.enable_raster_interface = web_attributes.enable_raster_interface;
@ -22,10 +22,10 @@ index 907fd2f4f8567b828f1a45caa32cbd4dafdcac4e..8eb8b5a763c58da80ab826f629aa33e0
attributes.fail_if_major_perf_caveat = attributes.fail_if_major_perf_caveat =
web_attributes.fail_if_major_performance_caveat; web_attributes.fail_if_major_performance_caveat;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 2f57bdd1ef3ee4f81d248fffc6e1e512ed83bb27..f016cfb6d31d0feeb32800fe6bc1c0421bad66e0 100644 index e3f1a22160b6dcc9560574206fe2c1688d3b7c64..097c18726127d20373d4f6d8659589cdb7ae6914 100644
--- a/third_party/blink/public/platform/platform.h --- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h
@@ -550,6 +550,7 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -549,6 +549,7 @@ class BLINK_PLATFORM_EXPORT Platform {
kWebGPUContextType, // WebGPU context kWebGPUContextType, // WebGPU context
}; };
struct ContextAttributes { struct ContextAttributes {
@ -71,17 +71,17 @@ index 98875e974f51ea77a0adf6f6f304ff97f1f62102..36739547ce2ffda7e6f243f50dab5a63
[OriginTrialEnabled=WebXR] XRDevice compatibleXRDevice = null; [OriginTrialEnabled=WebXR] XRDevice compatibleXRDevice = null;
}; };
diff --git a/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc b/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc diff --git a/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc b/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc
index 26b4610c87c2a2c38e45e0c3d26b5b52ef1097e4..fa6923ed17aee8d85f4d1d7e27dd17fae619da85 100644 index 121b0fd872631aaef44cac34a6978d053f73813a..47154c76ca990ef582fdcb4f3acc09301a5a75f9 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc --- a/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc
+++ b/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_context_attribute_helpers.cc
@@ -18,6 +18,7 @@ WebGLContextAttributes ToWebGLContextAttributes( @@ -18,6 +18,7 @@ WebGLContextAttributes* ToWebGLContextAttributes(
result.setAntialias(attrs.antialias); result->setAntialias(attrs.antialias);
result.setPremultipliedAlpha(attrs.premultiplied_alpha); result->setPremultipliedAlpha(attrs.premultiplied_alpha);
result.setPreserveDrawingBuffer(attrs.preserve_drawing_buffer); result->setPreserveDrawingBuffer(attrs.preserve_drawing_buffer);
+ result.setPowerPreference(attrs.power_preference); + result->setPowerPreference(attrs.power_preference);
result.setFailIfMajorPerformanceCaveat( result->setFailIfMajorPerformanceCaveat(
attrs.fail_if_major_performance_caveat); attrs.fail_if_major_performance_caveat);
result.setCompatibleXRDevice( result->setCompatibleXRDevice(
@@ -31,6 +32,7 @@ Platform::ContextAttributes ToPlatformContextAttributes( @@ -31,6 +32,7 @@ Platform::ContextAttributes ToPlatformContextAttributes(
Platform::ContextType context_type, Platform::ContextType context_type,
bool support_own_offscreen_surface) { bool support_own_offscreen_surface) {

View file

@ -5,7 +5,7 @@ Subject: webview_cross_drag.patch
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index ce5602b1cc38b29aee3ff4c997a00a144ff06789..80c325a98ca749f36752978bf825eca047dc361b 100644 index 12d8f9bd7cc569f977d8c98608a1a7ee5eaf9844..45cb5a3b0d457f8a0b0ed196d45e665e332a55ed 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc --- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -620,6 +620,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { @@ -620,6 +620,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
@ -17,10 +17,10 @@ index ce5602b1cc38b29aee3ff4c997a00a144ff06789..80c325a98ca749f36752978bf825eca0
GetRenderViewHostID(web_contents_->GetRenderViewHost()) != GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
drag_start_view_id_; drag_start_view_id_;
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
index cec3bd8a97b8b9bcab176a9bd2c296ec12aba838..7a2b4462bd44176e8e8389499f8c3d5fea647fa0 100644 index 5bb3b17f12f5b97c50b557782c284fc4b7a2eef5..9f900db28b5c219c6d075f9963499f20d5b49196 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm --- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -348,6 +348,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { @@ -349,6 +349,7 @@ GetRenderWidgetHostAtPoint:(const NSPoint&)viewPoint
} }
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {

View file

@ -1,52 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: John Kleinschmidt <jkleinsc@github.com>
Date: Thu, 20 Sep 2018 17:49:45 -0700
Subject: windows_cc_wrapper.patch
Allow use of cc_wrapper (eg sccache).
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 3c6c9d05d2c86adca43a7a71ab6d2634a49fc4d3..da3eb53291aa3978de0ec0a482a5b7ddb57db0f5 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni")
import("//build/config/compiler/compiler.gni")
import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/win/visual_studio_version.gni")
+import("//build/toolchain/cc_wrapper.gni")
import("//build/toolchain/clang_static_analyzer.gni")
import("//build/toolchain/goma.gni")
import("//build/toolchain/toolchain.gni")
@@ -28,8 +29,14 @@ if (use_goma) {
} else {
goma_prefix = "$goma_dir/gomacc "
}
+ clang_prefix = goma_prefix
} else {
goma_prefix = ""
+ if (cc_wrapper != "") {
+ clang_prefix = cc_wrapper + " "
+ } else {
+ clang_prefix = ""
+ }
}
# Copy the VS runtime DLL for the default toolchain to the root build directory
@@ -377,7 +384,7 @@ if (win_build_host_cpu != "x64") {
msvc_toolchain("win_clang_" + win_build_host_cpu) {
environment = "environment." + win_build_host_cpu
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
- cl = "${goma_prefix}$prefix/${clang_cl}"
+ cl = "${clang_prefix}$prefix/${clang_cl}"
sys_include_flags = "${build_cpu_toolchain_data.include_flags_imsvc}"
if (host_os != "win") {
# For win cross build.
@@ -426,7 +433,7 @@ template("win_x64_toolchains") {
msvc_toolchain("win_clang_" + target_name) {
environment = "environment.x64"
prefix = rebase_path("$clang_base_path/bin", root_build_dir)
- cl = "${goma_prefix}$prefix/${clang_cl}"
+ cl = "${clang_prefix}$prefix/${clang_cl}"
sys_include_flags = "${x64_toolchain_data.include_flags_imsvc}"
if (host_os != "win") {
# For win cross build

View file

@ -5,10 +5,10 @@ Subject: worker_context_will_destroy.patch
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 3166cbe259daafc8644b0b1a8941160205638046..b8a81f37db6a979cfbda8743fe4db435ad92dc40 100644 index f3bd63d891283422f2ec35a1f5545bfea98001e2..c64e51312f6a90189806ccb88ab525c0919c14b8 100644
--- a/content/public/renderer/content_renderer_client.h --- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h
@@ -392,6 +392,11 @@ class CONTENT_EXPORT ContentRendererClient { @@ -387,6 +387,11 @@ class CONTENT_EXPORT ContentRendererClient {
virtual void DidInitializeWorkerContextOnWorkerThread( virtual void DidInitializeWorkerContextOnWorkerThread(
v8::Local<v8::Context> context) {} v8::Local<v8::Context> context) {}
@ -21,10 +21,10 @@ index 3166cbe259daafc8644b0b1a8941160205638046..b8a81f37db6a979cfbda8743fe4db435
// An empty URL is returned if the URL is not overriden. // An empty URL is returned if the URL is not overriden.
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url); virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 8eb8b5a763c58da80ab826f629aa33e0d782ad14..09d638e7e74835b032bfbfb15f9ebbf6f7b7cec7 100644 index c1b28e91fdae8ca9a8ccdc87610f3e949c7ce2f9..c007cc3c613ad40ca890ae9e3a7099ca33f393ac 100644
--- a/content/renderer/renderer_blink_platform_impl.cc --- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1176,6 +1176,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { @@ -1138,6 +1138,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
} }
@ -38,10 +38,10 @@ index 8eb8b5a763c58da80ab826f629aa33e0d782ad14..09d638e7e74835b032bfbfb15f9ebbf6
const v8::Local<v8::Context>& worker) { const v8::Local<v8::Context>& worker) {
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread( GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index 4ec814fd92c5accf70627d37f4966e3e5270b660..aa405311a4588ad4903f637fc07713bd18b34e68 100644 index 63e86af7430a0eb73d3bd4451566d5b575f3d465..114c20aa6658b7975adcd18bab9462a44a3f35f1 100644
--- a/content/renderer/renderer_blink_platform_impl.h --- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h +++ b/content/renderer/renderer_blink_platform_impl.h
@@ -207,6 +207,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl { @@ -205,6 +205,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
void DidStartWorkerThread() override; void DidStartWorkerThread() override;
void WillStopWorkerThread() override; void WillStopWorkerThread() override;
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override; void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@ -50,10 +50,10 @@ index 4ec814fd92c5accf70627d37f4966e3e5270b660..aa405311a4588ad4903f637fc07713bd
// Disables the WebSandboxSupport implementation for testing. // Disables the WebSandboxSupport implementation for testing.
// Tests that do not set up a full sandbox environment should call // Tests that do not set up a full sandbox environment should call
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index f016cfb6d31d0feeb32800fe6bc1c0421bad66e0..19761866164e9a20221ce552af7683c77a21f551 100644 index 097c18726127d20373d4f6d8659589cdb7ae6914..7c12ea2646980958e8e1447cf873ef8a23265c0e 100644
--- a/third_party/blink/public/platform/platform.h --- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h +++ b/third_party/blink/public/platform/platform.h
@@ -692,6 +692,7 @@ class BLINK_PLATFORM_EXPORT Platform { @@ -689,6 +689,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {} virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {} virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {} virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
@ -62,10 +62,10 @@ index f016cfb6d31d0feeb32800fe6bc1c0421bad66e0..19761866164e9a20221ce552af7683c7
return false; return false;
} }
diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
index a231d079da2dc70a1054ea6cd4335bad8b2a0253..9343e83988a5bfd7f83ead484be61ac8c17b1196 100644 index dfe382cdefb4525d47bcb9d0f4deb4bfa309b6dc..a9a858abe454b4101a97fc6dff1de273c7107bb6 100644
--- a/third_party/blink/renderer/core/workers/worker_thread.cc --- a/third_party/blink/renderer/core/workers/worker_thread.cc
+++ b/third_party/blink/renderer/core/workers/worker_thread.cc +++ b/third_party/blink/renderer/core/workers/worker_thread.cc
@@ -528,6 +528,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() { @@ -544,6 +544,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
SetExitCode(ExitCode::kGracefullyTerminated); SetExitCode(ExitCode::kGracefullyTerminated);
} }