mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

update v8, ffmpeg, chromium, crashpad, boringssl, and webrtc patches

Browse source
This commit is contained in:
Jeremy Apthorp 2018-09-14 11:03:43 -07:00 • committed by Aleksei Kuzmin
parent d5e9b662f8
commit 6f2f761df3
90 changed files with 7411 additions and 7874 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/common/chromium/.patches.yaml
View file

@ -452,9 +452,7 @@ patches:
-
author: Jeremy Apthorp <nornagon@nornagon.net>
file: crashpad_http_status.patch
description: |
Accept all HTTP codes in [200, 300) as successful, instead of just 200.
For example HockeyApp responds with 202.
description: backport of crashpad f540abb506
-
author: Jeremy Apthorp <jeremya@chromium.org>
file: backport_cd7154e0bb5.patch

2
patches/common/chromium/accelerator.patch
View file

@ -1,5 +1,5 @@
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
index a6756c2..5352958 100644
index a6756c20f22c..53529588af27 100644
--- a/ui/base/accelerators/accelerator.cc
+++ b/ui/base/accelerators/accelerator.cc
@@ -11,6 +11,7 @@

4
patches/common/chromium/add_atomic_lib_to_dependencies_even_for_sysroot_builds.patch
View file

@ -1,8 +1,8 @@
diff --git a/base/BUILD.gn b/base/BUILD.gn
index b674e703617d..5a7a11d816cf 100644
index 943412faefd7..c505df950b2b 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -1131,7 +1131,7 @@ component("base") {
@@ -1217,7 +1217,7 @@ jumbo_component("base") {
# Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.

38
patches/common/chromium/add_realloc.patch
View file

@ -1,11 +1,11 @@
diff --git a/gin/array_buffer.cc b/gin/array_buffer.cc
index f84934bfd712..63bce16a9d06 100644
index f84934bfd712..fc23fef68b6f 100644
--- a/gin/array_buffer.cc
+++ b/gin/array_buffer.cc
@@ -43,6 +43,10 @@ void* ArrayBufferAllocator::AllocateUninitialized(size_t length) {
return malloc(length);
}
+void* ArrayBufferAllocator::Realloc(void* data, size_t length) {
+ return realloc(data, length);
+}
@ -14,7 +14,7 @@ index f84934bfd712..63bce16a9d06 100644
free(data);
}
diff --git a/gin/array_buffer.h b/gin/array_buffer.h
index 2aef366ac819..c037808a9bb3 100644
index 2aef366ac819..3c7d66c81032 100644
--- a/gin/array_buffer.h
+++ b/gin/array_buffer.h
@@ -21,6 +21,7 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
@ -23,8 +23,23 @@ index 2aef366ac819..c037808a9bb3 100644
void* AllocateUninitialized(size_t length) override;
+ void* Realloc(void* data, size_t length) override;
void Free(void* data, size_t length) override;
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
index c8c822632a69..d12976b3cd01 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -619,6 +619,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize);
}
+ void* Realloc(void* data, size_t size) override {
+ return WTF::ArrayBufferContents::Realloc(data, size);
+ }
+
void Free(void* data, size_t size) override {
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
index 053babce1051..e33d6d4ceb5a 100644
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.cc
@ -53,18 +68,3 @@ index 809229caa872..6248ad32d6b0 100644
static void FreeMemory(void*);
static DataHandle CreateDataHandle(size_t, InitializationPolicy);
static void Initialize(
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 cf2762ede559..f065b5ebafb8 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -555,6 +555,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize);
}
+ void* Realloc(void* data, size_t size) override {
+ return WTF::ArrayBufferContents::Realloc(data, size);
+ }
+
void Free(void* data, size_t size) override {
WTF::ArrayBufferContents::FreeMemory(data);
}

4
patches/common/chromium/allow_new_privs.patch
View file

@ -1,8 +1,8 @@
diff --git a/base/process/launch.h b/base/process/launch.h
index 20b76fc..9db73bf 100644
index b4530b755a23..d6f02d9ab2e3 100644
--- a/base/process/launch.h
+++ b/base/process/launch.h
@@ -147,7 +147,7 @@ struct BASE_EXPORT LaunchOptions {
@@ -176,7 +176,7 @@ struct BASE_EXPORT LaunchOptions {
// By default, child processes will have the PR_SET_NO_NEW_PRIVS bit set. If
// true, then this bit will not be set in the new child process.

10
patches/common/chromium/allow_webview_file_url.patch
View file

@ -1,13 +1,13 @@
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 0c57d20..0916ed0 100644
index 1c1fb59e02c8..86b87e294336 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1870,6 +1870,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
@@ -1597,6 +1597,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
!policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
!is_external_protocol;
+ non_web_url_in_guest = false;
+
if (is_shutdown_ || non_web_url_in_guest ||
(delegate_ && !delegate_->ShouldBeginRequest(
info.common_params.method,
if (is_shutdown_ || non_web_url_in_guest) {
url_loader_client->OnComplete(
network::URLLoaderCompletionStatus(net::ERR_ABORTED));

2
patches/common/chromium/app_indicator_icon_menu.patch
View file

@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc b/chrome/browser/ui/libgtkui/app_indicator_icon_menu.cc
index 91674b9..8a4c391 100644
index 40399a35f8d2..1d3a0da948dc 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) {

10
patches/common/chromium/backport_d65792a.patch
View file

@ -1,12 +1,14 @@
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
index bf4b1d0..a3b72c4 100644
@@ -995,7 +996,8 @@
index bf4b1d07f7fe..8435c60a0786 100644
--- a/ui/views/widget/widget.cc
+++ b/ui/views/widget/widget.cc
@@ -995,7 +995,8 @@ bool Widget::IsTranslucentWindowOpacitySupported() const {
void Widget::OnSizeConstraintsChanged() {
native_widget_->OnSizeConstraintsChanged();
- non_client_view_->SizeConstraintsChanged();
+ if (non_client_view_)
+ non_client_view_->SizeConstraintsChanged();
}
void Widget::OnOwnerClosing() {}

4
patches/common/chromium/blink-worker-enable-csp-in-file-scheme.patch
View file

@ -1,8 +1,8 @@
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 bdd886eff5e3..42a3f0ef6e55 100644
index 4b47f551f366..227c58a5629d 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -255,7 +255,6 @@ void WorkerScriptLoader::ProcessContentSecurityPolicy(
@@ -246,7 +246,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
// document (which is implemented in WorkerMessagingProxy, and
// m_contentSecurityPolicy should be left as nullptr to inherit the policy).
if (!response.Url().ProtocolIs("blob") &&

6
patches/common/chromium/blink_file_path.patch
View file

@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
index 0bfe29512050..81439f7ab8f7 100644
index 39831f1902c6..fddb013aa122 100644
--- a/third_party/blink/renderer/core/fileapi/file.h
+++ b/third_party/blink/renderer/core/fileapi/file.h
@@ -170,6 +170,9 @@ class CORE_EXPORT File final : public Blob {
@@ -168,6 +168,9 @@ class CORE_EXPORT File final : public Blob {
}
const String& name() const { return name_; }
@ -13,7 +13,7 @@ index 0bfe29512050..81439f7ab8f7 100644
// http://dev.w3.org/2006/webapi/FileAPI/#file-attrs
long long lastModified() const;
diff --git a/third_party/blink/renderer/core/fileapi/file.idl b/third_party/blink/renderer/core/fileapi/file.idl
index df954bc8f818..4683b2853bb4 100644
index a74beceda3e7..7196fd5f5f9e 100644
--- a/third_party/blink/renderer/core/fileapi/file.idl
+++ b/third_party/blink/renderer/core/fileapi/file.idl
@@ -32,6 +32,7 @@

6
patches/common/chromium/blink_fix_prototype_assert.patch
View file

@ -1,8 +1,8 @@
cdiff --git a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
index aedc832..8c26681 100644
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 87f2176ce897..ce3d9ce19bff 100644
--- a/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
+++ b/third_party/blink/renderer/platform/bindings/v8_object_constructor.cc
@@ -94,8 +94,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
@@ -98,8 +98,10 @@ v8::Local<v8::Function> V8ObjectConstructor::CreateInterfaceObject(
bool get_prototype_value =
interface_object->Get(context, V8AtomicString(isolate, "prototype"))
.ToLocal(&prototype_value);

4
patches/common/chromium/blink_initialization_order.patch
View file

@ -1,8 +1,8 @@
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 33d958fb31ae..47efe62650aa 100644
index 5c00e3e935b2..43f882eb0883 100644
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
@@ -170,11 +170,11 @@ void LocalWindowProxy::Initialize() {
@@ -171,11 +171,11 @@ void LocalWindowProxy::Initialize() {
GetFrame()->IsMainFrame());
MainThreadDebugger::Instance()->ContextCreated(script_state_.get(),
GetFrame(), origin);

6
patches/common/chromium/blink_local_frame.patch
View file

@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 97a5393d40b4..04f88dd2ea15 100644
index 5686e6a06d6f..4798d7e36bec 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -303,10 +303,6 @@ void LocalFrame::Detach(FrameDetachType type) {
@@ -382,10 +382,6 @@ void LocalFrame::Detach(FrameDetachType type) {
}
CHECK(!view_ || !view_->IsAttached());
@ -13,7 +13,7 @@ index 97a5393d40b4..04f88dd2ea15 100644
if (!Client())
return;
@@ -316,6 +312,10 @@ void LocalFrame::Detach(FrameDetachType type) {
@@ -403,6 +399,10 @@ void LocalFrame::Detach(FrameDetachType type) {
// Notify ScriptController that the frame is closing, since its cleanup ends
// up calling back to LocalFrameClient via WindowProxy.
GetScriptController().ClearForClose();

38
patches/common/chromium/blink_world_context.patch
View file

@ -1,8 +1,22 @@
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index 601242f8df12..8cb523f82df0 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -427,6 +427,9 @@ class WebLocalFrame : public WebFrame {
// be calling this API.
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
+ virtual v8::Local<v8::Context> WorldScriptContext(
+ v8::Isolate* isolate, int world_id) const = 0;
+
// Executes script in the context of the current page and returns the value
// that the script evaluated to with callback. Script execution can be
// 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
index a93834fbe86e..937b7f335693 100644
index db86ae3c5eb4..602841d00df4 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -843,6 +843,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
@@ -892,6 +892,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {
return MainWorldScriptContext()->Global();
}
@ -17,10 +31,10 @@ index a93834fbe86e..937b7f335693 100644
return BindingSecurity::ShouldAllowAccessToFrame(
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
index d66499296ff8..bfea68983fda 100644
index 0adc92eb48f2..a17891ce397c 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.h
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.h
@@ -142,6 +142,8 @@ class CORE_EXPORT WebLocalFrameImpl final
@@ -144,6 +144,8 @@ class CORE_EXPORT WebLocalFrameImpl final
int argc,
v8::Local<v8::Value> argv[]) override;
v8::Local<v8::Context> MainWorldScriptContext() const override;
@ -28,18 +42,4 @@ index d66499296ff8..bfea68983fda 100644
+ v8::Isolate* isolate, int world_id) const override;
v8::Local<v8::Object> GlobalProxy() const override;
void Reload(WebFrameLoadType) override;
void ReloadWithOverrideURL(const WebURL& override_url,
diff --git a/third_party/blink/public/web/web_local_frame.h b/third_party/blink/public/web/web_local_frame.h
index ad0fa84f9511..69f96587b1f1 100644
--- a/third_party/blink/public/web/web_local_frame.h
+++ b/third_party/blink/public/web/web_local_frame.h
@@ -404,6 +404,9 @@ class WebLocalFrame : public WebFrame {
// be calling this API.
virtual v8::Local<v8::Context> MainWorldScriptContext() const = 0;
+ virtual v8::Local<v8::Context> WorldScriptContext(
+ v8::Isolate* isolate, int world_id) const = 0;
+
// Executes script in the context of the current page and returns the value
// that the script evaluated to with callback. Script execution can be
// suspend.
void ReloadImage(const WebNode&) override;

6
patches/common/chromium/boringssl_build_gn.patch
View file

@ -1,11 +1,11 @@
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index c75fb7c2bb7e..423f4b2ddb10 100644
index d31a9f29fa9c..dea5a6403f4c 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -44,6 +44,13 @@ config("no_asm_config") {
}
@@ -46,6 +46,13 @@ config("no_asm_config") {
all_sources = crypto_sources + ssl_sources
all_headers = crypto_headers + ssl_headers
+if (is_electron_build) {
+ # Needed to build a nodejs-compatible boringssl.
+ all_sources += [

11
patches/common/chromium/browser_compositor_mac.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.h b/content/browser/renderer_host/browser_compositor_view_mac.h
index 7426062f7381..bd5cd2fcd230 100644
index bc9eba153a6a..5200f79afd05 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.h
+++ b/content/browser/renderer_host/browser_compositor_view_mac.h
@@ -54,10 +54,13 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient {
@@ -59,6 +59,8 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
// These will not return nullptr until Destroy is called.
DelegatedFrameHost* GetDelegatedFrameHost();
@ -11,16 +11,19 @@ index 7426062f7381..bd5cd2fcd230 100644
// Ensure that the currect compositor frame be cleared (even if it is
// potentially visible).
void ClearCompositorFrame();
@@ -69,6 +71,7 @@ class CONTENT_EXPORT BrowserCompositorMac : public DelegatedFrameHostClient,
// no valid frame is available.
const gfx::CALayerParams* GetLastCALayerParams() const;
+ ui::Compositor* GetCompositor();
gfx::AcceleratedWidget GetAcceleratedWidget();
void DidCreateNewRendererCompositorFrameSink(
viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink);
diff --git a/content/browser/renderer_host/browser_compositor_view_mac.mm b/content/browser/renderer_host/browser_compositor_view_mac.mm
index 7fcc24c15c37..7c31977b20f9 100644
index 3d12a1126a0d..7a60368b2c8a 100644
--- a/content/browser/renderer_host/browser_compositor_view_mac.mm
+++ b/content/browser/renderer_host/browser_compositor_view_mac.mm
@@ -208,6 +208,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
@@ -240,6 +240,12 @@ BrowserCompositorMac::~BrowserCompositorMac() {
g_spare_recyclable_compositors.Get().clear();
}

4
patches/common/chromium/browser_plugin_guest.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 964c9a093a3b..f3b3d66ff267 100644
index a0bc9305e62d..7f022f6cfda7 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -214,8 +214,11 @@ void BrowserPluginGuest::Init() {
@@ -207,8 +207,11 @@ void BrowserPluginGuest::Init() {
WebContentsImpl* owner_web_contents = static_cast<WebContentsImpl*>(
delegate_->GetOwnerWebContents());

4
patches/common/chromium/browser_plugin_wheel.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/renderer/browser_plugin/browser_plugin.cc b/content/renderer/browser_plugin/browser_plugin.cc
index 06762fb..e89b1f0 100644
index d64895137a73..c42dd6ddf172 100644
--- a/content/renderer/browser_plugin/browser_plugin.cc
+++ b/content/renderer/browser_plugin/browser_plugin.cc
@@ -448,15 +448,11 @@ blink::WebInputEventResult BrowserPlugin::handleInputEvent(
@@ -642,15 +642,11 @@ blink::WebInputEventResult BrowserPlugin::HandleInputEvent(
DCHECK(!blink::WebInputEvent::IsTouchEventType(event.GetType()));

8
patches/common/chromium/build_gn.patch
View file

@ -1,5 +1,5 @@
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 9e38ee0e592b..bd54ce154b13 100644
index 93a97ff2803f..02c469e930a1 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -123,6 +123,9 @@ if (current_os == "") {
@ -12,7 +12,7 @@ index 9e38ee0e592b..bd54ce154b13 100644
# Set to enable the official build level of optimization. This has nothing
# to do with branding, but enables an additional level of optimization above
# release (!is_debug). This might be better expressed as a tri-state
@@ -539,6 +542,7 @@ default_compiler_configs = [
@@ -527,6 +531,7 @@ default_compiler_configs = [
"//build/config/compiler:thin_archive",
"//build/config/coverage:default_coverage",
"//build/config/sanitizers:default_sanitizer_flags",
@ -21,10 +21,10 @@ index 9e38ee0e592b..bd54ce154b13 100644
if (is_win) {
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 9a10137aa405..bb33e5450eaa 100644
index 83337d52e4b9..8ec56ca46c74 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -579,10 +579,13 @@ config("compiler") {
@@ -636,10 +636,13 @@ config("compiler") {
ldflags += [ "-Wl,--lto-O0" ]
}

10
patches/common/chromium/build_toolchain_win_patch.patch
View file

@ -1,8 +1,8 @@
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 53f767a0bddb..661466b779e8 100644
index 4d9d1f45f870..286c791613ba 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -176,6 +176,12 @@ template("msvc_toolchain") {
@@ -154,6 +154,12 @@ template("msvc_toolchain") {
]
command = "$env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
@ -15,7 +15,7 @@ index 53f767a0bddb..661466b779e8 100644
}
tool("cxx") {
@@ -192,6 +198,12 @@ template("msvc_toolchain") {
@@ -170,6 +176,12 @@ template("msvc_toolchain") {
]
command = "$env_wrapper$cl /nologo /showIncludes ${clflags} $sys_include_flags{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}} /c {{source}} /Fo{{output}} /Fd\"$pdbname\""
@ -29,10 +29,10 @@ index 53f767a0bddb..661466b779e8 100644
tool("rc") {
diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
index 3a81368f3469..7c5ef1ea5db4 100644
index b2cb093377ee..801d7a9b8e03 100644
--- a/build/toolchain/win/tool_wrapper.py
+++ b/build/toolchain/win/tool_wrapper.py
@@ -315,6 +315,25 @@ class WinTool(object):
@@ -270,6 +270,25 @@ class WinTool(object):
dirname = dirname[0] if dirname else None
return subprocess.call(args, shell=True, env=env, cwd=dirname)

64
patches/common/chromium/can_create_window.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 25841d376bcd..df41213f4c49 100644
index 321a12f74202..7a53675a2139 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2874,6 +2874,38 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -3058,6 +3058,38 @@ void RenderFrameHostImpl::CreateNewWindow(
"frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
params->target_url.possibly_invalid_spec());
@ -41,7 +41,7 @@ index 25841d376bcd..df41213f4c49 100644
bool no_javascript_access = false;
// Filter out URLs to which navigation is disallowed from this context.
@@ -2896,8 +2928,9 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -3080,8 +3112,9 @@ void RenderFrameHostImpl::CreateNewWindow(
frame_tree_node_->frame_tree()->GetMainFrame()->GetLastCommittedURL(),
last_committed_origin_.GetURL(), params->window_container_type,
params->target_url, params->referrer, params->frame_name,
@ -53,8 +53,20 @@ index 25841d376bcd..df41213f4c49 100644
if (!can_create_window) {
std::move(callback).Run(mojom::CreateNewWindowStatus::kIgnore, nullptr);
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
index 9c298b182440..2fcbde75ba47 100644
--- a/content/browser/security_exploit_browsertest.cc
+++ b/content/browser/security_exploit_browsertest.cc
@@ -293,6 +293,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New();
params->target_url = GURL("about:blank");
+ params->body = mojom::ResourceRequestBody::New();
pending_rfh->CreateNewWindow(
std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus,
mojom::CreateNewWindowReplyPtr) {}));
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 99ec7e8d7995..26a4040fba97 100644
index 09b5766c0794..edb604c80d3f 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -11,6 +11,8 @@ import "content/public/common/resource_type.mojom";
@ -66,7 +78,7 @@ index 99ec7e8d7995..26a4040fba97 100644
import "mojo/public/mojom/base/string16.mojom";
import "mojo/public/mojom/base/unguessable_token.mojom";
import "services/network/public/mojom/url_loader.mojom";
@@ -146,6 +148,24 @@ interface FrameFactory {
@@ -148,6 +150,24 @@ interface FrameFactory {
CreateFrame(int32 frame_routing_id, Frame& frame);
};
@ -91,7 +103,7 @@ index 99ec7e8d7995..26a4040fba97 100644
struct CreateNewWindowParams {
// True if this open request came in the context of a user gesture.
bool user_gesture;
@@ -182,6 +202,10 @@ struct CreateNewWindowParams {
@@ -184,6 +204,10 @@ struct CreateNewWindowParams {
// The window features to use for the new window.
blink.mojom.WindowFeatures features;
@ -103,10 +115,10 @@ index 99ec7e8d7995..26a4040fba97 100644
// 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
index 37e2d88e28e9..6c366435ddd8 100644
index a8927d0ba8da..396ae3d82ba2 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -382,6 +382,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -401,6 +401,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -116,18 +128,18 @@ index 37e2d88e28e9..6c366435ddd8 100644
bool opener_suppressed,
bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 63cb3851db0a..4a96c8851df0 100644
index e9c6b810e050..3ca627448e33 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -151,6 +151,7 @@ class RenderFrameHost;
@@ -153,6 +153,7 @@ class RenderFrameHost;
class RenderProcessHost;
class RenderViewHost;
class ResourceContext;
+class ResourceRequestBody;
class ServiceManagerConnection;
class SiteInstance;
class SpeechRecognitionManagerDelegate;
class StoragePartition;
@@ -625,6 +626,8 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -651,6 +652,8 @@ class CONTENT_EXPORT ContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -137,18 +149,18 @@ index 63cb3851db0a..4a96c8851df0 100644
bool opener_suppressed,
bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 7a866ded50f1..f019ce3b24bb 100644
index 4aba7a9e290e..a13cc1599d70 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -79,6 +79,7 @@
#include "content/renderer/input/input_handler_manager.h"
@@ -78,6 +78,7 @@
#include "content/renderer/ime_event_guard.h"
#include "content/renderer/internal_document_state_data.h"
#include "content/renderer/loader/request_extra_data.h"
+#include "content/renderer/loader/web_url_request_util.h"
#include "content/renderer/media/audio_device_factory.h"
#include "content/renderer/media/stream/media_stream_device_observer.h"
#include "content/renderer/media/video_capture_impl_manager.h"
@@ -1258,6 +1259,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator,
@@ -1243,6 +1244,46 @@ WebView* RenderViewImpl::CreateView(WebLocalFrame* creator,
}
params->features = ConvertWebWindowFeaturesToMojoWindowFeatures(features);
@ -195,23 +207,11 @@ index 7a866ded50f1..f019ce3b24bb 100644
// We preserve this information before sending the message since |params| is
// moved on send.
bool is_background_tab =
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
index 0a1f363a673a..adcef6fca779 100644
--- a/content/browser/security_exploit_browsertest.cc
+++ b/content/browser/security_exploit_browsertest.cc
@@ -293,6 +293,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New();
params->target_url = GURL("about:blank");
+ params->body = mojom::ResourceRequestBody::New();
pending_rfh->CreateNewWindow(
std::move(params), base::BindOnce([](mojom::CreateNewWindowStatus,
mojom::CreateNewWindowReplyPtr) {}));
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 2eaee37ec780..9994df95a798 100644
index 3a908d742130..52294125b799 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -182,6 +182,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
@@ -247,6 +247,8 @@ bool LayoutTestContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@ -221,10 +221,10 @@ index 2eaee37ec780..9994df95a798 100644
bool opener_suppressed,
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
index 62b637bc80ce..1a9a06ce4bf6 100644
index d0ba19167522..3d1154b3cb8a 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.h
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.h
@@ -58,6 +58,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
@@ -67,6 +67,8 @@ class LayoutTestContentBrowserClient : public ShellContentBrowserClient {
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,

4
patches/common/chromium/chrome_key_systems.patch
View file

@ -1,5 +1,5 @@
diff --git a/chrome/renderer/media/chrome_key_systems.cc b/chrome/renderer/media/chrome_key_systems.cc
index f3033337199b..856bc8f0b143 100644
index c0cf00b5da05..992827ca6782 100644
--- a/chrome/renderer/media/chrome_key_systems.cc
+++ b/chrome/renderer/media/chrome_key_systems.cc
@@ -14,7 +14,9 @@
@ -12,7 +12,7 @@ index f3033337199b..856bc8f0b143 100644
#include "components/cdm/renderer/external_clear_key_key_system_properties.h"
#include "components/cdm/renderer/widevine_key_system_properties.h"
#include "content/public/renderer/render_thread.h"
@@ -140,12 +142,14 @@ static void AddExternalClearKey(
@@ -142,12 +144,14 @@ static void AddExternalClearKey(
#if defined(WIDEVINE_CDM_AVAILABLE)
// Returns persistent-license session support.
EmeSessionTypeSupport GetPersistentLicenseSupport(bool supported_by_the_cdm) {

20
patches/common/chromium/compositor_delegate.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 7b9fc4114c52..bdbbf93f6f0d 100644
index e679dbb02a81..d90a276fc0e1 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -495,9 +495,19 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
@@ -507,10 +507,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
// surfaces as they are not following the correct mode.
DisableGpuCompositing(compositor.get());
}
@ -13,18 +13,20 @@ index 7b9fc4114c52..bdbbf93f6f0d 100644
+ compositor.get());
+ }
+ if (!output_device) {
+ output_device = CreateSoftwareOutputDevice(compositor->widget());
+ output_device = CreateSoftwareOutputDevice(compositor->widget(),
+ compositor->task_runner());
+ }
+
display_output_surface =
std::make_unique<SoftwareBrowserCompositorOutputSurface>(
- CreateSoftwareOutputDevice(compositor->widget()),
- CreateSoftwareOutputDevice(compositor->widget(),
- compositor->task_runner()),
+ std::move(output_device),
std::move(vsync_callback), compositor->task_runner());
std::move(vsync_callback));
} else {
DCHECK(context_provider);
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index d842aa55175b..2c2131774b71 100644
index eb250697ebd6..36be87675e9a 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -24,6 +24,7 @@
@ -35,7 +37,7 @@ index d842aa55175b..2c2131774b71 100644
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkMatrix44.h"
#include "ui/compositor/compositor_animation_observer.h"
@@ -182,6 +183,15 @@ class COMPOSITOR_EXPORT ContextFactory {
@@ -183,6 +184,15 @@ class COMPOSITOR_EXPORT ContextFactory {
virtual void RemoveObserver(ContextFactoryObserver* observer) = 0;
};
@ -51,7 +53,7 @@ index d842aa55175b..2c2131774b71 100644
// Compositor object to take care of GPU painting.
// A Browser compositor object is responsible for generating the final
// displayable form of pixels comprising a single widget's contents. It draws an
@@ -221,6 +231,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -222,6 +232,9 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
// Schedules a redraw of the layer tree associated with this compositor.
void ScheduleDraw();
@ -61,7 +63,7 @@ index d842aa55175b..2c2131774b71 100644
// Sets the root of the layer tree drawn by this Compositor. The root layer
// must have no parent. The compositor's root layer is reset if the root layer
// is destroyed. NULL can be passed to reset the root layer, in which case the
@@ -426,6 +439,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
@@ -447,6 +460,8 @@ class COMPOSITOR_EXPORT Compositor : public cc::LayerTreeHostClient,
ui::ContextFactory* context_factory_;
ui::ContextFactoryPrivate* context_factory_private_;

9
patches/common/chromium/content_browser_manifest.patch
View file

@ -1,12 +1,15 @@
diff --git a/content/public/app/mojo/content_browser_manifest.json b/content/public/app/mojo/content_browser_manifest.json
index 5a217fa9b741..8fd1b39ea6ca 100644
index a515b68616a8..dc0431fd17e6 100644
--- a/content/public/app/mojo/content_browser_manifest.json
+++ b/content/public/app/mojo/content_browser_manifest.json
@@ -82,6 +82,7 @@
@@ -90,6 +90,7 @@
"device:battery_monitor",
"device:generic_sensor",
"device:geolocation",
+ "device:geolocation_control",
"device:hid",
"device:input_service",
"device:nfc",
"device:mtp",
--
2.17.0

91
patches/common/chromium/crashpad_http_status.patch
View file

@ -1,54 +1,79 @@
From 800aa10d300af0f3fe162ae586b6b1ebe0566ab4 Mon Sep 17 00:00:00 2001
From: Catalin Fratila <catalinf@microsoft.com>
Date: Fri, 19 May 2017 09:28:53 +0200
Subject: [PATCH] Handle everything not in [200, 300) as error. For example
HockeyApp responds with 202.
(cherry picked from commit f7c320766756a8aaa45ccbcff2945053d9f7e109)
(cherry picked from commit 1875fddc7e671b14d8b54068301d9648d12e9dc2)
(cherry picked from commit 670fb453b0c3d6ae0a0d5923f68df02464337617)
---
third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc | 2 +-
third_party/crashpad/crashpad/util/net/http_transport_mac.mm | 2 +-
third_party/crashpad/crashpad/util/net/http_transport_win.cc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc b/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
index c16a593..0e262b0 100644
--- a/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
+++ b/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
@@ -338,7 +338,7 @@ bool HTTPTransportLibcurl::ExecuteSynchronously(std::string* response_body) {
return false;
}
diff --git a/third_party/crashpad/crashpad/util/net/http_transport.h b/third_party/crashpad/crashpad/util/net/http_transport.h
index f91a556..acd4e44 100644
--- a/third_party/crashpad/crashpad/util/net/http_transport.h
+++ b/third_party/crashpad/crashpad/util/net/http_transport.h
@@ -90,7 +90,7 @@
//! if the response body is not required.
//!
//! \return Whether or not the request was successful, defined as returning
- //! a HTTP status 200 (OK) code.
+ //! a HTTP status code in the range 200-203 (inclusive).
virtual bool ExecuteSynchronously(std::string* response_body) = 0;
- if (status != 200) {
+ if (status < 200 || status >= 300) {
LOG(ERROR) << base::StringPrintf("HTTP status %ld", status);
return false;
}
protected:
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
index 8d5f78c..a6434c2 100644
index 8d5f78c..a433bb3 100644
--- a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
+++ b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
@@ -293,7 +293,7 @@ static void Unschedule(CFReadStreamRef stream,
@@ -293,7 +293,7 @@
return false;
}
NSInteger http_status = [http_response statusCode];
- if (http_status != 200) {
+ if (http_status < 200 || http_status >= 300) {
+ if (http_status < 200 || http_status > 203) {
LOG(ERROR) << base::StringPrintf("HTTP status %ld",
implicit_cast<long>(http_status));
return false;
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
index f0e2dc1..34d8dee 100644
--- a/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
+++ b/third_party/crashpad/crashpad/util/net/http_transport_socket.cc
@@ -457,10 +457,18 @@
LOG(ERROR) << "ReadLine";
return false;
}
- static constexpr const char kHttp10[] = "HTTP/1.0 200 ";
- static constexpr const char kHttp11[] = "HTTP/1.1 200 ";
- return StartsWith(response_line, kHttp10, strlen(kHttp10)) ||
- StartsWith(response_line, kHttp11, strlen(kHttp11));
+ static constexpr const char kHttp10[] = "HTTP/1.0 ";
+ static constexpr const char kHttp11[] = "HTTP/1.1 ";
+ if (!(StartsWith(response_line, kHttp10, strlen(kHttp10)) ||
+ StartsWith(response_line, kHttp11, strlen(kHttp11))) ||
+ response_line.size() < strlen(kHttp10) + 3 ||
+ response_line.at(strlen(kHttp10) + 3) != ' ') {
+ return false;
+ }
+ unsigned int http_status = 0;
+ return base::StringToUint(response_line.substr(strlen(kHttp10), 3),
+ &http_status) &&
+ http_status >= 200 && http_status <= 203;
}
bool ReadResponseHeaders(int sock, HTTPHeaders* headers) {
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_test.cc b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
index 7b5f41d..d73dc99 100644
--- a/third_party/crashpad/crashpad/util/net/http_transport_test.cc
+++ b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
@@ -137,7 +137,7 @@
std::string response_body;
bool success = transport->ExecuteSynchronously(&response_body);
- if (response_code_ == 200) {
+ if (response_code_ >= 200 && response_code_ <= 203) {
EXPECT_TRUE(success);
std::string expect_response_body = random_string + "\r\n";
EXPECT_EQ(response_body, expect_response_body);
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_win.cc b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
index 18d343c..40c3061 100644
index 18d343c..2919bc1 100644
--- a/third_party/crashpad/crashpad/util/net/http_transport_win.cc
+++ b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
@@ -375,7 +375,7 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) {
@@ -375,7 +375,7 @@
return false;
}
- if (status_code != 200) {
+ if (status_code < 200 || status_code >= 300) {
+ if (status_code < 200 || status_code > 203) {
LOG(ERROR) << base::StringPrintf("HTTP status %lu", status_code);
return false;
}

168
patches/common/chromium/dcheck.patch
View file

@ -1,8 +1,8 @@
diff --git a/base/logging.h b/base/logging.h
index 582fb89868cd..24d3e82232b6 100644
index 29960599a5c6..7352201e7b66 100644
--- a/base/logging.h
+++ b/base/logging.h
@@ -850,7 +850,7 @@ const LogSeverity LOG_DCHECK = LOG_INFO;
@@ -874,7 +874,7 @@ const LogSeverity LOG_DCHECK = LOG_FATAL;
#else // !(defined(_PREFAST_) && defined(OS_WIN))
@ -12,7 +12,7 @@ index 582fb89868cd..24d3e82232b6 100644
#define DCHECK(condition) \
LAZY_STREAM(LOG_STREAM(DCHECK), !ANALYZER_ASSUME_TRUE(condition)) \
diff --git a/base/memory/weak_ptr.cc b/base/memory/weak_ptr.cc
index 8879651e6da7..33fe8948a063 100644
index d2a7d89e5667..def40703ea25 100644
--- a/base/memory/weak_ptr.cc
+++ b/base/memory/weak_ptr.cc
@@ -23,8 +23,8 @@ void WeakReference::Flag::Invalidate() {
@ -27,10 +27,10 @@ index 8879651e6da7..33fe8948a063 100644
}
diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
index 6a0038e2c00d..dd00dfb3e5d0 100644
index 7a664429bcd3..26f49dc3d1e7 100644
--- a/base/process/kill_win.cc
+++ b/base/process/kill_win.cc
@@ -45,7 +45,7 @@ TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
@@ -23,7 +23,7 @@ TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
DWORD tmp_exit_code = 0;
if (!::GetExitCodeProcess(handle, &tmp_exit_code)) {
@ -39,11 +39,29 @@ index 6a0038e2c00d..dd00dfb3e5d0 100644
// This really is a random number. We haven't received any
// information about the exit code, presumably because this
diff --git a/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc
index 18ef58a725c3..239f319c8b4c 100644
--- a/base/process/process_metrics_win.cc
+++ b/base/process/process_metrics_win.cc
@@ -153,10 +153,9 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
ProcessMetrics::ProcessMetrics(ProcessHandle process) {
if (process) {
HANDLE duplicate_handle = INVALID_HANDLE_VALUE;
- BOOL result = ::DuplicateHandle(::GetCurrentProcess(), process,
- ::GetCurrentProcess(), &duplicate_handle,
- PROCESS_QUERY_INFORMATION, FALSE, 0);
- DPCHECK(result);
+ ::DuplicateHandle(::GetCurrentProcess(), process,
+ ::GetCurrentProcess(), &duplicate_handle,
+ PROCESS_QUERY_INFORMATION, FALSE, 0);
process_.Set(duplicate_handle);
}
}
diff --git a/components/viz/service/display/program_binding.h b/components/viz/service/display/program_binding.h
index 70f1ff97b1ac..d1abd804e988 100644
index 8b28c57f854e..a0e7056af23f 100644
--- a/components/viz/service/display/program_binding.h
+++ b/components/viz/service/display/program_binding.h
@@ -416,7 +416,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
@@ -433,7 +433,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
if (!ProgramBindingBase::Init(context_provider->ContextGL(),
vertex_shader_.GetShaderString(),
fragment_shader_.GetShaderString())) {
@ -52,8 +70,8 @@ index 70f1ff97b1ac..d1abd804e988 100644
return;
}
@@ -428,7 +428,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
@@ -445,7 +445,7 @@ class VIZ_SERVICE_EXPORT Program : public ProgramBindingBase {
// Link after binding uniforms
if (!Link(context_provider->ContextGL())) {
- DCHECK(IsContextLost(context_provider->ContextGL()));
@ -61,11 +79,26 @@ index 70f1ff97b1ac..d1abd804e988 100644
return;
}
diff --git a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
index 9d84f91109a3..5e252917bc0f 100644
--- a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
+++ b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
@@ -63,7 +63,9 @@ base::LazyInstance<ServerSharedBitmapManager>::DestructorAtExit
ServerSharedBitmapManager::ServerSharedBitmapManager() = default;
ServerSharedBitmapManager::~ServerSharedBitmapManager() {
- DCHECK(handle_map_.empty());
+ // FIXME(alexeykuzmin): Gets constantly triggered on Windows CI.
+ // Backporting https://chromium-review.googlesource.com/802574 should help.
+ // DCHECK(handle_map_.empty());
}
ServerSharedBitmapManager* ServerSharedBitmapManager::current() {
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc
index ff1d3fcb6eba..ad6578f645d4 100644
index 74ff6b4286c2..02bf1c55d86f 100644
--- a/content/browser/frame_host/navigation_controller_impl.cc
+++ b/content/browser/frame_host/navigation_controller_impl.cc
@@ -1079,8 +1079,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
@@ -1083,8 +1083,10 @@ NavigationType NavigationControllerImpl::ClassifyNavigation(
return NAVIGATION_TYPE_NEW_SUBFRAME;
}
@ -78,7 +111,7 @@ index ff1d3fcb6eba..ad6578f645d4 100644
if (rfh->GetParent()) {
// All manual subframes would be did_create_new_entry and handled above, so
@@ -1301,7 +1303,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
@@ -1305,7 +1307,10 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage(
new_entry->GetFavicon() = GetLastCommittedEntry()->GetFavicon();
}
@ -91,10 +124,10 @@ index ff1d3fcb6eba..ad6578f645d4 100644
// navigation. Now we know that the renderer has updated its state accordingly
// and it is safe to also clear the browser side history.
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 346765edaef9..a30e87bfcda6 100644
index cd755cbc3f2c..321a12f74202 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -2072,8 +2073,10 @@ void RenderFrameHostImpl::AllowBindings(int bindings_flags) {
@@ -2345,8 +2345,10 @@ void RenderFrameHostImpl::AllowBindings(int bindings_flags) {
}
enabled_bindings_ |= bindings_flags;
@ -108,10 +141,10 @@ index 346765edaef9..a30e87bfcda6 100644
if (render_frame_created_) {
if (!frame_bindings_control_)
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 8ee84cdafbde..c7ad6fa8c75f 100644
index d86576cc36ac..5b4ae0732914 100644
--- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm
+++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
@@ -618,8 +618,8 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -650,8 +650,8 @@ void ExtractUnderlines(NSAttributedString* string,
if (EventIsReservedBySystem(theEvent))
return;
@ -135,6 +168,19 @@ index f3c68fab3de6..b8609daf3ef9 100644
return;
}
diff --git a/third_party/blink/renderer/core/dom/node.cc b/third_party/blink/renderer/core/dom/node.cc
index ca47b2d09693..b4b6ce96209b 100644
--- a/third_party/blink/renderer/core/dom/node.cc
+++ b/third_party/blink/renderer/core/dom/node.cc
@@ -2535,7 +2535,7 @@ StaticNodeList* Node::getDestinationInsertionPoints() {
HTMLSlotElement* Node::AssignedSlot() const {
// assignedSlot doesn't need to call updateDistribution().
- DCHECK(!IsPseudoElement());
+ // DCHECK(!IsPseudoElement());
if (ShadowRoot* root = V1ShadowRootOfParent())
return root->AssignedSlotFor(*this);
return nullptr;
diff --git a/third_party/blink/renderer/core/loader/BUILD.gn b/third_party/blink/renderer/core/loader/BUILD.gn
index 82f6e8bc9d33..ccad95d61a4a 100644
--- a/third_party/blink/renderer/core/loader/BUILD.gn
@ -151,19 +197,6 @@ index 82f6e8bc9d33..ccad95d61a4a 100644
+ defines += [ "ELECTRON_NO_DCHECK" ]
+ }
}
diff --git a/third_party/blink/renderer/core/dom/node.cc b/third_party/blink/renderer/core/dom/node.cc
index 922a2561bcef..e31fa34f98ea 100644
--- a/third_party/blink/renderer/core/dom/node.cc
+++ b/third_party/blink/renderer/core/dom/node.cc
@@ -2435,7 +2435,7 @@ StaticNodeList* Node::getDestinationInsertionPoints() {
HTMLSlotElement* Node::AssignedSlot() const {
// assignedSlot doesn't need to call updateDistribution().
- DCHECK(!IsPseudoElement());
+ // DCHECK(!IsPseudoElement());
if (ShadowRoot* root = V1ShadowRootOfParent())
return root->AssignedSlotFor(*this);
return nullptr;
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 158d81ca9ba2..1b6aafecadef 100644
--- a/third_party/blink/renderer/platform/wtf/text/string_impl.h
@ -193,26 +226,11 @@ index 158d81ca9ba2..1b6aafecadef 100644
DCHECK(IsStatic() || verifier_.OnDeref(ref_count_))
<< AsciiForDebugging() << " " << CurrentThread();
#endif
diff --git a/url/BUILD.gn b/url/BUILD.gn
index 82eb115ae666..b4806804cdbf 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -96,6 +96,10 @@ component("url") {
]
deps += [ "//third_party/icu" ]
}
+
+ if (is_electron_build) {
+ defines += [ "ELECTRON_NO_DCHECK" ]
+ }
}
if (is_android) {
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 674b0e9a909c..a1bff6e40f56 100644
index e49dd8c81270..9e61c901cd2d 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -886,9 +886,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
@@ -905,9 +905,9 @@ void ClipboardWin::WriteBitmapFromHandle(HBITMAP source_hbitmap,
}
void ClipboardWin::WriteToClipboard(unsigned int format, HANDLE handle) {
@ -224,49 +242,21 @@ index 674b0e9a909c..a1bff6e40f56 100644
FreeData(format, handle);
}
}
diff --git a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
index 60b8123cd818..dc719dd31dbf 100644
--- a/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
+++ b/third_party/WebKit/Source/core/animation/ElementAnimations.cpp
@@ -108,7 +108,7 @@ void ElementAnimations::UpdateBaseComputedStyle(
base_computed_style_ = nullptr;
return;
}
-#if DCHECK_IS_ON()
+#if 0
if (base_computed_style_ && computed_style)
DCHECK(*base_computed_style_ == *computed_style);
#endif
diff --git a/base/process/process_metrics_win.cc b/base/process/process_metrics_win.cc
index faabdbf63a2a..ba56e4cd994c 100644
--- a/base/process/process_metrics_win.cc
+++ b/base/process/process_metrics_win.cc
@@ -179,10 +179,9 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
ProcessMetrics::ProcessMetrics(ProcessHandle process) : last_system_time_(0) {
if (process) {
HANDLE duplicate_handle = INVALID_HANDLE_VALUE;
- BOOL result = ::DuplicateHandle(::GetCurrentProcess(), process,
- ::GetCurrentProcess(), &duplicate_handle,
- PROCESS_QUERY_INFORMATION, FALSE, 0);
- DPCHECK(result);
+ ::DuplicateHandle(::GetCurrentProcess(), process,
+ ::GetCurrentProcess(), &duplicate_handle,
+ PROCESS_QUERY_INFORMATION, FALSE, 0);
process_.Set(duplicate_handle);
diff --git a/url/BUILD.gn b/url/BUILD.gn
index c4deb10db9ca..ecc068d7447a 100644
--- a/url/BUILD.gn
+++ b/url/BUILD.gn
@@ -98,6 +98,10 @@ component("url") {
]
deps += [ "//third_party/icu" ]
}
}
diff --git a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
index 9477a5aa45f9..895425c8c6cc 100644
--- a/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
+++ b/components/viz/service/display_embedder/server_shared_bitmap_manager.cc
@@ -69,7 +69,9 @@ base::LazyInstance<ServerSharedBitmapManager>::DestructorAtExit
ServerSharedBitmapManager::ServerSharedBitmapManager() = default;
ServerSharedBitmapManager::~ServerSharedBitmapManager() {
- DCHECK(handle_map_.empty());
+ // FIXME(alexeykuzmin): Gets constantly triggered on Windows CI.
+ // Backporting https://chromium-review.googlesource.com/802574 should help.
+ // DCHECK(handle_map_.empty());
+
+ if (is_electron_build) {
+ defines += [ "ELECTRON_NO_DCHECK" ]
+ }
}
ServerSharedBitmapManager* ServerSharedBitmapManager::current() {
if (is_android) {
--
2.17.0

2
patches/common/chromium/desktop_screen_win.patch
View file

@ -1,5 +1,5 @@
diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc
index f772f64..7d13f9f 100644
index f772f64d656e..7d13f9f81b6c 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -32,6 +32,8 @@ display::Display DesktopScreenWin::GetDisplayMatching(

26
patches/common/chromium/disable-redraw-lock.patch
View file

@ -1,11 +1,11 @@
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index c8fb7eecb9c8..3d995aa331b1 100644
index cadeb2322620..3c5d1afbdfee 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -251,6 +251,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
@@ -256,6 +256,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;
} // namespace
+bool HWNDMessageHandlerDelegate::HasNativeFrame() const {
+ return false;
+}
@ -13,7 +13,7 @@ index c8fb7eecb9c8..3d995aa331b1 100644
// 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.
//
@@ -302,6 +306,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
@@ -307,6 +311,7 @@ class HWNDMessageHandler::ScopedRedrawLock {
cancel_unlock_(false),
should_lock_(owner_->IsVisible() && !owner->HasChildRenderingWindow() &&
::IsWindow(hwnd_) &&
@ -21,38 +21,38 @@ index c8fb7eecb9c8..3d995aa331b1 100644
(!(GetWindowLong(hwnd_, GWL_STYLE) & WS_CAPTION) ||
!ui::win::IsAeroGlassEnabled())) {
if (should_lock_)
@@ -903,6 +908,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
@@ -898,6 +903,10 @@ bool HWNDMessageHandler::HasChildRenderingWindow() {
hwnd());
}
+bool HWNDMessageHandler::HasNativeFrame() {
+ return delegate_->HasNativeFrame();
+}
+
////////////////////////////////////////////////////////////////////////////////
// HWNDMessageHandler, gfx::WindowImpl overrides:
diff --git a/ui/views/win/hwnd_message_handler.h b/ui/views/win/hwnd_message_handler.h
index 5d5765c1928e..d77991cfa737 100644
index 5afb32aa043c..3d17f29dff9a 100644
--- a/ui/views/win/hwnd_message_handler.h
+++ b/ui/views/win/hwnd_message_handler.h
@@ -227,6 +227,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
@@ -177,6 +177,8 @@ class VIEWS_EXPORT HWNDMessageHandler : public gfx::WindowImpl,
typedef std::set<DWORD> TouchIDs;
enum class DwmFrameState { OFF, ON };
+ bool HasNativeFrame();
+
// Overridden from WindowImpl:
HICON GetDefaultWindowIcon() 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
index d13f807e4a75..877189d63616 100644
index 1b2d98a85738..dd080180aebd 100644
--- a/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 {
// True if the widget associated with this window has a non-client view.
virtual bool HasNonClientView() const = 0;
+ virtual bool HasNativeFrame() const;
+
// Returns who we want to be drawing the frame. Either the system (Windows)

4
patches/common/chromium/disable_detach_webview_frame.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index b44b0fd..a74d827 100644
index 838bc1e20c30..2aa16fbf19fc 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -253,6 +253,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
@@ -260,6 +260,12 @@ void RenderFrameProxyHost::SetDestructionCallback(
void RenderFrameProxyHost::OnDetach() {
if (frame_tree_node_->render_manager()->ForInnerDelegate()) {

13
patches/common/chromium/disable_extensions_gn.patch
View file

@ -39,17 +39,18 @@ index b480129fcd7c..4f4f7d06029b 100644
+ }
}
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 72dde06a99a7..e00d6b863b84 100644
index c514878fafe7..bcd3432f75c9 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -2496,7 +2496,9 @@ split_static_library("ui") {
]
}
@@ -2495,7 +2495,10 @@ split_static_library("ui") {
"views/tabs/window_finder_mac.mm",
]
- deps += [ "//extensions/components/native_app_window" ]
+
+ if (enable_extensions) {
+ deps += [ "//extensions/components/native_app_window" ]
+ }
# Truly cocoa-browser-specific sources. These are secondary UI pieces that
# are obsolete before mac_views_browser will ever ship, so they aren't

8
patches/common/chromium/disable_hidden.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 77c870b8a075..f1c4076788c5 100644
index 213f32e0891f..60cfacdcf9fc 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -664,6 +664,9 @@ void RenderWidgetHostImpl::WasHidden() {
@@ -668,6 +668,9 @@ void RenderWidgetHostImpl::WasHidden() {
if (is_hidden_)
return;
@ -13,10 +13,10 @@ index 77c870b8a075..f1c4076788c5 100644
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
index b6aa99e..ef4fa35 100644
index 316385180c60..afce0525e89d 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -124,6 +124,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
@@ -149,6 +149,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
// RenderWidgetHostImpl.
static RenderWidgetHostImpl* From(RenderWidgetHost* rwh);

14
patches/common/chromium/disable_scroll_begin_dcheck.patch
View file

@ -1,21 +1,21 @@
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
index 5d5bead..f2ac4d8 100644
index c3f4641e8525..dd50ff1c2557 100644
--- a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
+++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
@@ -339,7 +339,7 @@ void MouseWheelEventQueue::SendScrollBegin(
@@ -362,7 +362,8 @@ void MouseWheelEventQueue::SendScrollBegin(
(synthetic && !needs_scroll_begin_when_scroll_latching_disabled_) ||
needs_scroll_begin_when_scroll_latching_disabled_);
- DCHECK(!scroll_in_progress_);
+ // DCHECK(!scroll_in_progress_);
scroll_in_progress_ = true;
- DCHECK(!client_->IsWheelScrollInProgress());
+ // DCHECK(!client_->IsWheelScrollInProgress());
WebGestureEvent scroll_begin(gesture_update);
scroll_begin.SetType(WebInputEvent::kGestureScrollBegin);
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 97ca37d843be..fdc4a3f90c64 100644
index 9b930b8acd1d..f3d356f86f15 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -1230,8 +1238,8 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
@@ -1263,8 +1263,8 @@ void RenderWidgetHostImpl::ForwardGestureEventWithLatencyInfo(
// GSB and GSU events instead of sending them to the renderer and continues
// to progress the fling. So, the renderer doesn't receive two GSB events
// without any GSE in between.

4
patches/common/chromium/disable_user_gesture_requirement_for_beforeunload_dialogs.patch
View file

@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index a39067db8c52..4a0d69dc3fb5 100644
index 9abb526ef011..296abf0a1b93 100644
--- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3239,7 +3239,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
@@ -3442,7 +3442,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient& chrome_client,
"Blocked attempt to show a 'beforeunload' confirmation panel for a "
"frame that never had a user gesture since its load. "
"https://www.chromestatus.com/feature/5082396709879808"));

16
patches/common/chromium/frame_host_manager.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index e6f6b3012b02..965b58e237ec 100644
index b682235b0f87..0c88f4bf86b6 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1834,6 +1834,18 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -1912,6 +1912,18 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
bool was_server_redirect = request.navigation_handle() &&
request.navigation_handle()->WasServerRedirect();
@ -21,8 +21,8 @@ index e6f6b3012b02..965b58e237ec 100644
if (frame_tree_node_->IsMainFrame()) {
// Renderer-initiated main frame navigations that may require a
// SiteInstance swap are sent to the browser via the OpenURL IPC and are
@@ -1850,6 +1862,19 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -1931,6 +1943,19 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
request.common_params().url));
no_renderer_swap_allowed |=
request.from_begin_navigation() && !can_renderer_initiate_transfer;
+
@ -41,7 +41,7 @@ index e6f6b3012b02..965b58e237ec 100644
} else {
// Subframe navigations will use the current renderer, unless specifically
// allowed to swap processes.
@@ -1861,18 +1886,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
@@ -1942,18 +1967,9 @@ RenderFrameHostManager::GetSiteInstanceForNavigationRequest(
if (no_renderer_swap_allowed)
return scoped_refptr<SiteInstance>(current_site_instance);
@ -59,13 +59,13 @@ index e6f6b3012b02..965b58e237ec 100644
- request.dest_site_instance(), candidate_site_instance,
+ request.dest_site_instance(), candidate_site_instance.get(),
request.common_params().transition,
request.state() == NavigationRequest::FAILED,
request.restore_type() != RestoreType::NONE, request.is_view_source(),
was_server_redirect);
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 746760e8596c..99d9e0770f32 100644
index 3ca627448e33..7d0c9ed7e1af 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -181,6 +181,15 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -186,6 +186,15 @@ class CONTENT_EXPORT ContentBrowserClient {
public:
virtual ~ContentBrowserClient() {}

8
patches/common/chromium/gin_enable_disable_v8_platform.patch
View file

@ -1,8 +1,8 @@
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc
index 56402d477ca3..8ab11bd18783 100644
index 076d137eb7cf..c10c3b0be66b 100644
--- a/gin/isolate_holder.cc
+++ b/gin/isolate_holder.cc
@@ -116,9 +116,10 @@ IsolateHolder::~IsolateHolder() {
@@ -119,9 +119,10 @@ IsolateHolder::~IsolateHolder() {
void IsolateHolder::Initialize(ScriptMode mode,
V8ExtrasMode v8_extras_mode,
v8::ArrayBuffer::Allocator* allocator,
@ -30,7 +30,7 @@ index 2509aca609f9..94003c6031cf 100644
v8::Isolate* isolate() { return isolate_; }
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
index 02d4b1cd6521..ec6d51d7e5d8 100644
index be2b9149e440..816e56aa4f6b 100644
--- a/gin/v8_initializer.cc
+++ b/gin/v8_initializer.cc
@@ -236,12 +236,14 @@ LoadV8FileResult MapOpenedFile(const OpenedFileMap::mapped_type& file_region,
@ -51,7 +51,7 @@ index 02d4b1cd6521..ec6d51d7e5d8 100644
if (base::FeatureList::IsEnabled(features::kV8OptimizeJavascript)) {
static const char optimize[] = "--opt";
diff --git a/gin/v8_initializer.h b/gin/v8_initializer.h
index f0a7c5e0fb68..df4ab4f3e4b9 100644
index 6f3265ba4d06..29f28bebbdcd 100644
--- a/gin/v8_initializer.h
+++ b/gin/v8_initializer.h
@@ -21,7 +21,8 @@ class GIN_EXPORT V8Initializer {

6
patches/common/chromium/gtk_visibility.patch
View file

@ -1,11 +1,11 @@
diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn
index eb75461..2116f93 100644
index deae4d3455a8..fd5d906b98b0 100644
--- a/build/config/linux/gtk/BUILD.gn
+++ b/build/config/linux/gtk/BUILD.gn
@@ -17,6 +17,8 @@ assert(is_linux, "This file should only be referenced on Linux")
group("gtk") {
@@ -18,6 +18,8 @@ group("gtk") {
visibility = [
"//chrome/test:interactive_ui_tests",
"//chrome/test:unit_tests",
+ "//electron:*",
+ "//electron/brightray:*",
"//examples:peerconnection_client",

4
patches/common/chromium/ignore_rc_check.patch
View file

@ -1,8 +1,8 @@
diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
index a76e926a8681..c43839a01211 100644
index 801d7a9b8e03..7b54f8dceb36 100644
--- a/build/toolchain/win/tool_wrapper.py
+++ b/build/toolchain/win/tool_wrapper.py
@@ -258,7 +258,11 @@ class WinTool(object):
@@ -254,7 +254,11 @@ class WinTool(object):
if rc_exe_exit_code == 0:
import filecmp
# Strip "/fo" prefix.

2
patches/common/chromium/leveldb_ssize_t.patch
View file

@ -1,4 +1,4 @@
diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h
diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h
index a7c449eba19c..acbce7efd582 100644
--- a/third_party/leveldatabase/port/port_chromium.h
+++ b/third_party/leveldatabase/port/port_chromium.h

10
patches/common/chromium/libgtkui_export.patch
View file

@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/libgtkui/app_indicator_icon.h b/chrome/browser/ui/libgtkui/app_indicator_icon.h
index 7815fbb..f17a5c5 100644
index 7815fbb2cea8..f17a5c59e64b 100644
--- a/chrome/browser/ui/libgtkui/app_indicator_icon.h
+++ b/chrome/browser/ui/libgtkui/app_indicator_icon.h
@@ -12,6 +12,7 @@
@ -20,7 +20,7 @@ index 7815fbb..f17a5c5 100644
// The id uniquely identifies the new status icon from other chrome status
// icons.
diff --git a/chrome/browser/ui/libgtkui/gtk_status_icon.h b/chrome/browser/ui/libgtkui/gtk_status_icon.h
index e4e0da4..af02871 100644
index e4e0da40981c..af028715ada9 100644
--- a/chrome/browser/ui/libgtkui/gtk_status_icon.h
+++ b/chrome/browser/ui/libgtkui/gtk_status_icon.h
@@ -10,6 +10,7 @@
@ -41,7 +41,7 @@ index e4e0da4..af02871 100644
Gtk2StatusIcon(const gfx::ImageSkia& image, const base::string16& tool_tip);
~Gtk2StatusIcon() override;
diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h
index 665ec57..4ccb088 100644
index 665ec57c09d5..4ccb08807fb4 100644
--- a/chrome/browser/ui/libgtkui/gtk_util.h
+++ b/chrome/browser/ui/libgtkui/gtk_util.h
@@ -11,6 +11,7 @@
@ -84,7 +84,7 @@ index 665ec57..4ccb088 100644
// Renders the border from the style context created by
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
diff --git a/chrome/browser/ui/libgtkui/skia_utils_gtk.h b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
index e05fbe9..3afca9a 100644
index e05fbe9d8b2f..3afca9a72ab6 100644
--- a/chrome/browser/ui/libgtkui/skia_utils_gtk.h
+++ b/chrome/browser/ui/libgtkui/skia_utils_gtk.h
@@ -7,6 +7,7 @@
@ -105,7 +105,7 @@ index e05fbe9..3afca9a 100644
} // namespace libgtkui
diff --git a/chrome/browser/ui/libgtkui/unity_service.h b/chrome/browser/ui/libgtkui/unity_service.h
index 8d67e14..95fbb27 100644
index 8d67e1460837..95fbb27b6a81 100644
--- a/chrome/browser/ui/libgtkui/unity_service.h
+++ b/chrome/browser/ui/libgtkui/unity_service.h
@@ -5,18 +5,20 @@

30
patches/common/chromium/mas-audiodeviceduck.patch
View file

@ -1,17 +1,8 @@
From d322e351554a4fa1fbaf529769416041031f07e9 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <jeremya@chromium.org>
Date: Mon, 6 Aug 2018 13:02:53 -0700
Subject: fix: [mas] don't call private api AudioDeviceDuck
---
media/audio/mac/audio_low_latency_input_mac.cc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index 173167b54dfb..1c0fda354d03 100644
index 53586b888d82..c1d750dbf32d 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -28,12 +28,14 @@
@@ -31,19 +31,23 @@
namespace {
extern "C" {
@ -25,23 +16,16 @@ index 173167b54dfb..1c0fda354d03 100644
+#endif
}
} // namespace
@@ -604,6 +606,7 @@ bool AUAudioInputStream::OpenVoiceProcessingAU() {
return false;
}
void UndoDucking(AudioDeviceID output_device_id) {
+#ifndef MAS_BUILD
if (AudioDeviceDuck != nullptr) {
// Undo the ducking.
// Obtain the AudioDeviceID of the default output AudioDevice.
@@ -619,6 +622,7 @@ bool AUAudioInputStream::OpenVoiceProcessingAU() {
AudioDeviceDuck(output_device, 1.0, nullptr, 0.5);
}
// Ramp the volume back up over half a second.
AudioDeviceDuck(output_device_id, 1.0, nullptr, 0.5);
}
+#endif
return true;
}
} // namespace
--
2.17.0

21
patches/common/chromium/mas-cfisobjc.patch
View file

@ -1,25 +1,16 @@
From 9fb1ac04b1a3e7ec53e27cf1f413469d04360d1e Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <jeremya@chromium.org>
Date: Mon, 6 Aug 2018 17:11:14 -0700
Subject: fix: [mas] remove usage of _CFIsObjC
---
base/mac/foundation_util.mm | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
index aec8c0f6398c..6a6dfc272d45 100644
index 15fc15ba307e..7ca4e0ec5ca8 100644
--- a/base/mac/foundation_util.mm
+++ b/base/mac/foundation_util.mm
@@ -25,7 +25,6 @@
extern "C" {
@@ -26,7 +26,6 @@ CFTypeID SecKeyGetTypeID();
#if !defined(OS_IOS)
CFTypeID SecACLGetTypeID();
CFTypeID SecTrustedApplicationGetTypeID();
-Boolean _CFIsObjC(CFTypeID typeID, CFTypeRef obj);
} // extern "C"
#endif
} // extern "C"
@@ -323,8 +322,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) {
@@ -325,8 +324,7 @@ NSFont* CFToNSCast(CTFontRef cf_val) {
const_cast<NSFont*>(reinterpret_cast<const NSFont*>(cf_val));
DCHECK(!cf_val ||
CTFontGetTypeID() == CFGetTypeID(cf_val) ||
@ -29,7 +20,7 @@ index aec8c0f6398c..6a6dfc272d45 100644
return ns_val;
}
@@ -392,9 +390,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) {
@@ -394,9 +392,6 @@ CFCast<CTFontRef>(const CFTypeRef& cf_val) {
return (CTFontRef)(cf_val);
}

11
patches/common/chromium/mas-cgdisplayusesforcetogray.patch
View file

@ -1,14 +1,11 @@
From 82d0ef64e22c69c0435608276149977d2811a3f7 Mon Sep 17 00:00:00 2001
From 0680698be349b3619561c65eb072d9880e405fae Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <nornagon@nornagon.net>
Date: Mon, 6 Aug 2018 10:58:46 -0700
Subject: fix: [mas] remove usage of CGDisplayUsesForceToGray
Date: Fri, 14 Sep 2018 09:53:11 -0700
Subject: apply patch: mas-cgdisplayusesforcetogray
---
ui/display/mac/screen_mac.mm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ui/display/mac/screen_mac.mm b/ui/display/mac/screen_mac.mm
index 4850c795480e..ec34b25a6fe8 100644
index be4f343bcd44..84fd3ec23cfa 100644
--- a/ui/display/mac/screen_mac.mm
+++ b/ui/display/mac/screen_mac.mm
@@ -106,7 +106,17 @@ Display BuildDisplayForScreen(NSScreen* screen) {

11
patches/common/chromium/mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
View file

@ -1,14 +1,5 @@
From 3fcbe57ff316894349907bf1c85f71d7487f0932 Mon Sep 17 00:00:00 2001
From: Jeremy Apthorp <jeremya@chromium.org>
Date: Mon, 6 Aug 2018 13:40:24 -0700
Subject: fix: [mas] don't call LaunchServices private api
---
content/gpu/gpu_main.cc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 115f871094bc..aa47a1c1a51e 100644
index e6a589fb90e0..64ff5e248bd7 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -276,8 +276,10 @@ int GpuMain(const MainFunctionParams& parameters) {

12
patches/common/chromium/mas_blink_no_private_api.patch
View file

@ -1,8 +1,8 @@
diff --git a/third_party/blink/renderer/core/paint/theme_painter_mac.mm b/third_party/blink/renderer/core/paint/theme_painter_mac.mm
index 65e6437c22a6..3b726d196427 100644
index dc115581a0e1..3466cfd86e9f 100644
--- a/third_party/blink/renderer/core/paint/theme_painter_mac.mm
+++ b/third_party/blink/renderer/core/paint/theme_painter_mac.mm
@@ -43,6 +43,7 @@
@@ -42,6 +42,7 @@
// The methods in this file are specific to the Mac OS X platform.
@ -10,7 +10,7 @@ index 65e6437c22a6..3b726d196427 100644
// Forward declare Mac SPIs.
extern "C" {
void _NSDrawCarbonThemeBezel(NSRect frame, BOOL enabled, BOOL flipped);
@@ -52,6 +53,7 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
@@ -51,6 +52,7 @@ void _NSDrawCarbonThemeListBox(NSRect frame,
BOOL flipped,
BOOL always_yes);
}
@ -18,7 +18,7 @@ index 65e6437c22a6..3b726d196427 100644
namespace blink {
@@ -74,10 +76,12 @@ bool ThemePainterMac::PaintTextField(const Node* node,
@@ -73,10 +75,12 @@ bool ThemePainterMac::PaintTextField(const Node* node,
// behavior change while remaining a fragile solution.
// https://bugs.chromium.org/p/chromium/issues/detail?id=658085#c3
if (!use_ns_text_field_cell) {
@ -31,7 +31,7 @@ index 65e6437c22a6..3b726d196427 100644
return false;
}
@@ -163,10 +167,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node,
@@ -162,10 +166,12 @@ bool ThemePainterMac::PaintTextArea(const Node* node,
const PaintInfo& paint_info,
const IntRect& r) {
LocalCurrentGraphicsContext local_context(paint_info.context, r);
@ -45,7 +45,7 @@ index 65e6437c22a6..3b726d196427 100644
}
diff --git a/third_party/blink/renderer/platform/mac/kill_ring_mac.mm b/third_party/blink/renderer/platform/mac/kill_ring_mac.mm
index acf60f09fdb9..6376120a954f 100644
index 98dea7c4c3c9..44b4ae940dc5 100644
--- a/third_party/blink/renderer/platform/mac/kill_ring_mac.mm
+++ b/third_party/blink/renderer/platform/mac/kill_ring_mac.mm
@@ -27,6 +27,7 @@

64
patches/common/chromium/mas_no_private_api.patch
View file

@ -30,10 +30,10 @@ index a03585269db6..e7b028760bba 100644
// is concerned.
@property(nonatomic, readonly) NSString* subrole;
diff --git a/content/browser/accessibility/browser_accessibility_cocoa.mm b/content/browser/accessibility/browser_accessibility_cocoa.mm
index 4cff922f28a3..e9c57f7a0879 100644
index bc4b972f9c78..fb06c95af750 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.mm
+++ b/content/browser/accessibility/browser_accessibility_cocoa.mm
@@ -119,6 +119,7 @@ NSDictionary* attributeToMethodNameMap = nil;
@@ -122,6 +122,7 @@ NSDictionary* attributeToMethodNameMap = nil;
// VoiceOver uses -1 to mean "no limit" for AXResultsLimit.
const int kAXResultsLimitNoLimit = -1;
@ -41,7 +41,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
extern "C" {
// The following are private accessibility APIs required for cursor navigation
@@ -325,6 +326,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(
@@ -328,6 +329,7 @@ NSAttributedString* GetAttributedTextForTextMarkerRange(
AddMisspelledTextAttributes(text_only_objects, attributed_text);
return [attributed_text attributedSubstringFromRange:range];
}
@ -49,7 +49,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
// Returns an autoreleased copy of the AXNodeData's attribute.
NSString* NSStringForStringAttribute(
@@ -578,7 +580,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -581,7 +583,9 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
{NSAccessibilityDOMIdentifierAttribute, @"domIdentifier"},
{NSAccessibilityEditableAncestorAttribute, @"editableAncestor"},
{NSAccessibilityEnabledAttribute, @"enabled"},
@ -59,7 +59,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
{NSAccessibilityExpandedAttribute, @"expanded"},
{NSAccessibilityFocusedAttribute, @"focused"},
{NSAccessibilityGrabbedAttribute, @"grabbed"},
@@ -609,13 +613,17 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -614,13 +618,17 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
{NSAccessibilityRowsAttribute, @"rows"},
// TODO(aboxhall): expose
// NSAccessibilityServesAsTitleForUIElementsAttribute
@ -77,7 +77,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
{NSAccessibilitySizeAttribute, @"size"},
{NSAccessibilitySortDirectionAttribute, @"sortDirection"},
{NSAccessibilitySubroleAttribute, @"subrole"},
@@ -1069,6 +1077,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -1091,6 +1099,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
ax::mojom::Restriction::kDisabled];
}
@ -85,7 +85,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
// Returns a text marker that points to the last character in the document that
// can be selected with VoiceOver.
- (id)endTextMarker {
@@ -1080,6 +1089,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -1102,6 +1111,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtEndOfAnchor());
}
@ -93,7 +93,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
- (NSNumber*)expanded {
if (![self instanceActive])
@@ -1892,6 +1902,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -1975,6 +1985,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return [NSValue valueWithRange:NSMakeRange(selStart, selLength)];
}
@ -101,7 +101,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
- (id)selectedTextMarkerRange {
if (![self instanceActive])
return nil;
@@ -1924,6 +1935,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2007,6 +2018,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
anchorAffinity, *focusObject,
focusOffset, focusAffinity));
}
@ -109,7 +109,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
- (NSValue*)size {
if (![self instanceActive])
@@ -1956,6 +1968,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2039,6 +2051,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return nil;
}
@ -117,7 +117,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
// Returns a text marker that points to the first character in the document that
// can be selected with VoiceOver.
- (id)startTextMarker {
@@ -1967,6 +1980,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2050,6 +2063,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
BrowserAccessibilityPositionInstance position = root->CreatePositionAt(0);
return CreateTextMarker(position->CreatePositionAtStartOfAnchor());
}
@ -125,7 +125,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
// Returns a subrole based upon the role.
- (NSString*) subrole {
@@ -2247,12 +2261,14 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2335,12 +2349,14 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
NSMutableAttributedString* attributedValue =
[[[NSMutableAttributedString alloc] initWithString:value] autorelease];
@ -140,7 +140,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
return [attributedValue attributedSubstringFromRange:range];
}
@@ -2372,6 +2388,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2460,6 +2476,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return nil;
}
@ -148,7 +148,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
if ([attribute isEqualToString:@"AXUIElementForTextMarker"]) {
BrowserAccessibilityPositionInstance position =
CreatePositionFromTextMarker(parameter);
@@ -2549,6 +2566,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2637,6 +2654,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
NSString* text = GetTextForTextMarkerRange(parameter);
return [NSNumber numberWithInt:[text length]];
}
@ -156,7 +156,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
if ([attribute isEqualToString:
NSAccessibilityBoundsForRangeParameterizedAttribute]) {
@@ -2586,6 +2604,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2674,6 +2692,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return nil;
}
@ -164,7 +164,7 @@ index 4cff922f28a3..e9c57f7a0879 100644
if ([attribute isEqualToString:
NSAccessibilityLineTextMarkerRangeForTextMarkerParameterizedAttribute]) {
BrowserAccessibilityPositionInstance position =
@@ -2665,6 +2684,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
@@ -2753,6 +2772,7 @@ NSString* const NSAccessibilityRequiredAttributeChrome = @"AXRequired";
return @(child->GetIndexInParent());
}
@ -193,7 +193,7 @@ index 134f855de654..d588ed98839d 100644
}
diff --git a/content/renderer/renderer_main_platform_delegate_mac.mm b/content/renderer/renderer_main_platform_delegate_mac.mm
index 6b955bdb3724..1775f3b3c1d4 100644
index 1e2cc38d3868..daa934c345e2 100644
--- a/content/renderer/renderer_main_platform_delegate_mac.mm
+++ b/content/renderer/renderer_main_platform_delegate_mac.mm
@@ -22,6 +22,7 @@
@ -220,16 +220,16 @@ index 6b955bdb3724..1775f3b3c1d4 100644
// Now disconnect from WindowServer, after all objects have been warmed up.
// Shutting down the connection requires connecting to WindowServer,
// so do this before actually engaging the sandbox. This may cause two log
@@ -51,6 +54,7 @@ void DisconnectWindowServer() {
SetApplicationIsDaemon(true);
// Tell LaunchServices to continue without a connection to the daemon.
_LSSetApplicationLaunchServicesServerConnectionStatus(0, nullptr);
@@ -54,6 +57,7 @@ void DisconnectWindowServer() {
0, ^bool(CFDictionaryRef options) {
return false;
});
+#endif
}
// 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
index 09123af7c2f0..69d6b926576f 100644
index bb996bfd0876..eea959855615 100644
--- a/device/bluetooth/bluetooth_adapter_mac.mm
+++ b/device/bluetooth/bluetooth_adapter_mac.mm
@@ -32,6 +32,7 @@
@ -273,10 +273,10 @@ index 09123af7c2f0..69d6b926576f 100644
void BluetoothAdapterMac::RemovePairingDelegateInternal(
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index 10d786fded92..10e6c6772351 100644
index 8754161b0c90..7705c0dcc5cf 100644
--- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn
@@ -189,6 +189,12 @@ source_set("audio") {
@@ -194,6 +194,12 @@ source_set("audio") {
"mac/scoped_audio_unit.cc",
"mac/scoped_audio_unit.h",
]
@ -290,10 +290,10 @@ index 10d786fded92..10e6c6772351 100644
"AudioToolbox.framework",
"AudioUnit.framework",
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc
index 1a74579e310b..0a15778d6825 100644
index 66a5622f2d3d..b7adea918559 100644
--- a/media/audio/mac/audio_manager_mac.cc
+++ b/media/audio/mac/audio_manager_mac.cc
@@ -993,7 +993,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
@@ -864,7 +864,7 @@ AudioParameters AudioManagerMac::GetPreferredOutputStreamParameters(
void AudioManagerMac::InitializeOnAudioThread() {
DCHECK(GetTaskRunner()->BelongsToCurrentThread());
@ -303,10 +303,10 @@ index 1a74579e310b..0a15778d6825 100644
}
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc
index 706ba6e8e882..3fbe80c91cd9 100644
index 06e9d7969c0f..6fc766e981fd 100644
--- a/net/dns/dns_config_service_posix.cc
+++ b/net/dns/dns_config_service_posix.cc
@@ -244,6 +244,7 @@ class DnsConfigServicePosix::Watcher {
@@ -242,6 +242,7 @@ class DnsConfigServicePosix::Watcher {
bool Watch() {
bool success = true;
@ -314,7 +314,7 @@ index 706ba6e8e882..3fbe80c91cd9 100644
if (!config_watcher_.Watch(base::Bind(&Watcher::OnConfigChanged,
base::Unretained(this)))) {
LOG(ERROR) << "DNS config watch failed to start.";
@@ -265,6 +266,7 @@ class DnsConfigServicePosix::Watcher {
@@ -263,6 +264,7 @@ class DnsConfigServicePosix::Watcher {
DNS_CONFIG_WATCH_MAX);
}
#endif // !defined(OS_ANDROID) && !defined(OS_IOS)
@ -415,10 +415,10 @@ index 9073364142e8..2356add74dfa 100644
NOTREACHED();
return nullptr;
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm
index 3c6e9903d7df..ddc9061c64d1 100644
index c37fd6286340..104cc98f731a 100644
--- a/ui/views/cocoa/bridged_native_widget.mm
+++ b/ui/views/cocoa/bridged_native_widget.mm
@@ -43,6 +43,7 @@
@@ -42,6 +42,7 @@
#include "ui/views/widget/widget_delegate.h"
#include "ui/views/window/dialog_delegate.h"
@ -426,7 +426,7 @@ index 3c6e9903d7df..ddc9061c64d1 100644
extern "C" {
typedef int32_t CGSConnection;
@@ -52,6 +53,7 @@ CGError CGSSetWindowBackgroundBlurRadius(CGSConnection connection,
@@ -51,6 +52,7 @@ CGError CGSSetWindowBackgroundBlurRadius(CGSConnection connection,
int radius);
}

4
patches/common/chromium/net_url_request_job.patch
View file

@ -1,8 +1,8 @@
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 2341999..3011bf7 100644
index 389315a25d7d..d4e3c0e6c2ba 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -269,6 +269,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
@@ -285,6 +285,7 @@ class NET_EXPORT URLRequestJob : public base::PowerObserver {
void OnCallToDelegate();
void OnCallToDelegateComplete();

8
patches/common/chromium/no_cache_storage_check.patch
View file

@ -1,11 +1,11 @@
diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc
index ce6a21b..10a3b18 100644
index d91b54a4d2a1..7f946a5a04c9 100644
--- a/content/browser/cache_storage/cache_storage.cc
+++ b/content/browser/cache_storage/cache_storage.cc
@@ -129,7 +129,7 @@ class CacheStorage::CacheLoader {
blob_context_(blob_context),
@@ -132,7 +132,7 @@ class CacheStorage::CacheLoader {
cache_storage_(cache_storage),
origin_(origin) {
origin_(origin),
owner_(owner) {
- DCHECK(!origin_.unique());
+ // DCHECK(!origin_.unique());
}

17
patches/common/chromium/no_stack_dumping.patch
View file

@ -1,13 +1,16 @@
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index c283922..397ba80 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -657,7 +657,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
InitializeV8IfNeeded(command_line, process_type);
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 83e8990edf17..94b3450bbea5 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -871,7 +871,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
return nullptr;
}));
-#if !defined(OFFICIAL_BUILD)
+#if 0
#if defined(OS_WIN)
bool should_enable_stack_dump = !process_type.empty();
#else
--
2.17.0

4
patches/common/chromium/out_of_process_instance.patch
View file

@ -1,8 +1,8 @@
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc
index 8b9c9f19a3dd..c4d801135053 100644
index 8486db85360f..753c93a8c056 100644
--- a/pdf/out_of_process_instance.cc
+++ b/pdf/out_of_process_instance.cc
@@ -333,7 +333,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
@@ -455,7 +455,9 @@ bool OutOfProcessInstance::Init(uint32_t argc,
std::string document_url = document_url_var.AsString();
base::StringPiece document_url_piece(document_url);
is_print_preview_ = IsPrintPreviewUrl(document_url_piece);

18
patches/common/chromium/pepper_flash.patch
View file

@ -38,7 +38,7 @@ index f4f1741a8ecf..103238cdd53f 100644
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
@@ -57,6 +59,7 @@ int32_t PepperBrokerMessageFilter::OnIsAllowed(
RenderProcessHost::FromID(render_process_id_);
RenderProcessHost::FromID(render_process_id_);
if (!render_process_host)
return PP_ERROR_FAILED;
+#if 0
@ -125,7 +125,7 @@ index 1c1844a9eb71..2c9834b11d34 100644
device::mojom::WakeLock* PepperFlashBrowserHost::GetWakeLock() {
// Here is a lazy binding, and will not reconnect after connection error.
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
index ff0b687a51b6..ab6d96cbe9f8 100644
index 154120ce5156..5152fd847c01 100644
--- a/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h
@@ -23,9 +23,11 @@ namespace content {
@ -140,7 +140,7 @@ index ff0b687a51b6..ab6d96cbe9f8 100644
class GURL;
@@ -51,15 +53,19 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
@@ -49,15 +51,19 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
const base::Time& t);
int32_t OnGetLocalDataRestrictions(ppapi::host::HostMessageContext* context);
@ -160,7 +160,7 @@ index ff0b687a51b6..ab6d96cbe9f8 100644
int render_process_id_;
// Requests a wake lock to prevent going to sleep, and a timer to cancel it
@@ -67,8 +73,10 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
@@ -65,8 +71,10 @@ class PepperFlashBrowserHost : public ppapi::host::ResourceHost {
device::mojom::WakeLockPtr wake_lock_;
base::DelayTimer delay_timer_;
@ -227,7 +227,7 @@ index e267746783bd..bc84b44ceb27 100644
}
+#endif
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
index faa83c9d32e5..bbae9c21b59a 100644
index aa4433cccff4..d9630fdf6b87 100644
--- a/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h
@@ -11,7 +11,9 @@
@ -240,7 +240,7 @@ index faa83c9d32e5..bbae9c21b59a 100644
#include "ppapi/host/host_message_context.h"
#include "ppapi/host/resource_host.h"
@@ -50,7 +52,9 @@ class PepperFlashDRMHost : public ppapi::host::ResourceHost {
@@ -49,7 +51,9 @@ class PepperFlashDRMHost : public ppapi::host::ResourceHost {
const std::string& id,
int32_t result);
@ -251,7 +251,7 @@ index faa83c9d32e5..bbae9c21b59a 100644
base::WeakPtrFactory<PepperFlashDRMHost> weak_factory_;
diff --git a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
index 5599a2d3d62f..532c7290cc36 100644
index 5599a2d3d62f..84e12cf5d273 100644
--- a/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc
@@ -7,16 +7,20 @@
@ -328,8 +328,8 @@ index 5599a2d3d62f..532c7290cc36 100644
case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_INVALID:
break;
case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX:
- return OpenCrxFileSystem(context);
+ return PP_ERROR_NOTSUPPORTED;
- return OpenCrxFileSystem(context);
+ return PP_ERROR_NOTSUPPORTED;
case PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_PLUGINPRIVATE:
return OpenPluginPrivateFileSystem(context);
}

24
patches/common/chromium/render_widget_host_view_base.patch
View file

@ -1,8 +1,8 @@
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 09a37c1a2c70..ff8c2db3fdae 100644
index 1c52a5fd396f..bfaa5a0c7c35 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -399,6 +399,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint(
@@ -515,6 +515,15 @@ viz::FrameSinkId RenderWidgetHostViewBase::FrameSinkIdAtPoint(
return frame_sink_id.is_valid() ? frame_sink_id : GetFrameSinkId();
}
@ -19,12 +19,12 @@ index 09a37c1a2c70..ff8c2db3fdae 100644
const blink::WebMouseEvent& event,
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
index 8e391207a8a7..d3637c82aba9 100644
index 048fd7d3a8bf..1555b278a525 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -21,8 +21,10 @@
#include "components/viz/common/surfaces/scoped_surface_id_allocator.h"
@@ -22,8 +22,10 @@
#include "components/viz/common/surfaces/surface_id.h"
#include "components/viz/host/hit_test/hit_test_query.h"
#include "content/browser/renderer_host/event_with_latency_info.h"
+#include "content/browser/web_contents/web_contents_view.h"
#include "content/common/content_export.h"
@ -33,8 +33,8 @@ index 8e391207a8a7..d3637c82aba9 100644
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/common/input_event_ack_state.h"
#include "content/public/common/screen_info.h"
@@ -79,10 +81,12 @@ class BrowserAccessibilityManager;
class CursorManager;
@@ -84,10 +86,12 @@ class CursorManager;
class MouseWheelPhaseHandler;
class RenderWidgetHostImpl;
class RenderWidgetHostViewBaseObserver;
+class RenderWidgetHostViewGuest;
@ -46,17 +46,17 @@ index 8e391207a8a7..d3637c82aba9 100644
class WebCursor;
struct TextInputState;
@@ -124,6 +128,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
float GetDeviceScaleFactor() const final;
@@ -142,6 +146,9 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
TouchSelectionControllerClientManager*
GetTouchSelectionControllerClientManager() override;
+
+ virtual void InitAsGuest(RenderWidgetHostView* parent_host_view,
+ RenderWidgetHostViewGuest* guest_view) {}
+
// This only needs to be overridden by RenderWidgetHostViewBase subclasses
// that handle content embedded within other RenderWidgetHostViews.
@@ -318,6 +325,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase : public RenderWidgetHostView,
gfx::PointF TransformPointToRootCoordSpaceF(
@@ -346,6 +353,11 @@ class CONTENT_EXPORT RenderWidgetHostViewBase
virtual void ProcessGestureEvent(const blink::WebGestureEvent& event,
const ui::LatencyInfo& latency);

56
patches/common/chromium/render_widget_host_view_mac.patch
View file

@ -1,33 +1,8 @@
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 6a161f0f36c6..349bc78976ad 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -48,6 +48,7 @@
#include "ui/gfx/geometry/dip_util.h"
#include "ui/gfx/mac/coordinate_conversion.h"
#include "ui/gl/gl_switches.h"
+#include "ui/gl/gpu_switching_manager.h"
using blink::WebInputEvent;
using blink::WebMouseEvent;
@@ -1112,6 +1113,12 @@ void RenderWidgetHostViewMac::SetBackgroundColor(SkColor color) {
DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
SkColorGetA(color) == SK_AlphaTRANSPARENT);
bool opaque = SkColorGetA(color) == SK_AlphaOPAQUE;
+ if (opaque) {
+ bool wantsTransparent = ui::GpuSwitchingManager::UseTransparent() ||
+ ([cocoa_view() window] && ![[cocoa_view() window] isOpaque]);
+ if (wantsTransparent)
+ opaque = NO;
+ }
if (background_is_opaque_ != opaque) {
background_is_opaque_ = opaque;
if (host())
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 c7ad6fa8c75f..bdfabc1061bb 100644
index 5b4ae0732914..ea774eb81c75 100644
--- a/content/browser/renderer_host/render_widget_host_view_cocoa.mm
+++ b/content/browser/renderer_host/render_widget_host_view_cocoa.mm
@@ -178,6 +178,11 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -179,6 +179,11 @@ void ExtractUnderlines(NSAttributedString* string,
} // namespace
@ -39,7 +14,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
// These are not documented, so use only after checking -respondsToSelector:.
@interface NSApplication (UndocumentedSpeechMethods)
- (void)speakString:(NSString*)string;
@@ -355,6 +360,9 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -363,6 +368,9 @@ void ExtractUnderlines(NSAttributedString* string,
}
- (BOOL)acceptsFirstMouse:(NSEvent*)theEvent {
@ -49,7 +24,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
return [self acceptsMouseEventsWhenInactive];
}
@@ -555,6 +563,7 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -587,6 +595,7 @@ void ExtractUnderlines(NSAttributedString* string,
if (EventIsReservedBySystem(theEvent))
return NO;
@ -57,7 +32,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
// If we return |NO| from this function, cocoa will send the key event to
// the menu and only if the menu does not process the event to |keyDown:|. We
// want to send the event to a renderer _before_ sending it to the menu, so
@@ -568,6 +577,7 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -600,6 +609,7 @@ void ExtractUnderlines(NSAttributedString* string,
DCHECK(![[NSApp mainMenu] performKeyEquivalent:theEvent]);
return NO;
}
@ -65,7 +40,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
// Command key combinations are sent via performKeyEquivalent rather than
// keyDown:. We just forward this on and if WebCore doesn't want to handle
@@ -664,6 +674,10 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -699,6 +709,10 @@ void ExtractUnderlines(NSAttributedString* string,
eventType == NSKeyDown &&
!(modifierFlags & NSCommandKeyMask);
@ -76,7 +51,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
// We only handle key down events and just simply forward other events.
if (eventType != NSKeyDown) {
client_->OnNSViewForwardKeyboardEvent(event, latency_info);
@@ -1425,9 +1439,11 @@ void ExtractUnderlines(NSAttributedString* string,
@@ -1461,9 +1475,11 @@ void ExtractUnderlines(NSAttributedString* string,
// Since this implementation doesn't have to wait any IPC calls, this doesn't
// make any key-typing jank. --hbono 7/23/09
//
@ -88,7 +63,7 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
- (NSArray*)validAttributesForMarkedText {
// This code is just copied from WebKit except renaming variables.
@@ -1436,7 +1452,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
@@ -1472,7 +1488,10 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
initWithObjects:NSUnderlineStyleAttributeName,
NSUnderlineColorAttributeName,
NSMarkedClauseSegmentAttributeName,
@ -100,3 +75,18 @@ index c7ad6fa8c75f..bdfabc1061bb 100644
}
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
index 8b012bcb8f77..077ccbeaa913 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -53,6 +53,7 @@
#include "ui/events/keycodes/dom/dom_code.h"
#include "ui/gfx/geometry/dip_util.h"
#include "ui/gfx/mac/coordinate_conversion.h"
+#include "ui/gl/gpu_switching_manager.h"
using blink::WebInputEvent;
using blink::WebMouseEvent;
--
2.17.0

6
patches/common/chromium/resource_file_conflict.patch
View file

@ -1,8 +1,8 @@
diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 4304cc82494f..01588f173b16 100644
index 395d16c7cef2..66d81de66f01 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -1663,6 +1663,11 @@ if (is_chrome_branded && !is_android) {
@@ -1652,6 +1652,11 @@ if (is_chrome_branded && !is_android) {
}
}
@ -14,7 +14,7 @@ index 4304cc82494f..01588f173b16 100644
chrome_paks("packed_resources") {
if (is_mac) {
output_dir = "$root_gen_dir/repack"
@@ -1684,6 +1689,7 @@ chrome_paks("packed_resources") {
@@ -1673,6 +1678,7 @@ chrome_paks("packed_resources") {
]
}
}

10
patches/common/chromium/scoped_clipboard_writer.patch
View file

@ -1,8 +1,8 @@
diff --git a/ui/base/clipboard/scoped_clipboard_writer.cc b/ui/base/clipboard/scoped_clipboard_writer.cc
index 6850cd460b1d..6d652cca59b4 100644
index 63b5d47b4069..5c48741a3fc7 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.cc
+++ b/ui/base/clipboard/scoped_clipboard_writer.cc
@@ -102,17 +102,16 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
@@ -103,17 +103,16 @@ void ScopedClipboardWriter::WriteImage(const SkBitmap& bitmap) {
objects_[Clipboard::CBF_SMBITMAP] = parameters;
}
@ -25,7 +25,7 @@ index 6850cd460b1d..6d652cca59b4 100644
Clipboard::ObjectMapParams parameters;
parameters.push_back(format_parameter);
@@ -121,6 +121,13 @@ void ScopedClipboardWriter::WritePickledData(
@@ -121,6 +120,13 @@ void ScopedClipboardWriter::WritePickledData(
objects_[Clipboard::CBF_DATA] = parameters;
}
@ -40,10 +40,10 @@ index 6850cd460b1d..6d652cca59b4 100644
objects_.clear();
bitmap_.reset();
diff --git a/ui/base/clipboard/scoped_clipboard_writer.h b/ui/base/clipboard/scoped_clipboard_writer.h
index a7e064561ca9..d5a1b76bc6a7 100644
index bb889c9dd484..bf6cafd9c55a 100644
--- a/ui/base/clipboard/scoped_clipboard_writer.h
+++ b/ui/base/clipboard/scoped_clipboard_writer.h
@@ -61,6 +61,11 @@ class UI_BASE_EXPORT ScopedClipboardWriter {
@@ -57,6 +57,11 @@ class UI_BASE_EXPORT ScopedClipboardWriter {
// Used by WebKit to determine whether WebKit wrote the clipboard last
void WriteWebSmartPaste();

4
patches/common/chromium/scroll_bounce_flag.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 81d3f80..a8c4a57 100644
index 06f7d4487997..e1deb93f8b0d 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1737,7 +1737,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
@@ -1644,7 +1644,7 @@ bool RenderThreadImpl::IsGpuMemoryBufferCompositorResourcesEnabled() {
}
bool RenderThreadImpl::IsElasticOverscrollEnabled() {

68
patches/common/chromium/ssl_security_state_tab_helper.patch
View file

@ -1,9 +1,9 @@
diff --git a/chrome/browser/ssl/security_state_tab_helper.cc b/chrome/browser/ssl/security_state_tab_helper.cc
index a73442a5476c..6cd7ae78b814 100644
index 7b12c9d2df52..e75171b86ef1 100644
--- a/chrome/browser/ssl/security_state_tab_helper.cc
+++ b/chrome/browser/ssl/security_state_tab_helper.cc
@@ -10,15 +10,21 @@
#include "base/metrics/histogram_macros.h"
@@ -13,17 +13,23 @@
#include "base/strings/string_util.h"
#include "base/time/time.h"
#include "build/build_config.h"
+#if 0
@ -12,19 +12,21 @@ index a73442a5476c..6cd7ae78b814 100644
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/ui_manager.h"
+#endif
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/secure_origin_whitelist.h"
#include "components/prefs/pref_service.h"
+#if 0
#include "components/safe_browsing/features.h"
+#endif
#include "components/security_state/content/content_utils.h"
#include "components/ssl_config/ssl_config_prefs.h"
+#if 0
#include "components/toolbar/toolbar_field_trial.h"
+#endif
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/navigation_handle.h"
@@ -37,7 +43,7 @@
@@ -43,7 +49,7 @@
#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
#endif // defined(OS_CHROMEOS)
@ -33,7 +35,7 @@ index a73442a5476c..6cd7ae78b814 100644
#include "chrome/browser/safe_browsing/chrome_password_protection_service.h"
#endif
@@ -59,7 +65,9 @@ void RecordSecurityLevel(const security_state::SecurityInfo& security_info) {
@@ -81,7 +87,9 @@ bool IsOriginSecureWithWhitelist(
DEFINE_WEB_CONTENTS_USER_DATA_KEY(SecurityStateTabHelper);
@ -43,7 +45,7 @@ index a73442a5476c..6cd7ae78b814 100644
SecurityStateTabHelper::SecurityStateTabHelper(
content::WebContents* web_contents)
@@ -67,8 +75,11 @@ SecurityStateTabHelper::SecurityStateTabHelper(
@@ -89,8 +97,11 @@ SecurityStateTabHelper::SecurityStateTabHelper(
logged_http_warning_on_current_navigation_(false),
is_incognito_(false) {
content::BrowserContext* context = web_contents->GetBrowserContext();
@ -57,7 +59,7 @@ index a73442a5476c..6cd7ae78b814 100644
is_incognito_ = true;
}
}
@@ -150,6 +161,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -175,6 +186,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
UMA_HISTOGRAM_BOOLEAN("interstitial.ssl.visited_site_after_warning", true);
}
@ -65,7 +67,7 @@ index a73442a5476c..6cd7ae78b814 100644
// Security indicator UI study (https://crbug.com/803501): Show a message in
// the console to reduce developer confusion about the experimental UI
// treatments for HTTPS pages with EV certificates.
@@ -177,6 +189,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
@@ -202,6 +214,7 @@ void SecurityStateTabHelper::DidFinishNavigation(
"Validation is still valid.");
}
}
@ -73,7 +75,7 @@ index a73442a5476c..6cd7ae78b814 100644
}
void SecurityStateTabHelper::DidChangeVisibleSecurityState() {
@@ -250,6 +263,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -275,6 +288,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
web_contents()->GetController().GetVisibleEntry();
if (!entry)
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
@ -81,7 +83,7 @@ index a73442a5476c..6cd7ae78b814 100644
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -301,6 +315,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
@@ -323,6 +337,7 @@ SecurityStateTabHelper::GetMaliciousContentStatus() const {
break;
}
}
@ -89,3 +91,47 @@ index a73442a5476c..6cd7ae78b814 100644
return security_state::MALICIOUS_CONTENT_STATUS_NONE;
}
@@ -343,15 +358,19 @@ std::vector<std::string> SecurityStateTabHelper::GetSecureOriginsAndPatterns()
const {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
+#if 0
Profile* profile =
Profile::FromBrowserContext(web_contents()->GetBrowserContext());
PrefService* prefs = profile->GetPrefs();
+#endif
std::string origins_str = "";
if (command_line.HasSwitch(switches::kUnsafelyTreatInsecureOriginAsSecure)) {
origins_str = command_line.GetSwitchValueASCII(
switches::kUnsafelyTreatInsecureOriginAsSecure);
+#if 0
} else if (prefs->HasPrefPath(prefs::kUnsafelyTreatInsecureOriginAsSecure)) {
origins_str = prefs->GetString(prefs::kUnsafelyTreatInsecureOriginAsSecure);
+#endif
}
return secure_origin_whitelist::ParseWhitelist(origins_str);
}
diff --git a/chrome/common/secure_origin_whitelist.cc b/chrome/common/secure_origin_whitelist.cc
index db9bb54ddbc1..cc7a22bdb920 100644
--- a/chrome/common/secure_origin_whitelist.cc
+++ b/chrome/common/secure_origin_whitelist.cc
@@ -13,7 +13,9 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_registry_simple.h"
+#if 0
#include "extensions/common/constants.h"
+#endif
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "url/gurl.h"
#include "url/origin.h"
@@ -155,7 +157,9 @@ std::vector<std::string> GetWhitelist() {
std::set<std::string> GetSchemesBypassingSecureContextCheck() {
std::set<std::string> schemes;
+#if 0
schemes.insert(extensions::kExtensionScheme);
+#endif
return schemes;
}

2
patches/common/chromium/statically_build_power_save_blocker.patch
View file

@ -1,5 +1,5 @@
diff --git a/services/device/wake_lock/power_save_blocker/BUILD.gn b/services/device/wake_lock/power_save_blocker/BUILD.gn
index e04629ca1a93..299e6efd75f9 100644
index dfce90f6b791..a2f7f776f4d8 100644
--- a/services/device/wake_lock/power_save_blocker/BUILD.gn
+++ b/services/device/wake_lock/power_save_blocker/BUILD.gn
@@ -9,7 +9,7 @@ if (is_android) {

2
patches/common/chromium/stream_resource_handler.patch
View file

@ -1,5 +1,5 @@
diff --git a/content/browser/loader/stream_resource_handler.h b/content/browser/loader/stream_resource_handler.h
index 9f69994..ae8d1630 100644
index cb8a2d58d6b8..dbfa64089325 100644
--- a/content/browser/loader/stream_resource_handler.h
+++ b/content/browser/loader/stream_resource_handler.h
@@ -11,6 +11,7 @@

26
patches/common/chromium/sysroot.patch
View file

@ -51,14 +51,14 @@ index 58f09950d844..53500a0853a6 100755
class Error(Exception):
pass
diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json
index 48a1d36f0609..91ef1417a1bf 100644
index e79b69b764b1..91ef1417a1bf 100644
--- a/build/linux/sysroot_scripts/sysroots.json
+++ b/build/linux/sysroot_scripts/sysroots.json
@@ -1,38 +1,38 @@
{
- "sid_amd64": {
- "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
- "Sha1Sum": "85ac8d5e0f6cff99fc323fd3d29cb73e2aa970e2",
- "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
- "Sha1Sum": "4e7db513b0faeea8fb410f70c9909e8736f5c0ab",
- "SysrootDir": "debian_sid_amd64-sysroot",
- "Tarball": "debian_sid_amd64_sysroot.tar.xz"
+ "stretch_amd64": {
@ -68,8 +68,8 @@ index 48a1d36f0609..91ef1417a1bf 100644
+ "Tarball": "debian_stretch_amd64_sysroot.tgz"
},
- "sid_arm": {
- "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
- "Sha1Sum": "ed31924757f11885a21793dc4b928d07ab25740c",
- "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
- "Sha1Sum": "b2165ab47ab9c4cc780db53ace1b08607d68ae31",
- "SysrootDir": "debian_sid_arm-sysroot",
- "Tarball": "debian_sid_arm_sysroot.tar.xz"
+ "stretch_arm": {
@ -79,8 +79,8 @@ index 48a1d36f0609..91ef1417a1bf 100644
+ "Tarball": "debian_stretch_arm_sysroot.tgz"
},
- "sid_arm64": {
- "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
- "Sha1Sum": "b9447285e58c5260bd9fa2737d1f0d1f82156738",
- "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
- "Sha1Sum": "37dfa5f22e2c0e847cee34f9848eb31230c33d35",
- "SysrootDir": "debian_sid_arm64-sysroot",
- "Tarball": "debian_sid_arm64_sysroot.tar.xz"
+ "stretch_arm64": {
@ -90,8 +90,8 @@ index 48a1d36f0609..91ef1417a1bf 100644
+ "Tarball": "debian_stretch_arm64_sysroot.tgz"
},
- "sid_i386": {
- "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
- "Sha1Sum": "f09856d93f39e8df84ffd9c04881f44e6cbc0508",
- "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
- "Sha1Sum": "b8639749e2b561a7462d7e7978ca74ee4044bdab",
- "SysrootDir": "debian_sid_i386-sysroot",
- "Tarball": "debian_sid_i386_sysroot.tar.xz"
+ "stretch_i386": {
@ -101,8 +101,8 @@ index 48a1d36f0609..91ef1417a1bf 100644
+ "Tarball": "debian_stretch_i386_sysroot.tgz"
},
- "sid_mips": {
- "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
- "Sha1Sum": "90586b566b567b2bcf49e7fd112f0c8189bbd07b",
- "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
- "Sha1Sum": "baaf37cdcbcf251fb9a4ccaf8b479722ae61fe49",
- "SysrootDir": "debian_sid_mips-sysroot",
- "Tarball": "debian_sid_mips_sysroot.tar.xz"
+ "stretch_mips": {
@ -112,8 +112,8 @@ index 48a1d36f0609..91ef1417a1bf 100644
+ "Tarball": "debian_stretch_mips_sysroot.tgz"
},
- "sid_mips64el": {
- "Revision": "15b7efb900d75f7316c6e713e80f87b9904791b1",
- "Sha1Sum": "f90c3b81485ffebb283afddb1a72bc61e14c593d",
- "Revision": "1015a998c2adf188813cca60b558b0ea1a0b6ced",
- "Sha1Sum": "bbfe1a513b849921cfcf78865faec8fc03f93b3d",
- "SysrootDir": "debian_sid_mips64el-sysroot",
- "Tarball": "debian_sid_mips64el_sysroot.tar.xz"
- }

4
patches/common/chromium/thread_capabilities.patch
View file

@ -1,8 +1,8 @@
diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
index 50a109e..3ee9159 100644
index ad0714a7f5ed..1406e1d53f2f 100644
--- a/sandbox/linux/services/credentials.cc
+++ b/sandbox/linux/services/credentials.cc
@@ -358,8 +358,10 @@ pid_t Credentials::ForkAndDropCapabilitiesInChild() {
@@ -348,8 +348,10 @@ pid_t Credentials::ForkAndDropCapabilitiesInChild() {
return pid;
}

2
patches/common/chromium/use_transparent_window.patch
View file

@ -1,5 +1,5 @@
diff --git a/ui/gl/gpu_switching_manager.cc b/ui/gl/gpu_switching_manager.cc
index be7156465809..cee3b1af3dc5 100644
index be7156465809..4529866b0864 100644
--- a/ui/gl/gpu_switching_manager.cc
+++ b/ui/gl/gpu_switching_manager.cc
@@ -4,6 +4,12 @@

22
patches/common/chromium/web_contents.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 018534073da1..48f3d0e7343b 100644
index 6ae9bf2f9c6a..6ed6ece96d0f 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -1759,6 +1759,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1845,6 +1845,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -15,7 +15,7 @@ index 018534073da1..48f3d0e7343b 100644
WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -1774,6 +1780,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
@@ -1860,6 +1866,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
&render_view_host_delegate_view_);
}
}
@ -24,7 +24,7 @@ index 018534073da1..48f3d0e7343b 100644
CHECK(view_.get());
diff --git a/content/browser/web_contents/web_contents_view_guest.cc b/content/browser/web_contents/web_contents_view_guest.cc
index 699570cc1390..454830098cb9 100644
index 699570cc1390..63e60667fa7d 100644
--- a/content/browser/web_contents/web_contents_view_guest.cc
+++ b/content/browser/web_contents/web_contents_view_guest.cc
@@ -67,21 +67,27 @@ gfx::NativeWindow WebContentsViewGuest::GetTopLevelNativeWindow() const {
@ -58,7 +58,7 @@ index 699570cc1390..454830098cb9 100644
}
#endif // defined(USE_AURA)
}
@@ -146,11 +152,22 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
@@ -144,11 +150,22 @@ RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForWidget(
render_widget_host->GetView());
}
@ -86,10 +86,10 @@ index 699570cc1390..454830098cb9 100644
RenderWidgetHostViewBase* WebContentsViewGuest::CreateViewForPopupWidget(
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index a13db5f4dd61..621124decfdc 100644
index dee5814a247c..7690ce8d404b 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -69,9 +69,12 @@ class BrowserPluginGuestDelegate;
@@ -74,9 +74,12 @@ class BrowserPluginGuestDelegate;
class InterstitialPage;
class RenderFrameHost;
class RenderViewHost;
@ -101,10 +101,10 @@ index a13db5f4dd61..621124decfdc 100644
+class WebContentsView;
struct CustomContextMenuContext;
struct DropData;
struct Manifest;
@@ -172,6 +175,10 @@ class WebContents : public PageNavigator,
// navigation requires a dedicated or privileged process, such as a WebUI.
bool initialize_renderer;
struct MHTMLGenerationParams;
@@ -213,6 +216,10 @@ class WebContents : public PageNavigator,
kInitializeAndWarmupRendererProcess,
} desired_renderer_state;
+ // Optionally specify the view and delegate view.
+ content::WebContentsView* view = nullptr;

45
patches/common/chromium/webgl_context_attributes.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 0affacaa0294..0c321d51364d 100644
index 4205c92765af..c82360f146d1 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1136,8 +1136,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider(
@@ -1021,8 +1021,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider(
attributes.sample_buffers = 0;
attributes.bind_generates_resource = false;
attributes.enable_raster_interface = web_attributes.enable_raster_interface;
@ -15,8 +15,20 @@ index 0affacaa0294..0c321d51364d 100644
attributes.fail_if_major_perf_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
index f3ec52975650..920d161a1b81 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -493,6 +493,7 @@ class BLINK_PLATFORM_EXPORT Platform {
kGLES3ContextType, // GLES 3.0 context
};
struct ContextAttributes {
+ bool prefer_integrated_gpu = false;
bool fail_if_major_performance_caveat = false;
ContextType context_type = kGLES2ContextType;
// Offscreen contexts usually share a surface for the default frame buffer
diff --git a/third_party/blink/renderer/core/html/canvas/canvas_context_creation_attributes_core.h b/third_party/blink/renderer/core/html/canvas/canvas_context_creation_attributes_core.h
index ca4543a10e69..a1f5e5c9f906 100644
index 298e186289a0..5223ae30db6b 100644
--- a/third_party/blink/renderer/core/html/canvas/canvas_context_creation_attributes_core.h
+++ b/third_party/blink/renderer/core/html/canvas/canvas_context_creation_attributes_core.h
@@ -30,6 +30,7 @@ class CORE_EXPORT CanvasContextCreationAttributesCore {
@ -28,7 +40,7 @@ index ca4543a10e69..a1f5e5c9f906 100644
// This attribute is of type XRDevice, defined in modules/xr/XRDevice.h
diff --git a/third_party/blink/renderer/modules/canvas/htmlcanvas/canvas_context_creation_attributes_module.idl b/third_party/blink/renderer/modules/canvas/htmlcanvas/canvas_context_creation_attributes_module.idl
index 7419bb20d316..5b04af00fab4 100644
index 7b655dd12a77..8969eb7d98f3 100644
--- a/third_party/blink/renderer/modules/canvas/htmlcanvas/canvas_context_creation_attributes_module.idl
+++ b/third_party/blink/renderer/modules/canvas/htmlcanvas/canvas_context_creation_attributes_module.idl
@@ -28,6 +28,12 @@ enum CanvasPixelFormat {
@ -44,7 +56,7 @@ index 7419bb20d316..5b04af00fab4 100644
[PermissiveDictionaryConversion]
dictionary CanvasContextCreationAttributesModule {
// This is an experimental feature, but it is not hidden behind a flag in
@@ -47,6 +47,7 @@ dictionary CanvasContextCreationAttributesModule {
@@ -47,6 +53,7 @@ dictionary CanvasContextCreationAttributesModule {
boolean antialias = true;
boolean premultipliedAlpha = true;
boolean preserveDrawingBuffer = false;
@ -53,7 +65,7 @@ index 7419bb20d316..5b04af00fab4 100644
[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
index 332fa9fb0547..e8fae4b01c39 100644
index 7274af57b8ee..2a2737da1a56 100644
--- a/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(
@ -64,7 +76,7 @@ index 332fa9fb0547..e8fae4b01c39 100644
result.setFailIfMajorPerformanceCaveat(
attrs.fail_if_major_performance_caveat);
result.setCompatibleXRDevice(
@@ -30,6 +30,7 @@ Platform::ContextAttributes ToPlatformContextAttributes(
@@ -30,6 +31,7 @@ Platform::ContextAttributes ToPlatformContextAttributes(
unsigned web_gl_version,
bool support_own_offscreen_surface) {
Platform::ContextAttributes result;
@ -73,7 +85,7 @@ index 332fa9fb0547..e8fae4b01c39 100644
attrs.fail_if_major_performance_caveat;
result.context_type = web_gl_version == 2 ? Platform::kWebGL2ContextType
diff --git a/third_party/blink/renderer/modules/webgl/webgl_context_attributes.idl b/third_party/blink/renderer/modules/webgl/webgl_context_attributes.idl
index 180673be9bd0..0af29cbc9402 100644
index 38ca0f6b6a0c..90cfe8497daf 100644
--- a/third_party/blink/renderer/modules/webgl/webgl_context_attributes.idl
+++ b/third_party/blink/renderer/modules/webgl/webgl_context_attributes.idl
@@ -26,6 +26,12 @@
@ -89,7 +101,7 @@ index 180673be9bd0..0af29cbc9402 100644
dictionary WebGLContextAttributes {
boolean alpha = true;
boolean depth = true;
@@ -33,6 +33,7 @@ dictionary WebGLContextAttributes {
@@ -33,6 +39,7 @@ dictionary WebGLContextAttributes {
boolean antialias = true;
boolean premultipliedAlpha = true;
boolean preserveDrawingBuffer = false;
@ -97,15 +109,6 @@ index 180673be9bd0..0af29cbc9402 100644
boolean failIfMajorPerformanceCaveat = false;
[OriginTrialEnabled=WebXR] XRDevice compatibleXRDevice = null;
};
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index d4948345246e..bc277ba6aa5f 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -522,6 +522,7 @@ class BLINK_PLATFORM_EXPORT Platform {
kGLES3ContextType, // GLES 3.0 context
};
struct ContextAttributes {
+ bool prefer_integrated_gpu = false;
bool fail_if_major_performance_caveat = false;
ContextType context_type = kGLES2ContextType;
// Offscreen contexts usually share a surface for the default frame buffer
--
2.17.0

38
patches/common/chromium/webui_in_subframes.patch
View file

@ -1,25 +1,23 @@
diff --git a/content/browser/frame_host/render_frame_host_delegate.cc b/content/browser/frame_host/render_frame_host_delegate.cc
index 4d0a8ea553c5..0fac0b22ff2f 100644
index 390bcf09995e..f9090f8ea24a 100644
--- a/content/browser/frame_host/render_frame_host_delegate.cc
+++ b/content/browser/frame_host/render_frame_host_delegate.cc
@@ -89,8 +89,10 @@ bool RenderFrameHostDelegate::ShouldRouteMessageEvent(
@@ -99,7 +99,9 @@ RenderFrameHostDelegate::GetFocusedFrameIncludingInnerWebContents() {
}
std::unique_ptr<WebUIImpl>
-RenderFrameHostDelegate::CreateWebUIForRenderFrameHost(const GURL& url) {
- return nullptr;
+RenderFrameHostDelegate::CreateWebUIForRenderFrameHost(
+ const GURL& url,
+ const std::string& frame_name) {
+ return nullptr;
return nullptr;
}
bool RenderFrameHostDelegate::ShouldAllowRunningInsecureContent(
diff --git a/content/browser/frame_host/render_frame_host_delegate.h b/content/browser/frame_host/render_frame_host_delegate.h
index 197b64b49fd6..2e94b03c4f44 100644
index cd4a295dfa37..1057c6d33b9e 100644
--- a/content/browser/frame_host/render_frame_host_delegate.h
+++ b/content/browser/frame_host/render_frame_host_delegate.h
@@ -234,7 +234,8 @@ class CONTENT_EXPORT RenderFrameHostDelegate {
@@ -275,7 +275,8 @@ class CONTENT_EXPORT RenderFrameHostDelegate {
// Creates a WebUI object for a frame navigating to |url|. If no WebUI
// applies, returns null.
virtual std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(
@ -30,18 +28,18 @@ index 197b64b49fd6..2e94b03c4f44 100644
// Called by |frame| to notify that it has received an update on focused
// element. |bounds_in_root_view| is the rectangle containing the element that
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 1f566ef1f437..bb2f59d62315 100644
index 7a53675a2139..29bb8eaba5c1 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -20,6 +20,7 @@
#include "base/process/kill.h"
@@ -25,6 +25,7 @@
#include "base/task_scheduler/post_task.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/time/time.h"
+#include "base/unguessable_token.h"
#include "build/build_config.h"
#include "cc/base/switches.h"
#include "content/browser/accessibility/browser_accessibility_manager.h"
@@ -3468,8 +3514,23 @@ bool RenderFrameHostImpl::UpdatePendingWebUI(const GURL& dest_url,
@@ -4198,8 +4199,23 @@ bool RenderFrameHostImpl::UpdatePendingWebUI(const GURL& dest_url,
DCHECK(web_ui_);
should_reuse_web_ui_ = true;
} else {
@ -67,13 +65,13 @@ index 1f566ef1f437..bb2f59d62315 100644
pending_web_ui_type_ = new_web_ui_type;
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index f985ea2bceab..779cfd79312d 100644
index 6ed6ece96d0f..11bf320311bb 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -768,6 +768,25 @@ RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() {
@@ -752,6 +752,25 @@ RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() {
return GetRenderManager();
}
+void SendMessageToFrameTreeWebUIs(RenderFrameHostImpl* parent_frame_host,
+ const IPC::Message& message,
+ int& dispatch_count) {
@ -96,8 +94,8 @@ index f985ea2bceab..779cfd79312d 100644
bool WebContentsImpl::OnMessageReceived(RenderViewHostImpl* render_view_host,
const IPC::Message& message) {
for (auto& observer : observers_) {
@@ -809,9 +828,10 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHostImpl* render_view_host,
@@ -787,9 +806,10 @@ bool WebContentsImpl::OnMessageReceived(RenderViewHostImpl* render_view_host,
bool WebContentsImpl::OnMessageReceived(RenderFrameHostImpl* render_frame_host,
const IPC::Message& message) {
- {
@ -109,8 +107,8 @@ index f985ea2bceab..779cfd79312d 100644
+ if (dispatch_count > 0)
return true;
}
@@ -5021,8 +5043,9 @@ NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
@@ -5782,8 +5802,9 @@ NavigationControllerImpl& WebContentsImpl::GetControllerForRenderManager() {
}
std::unique_ptr<WebUIImpl> WebContentsImpl::CreateWebUIForRenderFrameHost(
@ -123,10 +121,10 @@ index f985ea2bceab..779cfd79312d 100644
NavigationEntry*
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 84a01a83c72a..49d0a4b547c2 100644
index cd1c992c7738..5d52d8cb0bc4 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -534,7 +534,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
@@ -543,7 +543,8 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents,
SiteInstance* source_site_instance) const override;
void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;
std::unique_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(

8
patches/common/chromium/webview_cross_drag.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 1bfef2c..0ba2260 100644
index 984fa41d064c..28c018d9fbfc 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -675,6 +675,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
@@ -609,6 +609,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
bool WebContentsViewAura::IsValidDragTarget(
RenderWidgetHostImpl* target_rwh) const {
@ -11,10 +11,10 @@ index 1bfef2c..0ba2260 100644
GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
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
index 37ed265..814a37d 100644
index cec3bd8a97b8..7a2b4462bd44 100644
--- a/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 {
@@ -348,6 +348,7 @@ GetRenderWidgetHostAtPoint:(const NSPoint&)viewPoint
}
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {

4
patches/common/chromium/webview_reattach.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index b2d1e63..bc2cf9a 100644
index 11bf320311bb..27f087d4f706 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -4562,6 +4562,11 @@ void WebContentsImpl::NotifyViewSwapped(RenderViewHost* old_host,
@@ -4725,6 +4725,11 @@ void WebContentsImpl::NotifyViewSwapped(RenderViewHost* old_host,
for (auto& observer : observers_)
observer.RenderViewHostChanged(old_host, new_host);

14
patches/common/chromium/windows_cc_wrapper.patch
View file

@ -1,5 +1,5 @@
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index a526d47e7786..946df3cd513c 100644
index 286c791613ba..55b5499a1cb2 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/clang/clang.gni")
@ -24,17 +24,17 @@ index a526d47e7786..946df3cd513c 100644
+ }
}
if (disable_goma) {
@@ -389,7 +396,7 @@ if (target_os == "win" &&
msvc_toolchain("win_clang_" + target_cpu) {
environment = "environment." + target_cpu
# Copy the VS runtime DLL for the default toolchain to the root build directory
@@ -381,7 +388,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 = "${target_cpu_toolchain_data.include_flags_imsvc}"
sys_include_flags = "${build_cpu_toolchain_data.include_flags_imsvc}"
toolchain_args = {
@@ -431,7 +438,7 @@ template("win_x64_toolchains") {
@@ -422,7 +429,7 @@ template("win_x64_toolchains") {
msvc_toolchain("win_clang_" + target_name) {
environment = "environment.x64"
prefix = rebase_path("$clang_base_path/bin", root_build_dir)

43
patches/common/chromium/worker_context_will_destroy.patch
View file

@ -1,8 +1,8 @@
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h
index 0e554ba8467a..8e56489a5152 100644
index 6dd2589d653a..48bb1dbe9750 100644
--- a/content/public/renderer/content_renderer_client.h
+++ b/content/public/renderer/content_renderer_client.h
@@ -351,6 +351,11 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -380,6 +380,11 @@ class CONTENT_EXPORT ContentRendererClient {
virtual void DidInitializeWorkerContextOnWorkerThread(
v8::Local<v8::Context> context) {}
@ -15,10 +15,10 @@ index 0e554ba8467a..8e56489a5152 100644
// An empty URL is returned if the URL is not overriden.
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 0affacaa0294..eca456faa640 100644
index c82360f146d1..e0a90a8a6881 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1402,6 +1404,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
@@ -1251,6 +1251,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
}
@ -32,10 +32,10 @@ index 0affacaa0294..eca456faa640 100644
const v8::Local<v8::Context>& worker) {
GetContentClient()->renderer()->DidInitializeWorkerContextOnWorkerThread(
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index e8a4578009d1..e9ba4e7f391f 100644
index ecb5ce6d6aa0..dffe3bca1a34 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -219,6 +219,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -204,6 +204,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
void DidStartWorkerThread() override;
void WillStopWorkerThread() override;
void WorkerContextCreated(const v8::Local<v8::Context>& worker) override;
@ -43,11 +43,23 @@ index e8a4578009d1..e9ba4e7f391f 100644
// Set the PlatformEventObserverBase in |platform_event_observers_| associated
// with |type| to |observer|. If there was already an observer associated to
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 920d161a1b81..f97250ea984e 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -616,6 +616,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
+ virtual void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) {}
virtual bool AllowScriptExtensionForServiceWorker(const WebURL& script_url) {
return false;
}
diff --git a/third_party/blink/renderer/core/workers/worker_thread.cc b/third_party/blink/renderer/core/workers/worker_thread.cc
index a522ba4dbdf7..6991078b36f5 100644
index 7cf818b56c13..7e6e1191c399 100644
--- a/third_party/blink/renderer/core/workers/worker_thread.cc
+++ b/third_party/blink/renderer/core/workers/worker_thread.cc
@@ -481,6 +481,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
@@ -517,6 +517,12 @@ void WorkerThread::PrepareForShutdownOnWorkerThread() {
SetExitCode(ExitCode::kGracefullyTerminated);
}
@ -60,15 +72,6 @@ index a522ba4dbdf7..6991078b36f5 100644
inspector_task_runner_->Dispose();
GetWorkerReportingProxy().WillDestroyWorkerGlobalScope();
probe::AllAsyncTasksCanceled(GlobalScope());
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 98ecb84..0779d4a 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -596,6 +596,7 @@ class BLINK_PLATFORM_EXPORT Platform {
virtual void DidStartWorkerThread() {}
virtual void WillStopWorkerThread() {}
virtual void WorkerContextCreated(const v8::Local<v8::Context>& worker) {}
+ virtual void WorkerContextWillDestroy(const v8::Local<v8::Context>& worker) {}
virtual bool AllowScriptExtensionForServiceWorker(const WebURL& script_url) {
return false;
}
--
2.17.0