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

chore: roll 73.0.3679.0

Browse source
This commit is contained in:
deepak1556 2019-01-24 15:12:21 +05:30
parent c2be0846c2
commit 10850808e9
40 changed files with 134 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DEPS
View file

@ -10,7 +10,7 @@ gclient_gn_args = [
vars = { vars = {
'chromium_version': 'chromium_version':
'73.0.3673.0', '73.0.3679.0',
'node_version': 'node_version':
'ad2c89ec3be0f5db3ea02b0f591d36a5d84c51ad', 'ad2c89ec3be0f5db3ea02b0f591d36a5d84c51ad',

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

@ -39,10 +39,10 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
GIN_EXPORT static ArrayBufferAllocator* SharedInstance(); GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
index 544e1f638f5e23613dff785f5b74803f2831b960..07098f60eeea370e7a46df39a3877847e29f3a1a 100644 index bec05f5222c6653f6f42c87a2f71e4aa0f244b5e..96533b347ca9e1e140fb019a2b95093d5e1aee73 100644
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc --- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc +++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
@@ -662,6 +662,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator { @@ -649,6 +649,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
size, WTF::ArrayBufferContents::kDontInitialize); size, WTF::ArrayBufferContents::kDontInitialize);
} }

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

@ -6,10 +6,10 @@ Subject: allow_webview_file_url.patch
Allow webview to load non-web URLs. Allow webview to load non-web URLs.
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index 14bfd604d8e4fb3935f22fcc2d60257cd680f3c7..99becfe8a77498bd7d557c1275773ff82f2df691 100644 index 8a67808f690a2baf526f39095dd5e1122319ee91..1ab079b1fe97c506dca39b5b175f045394abae62 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc --- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1458,6 +1458,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest( @@ -1449,6 +1449,8 @@ void ResourceDispatcherHostImpl::BeginNavigationRequest(
!policy->IsWebSafeScheme(info.common_params.url.scheme()) && !policy->IsWebSafeScheme(info.common_params.url.scheme()) &&
!is_external_protocol; !is_external_protocol;

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

@ -5,10 +5,10 @@ Subject: blink-worker-enable-csp-in-file-scheme.patch
diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc diff --git a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
index 03b5004edc9dd9bba39db188c71f52625bcce80e..ad37ea96307be715070a21b859b8756e6d837132 100644 index c404b0a5966416599a62075e0a616fda368e07ec..98a3e02f1335dd7256b7926bc6e7774c79e00d4a 100644
--- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc --- a/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
+++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc +++ b/third_party/blink/renderer/core/workers/worker_classic_script_loader.cc
@@ -307,7 +307,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy( @@ -308,7 +308,6 @@ void WorkerClassicScriptLoader::ProcessContentSecurityPolicy(
// document (which is implemented in WorkerMessagingProxy, and // document (which is implemented in WorkerMessagingProxy, and
// m_contentSecurityPolicy should be left as nullptr to inherit the policy). // m_contentSecurityPolicy should be left as nullptr to inherit the policy).
if (!response.CurrentRequestUrl().ProtocolIs("blob") && if (!response.CurrentRequestUrl().ProtocolIs("blob") &&

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

@ -14,7 +14,7 @@ when there is code doing that.
This patch reverts the change to fix the crash in Electron. This patch reverts the change to fix the crash in Electron.
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
index 7a728dc2c0d71579f4b7ed2c97cfedbd8e0590e6..af7e96da33bc4e77b2870b108896018ae92078b8 100644 index e07ace500ef1dd60ce9833e7324e238de1018ae6..950c5ff5b14129ab2ca4b8c929ff583b5523b04b 100644
--- a/third_party/blink/renderer/core/frame/local_frame.cc --- a/third_party/blink/renderer/core/frame/local_frame.cc
+++ b/third_party/blink/renderer/core/frame/local_frame.cc +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -403,10 +403,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) { @@ -403,10 +403,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {

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

@ -19,7 +19,7 @@ index 0c72c57ac767b84626476e929308148714098c4e..1fb098418471a6c9919ec40792bbb867
// that the script evaluated to with callback. Script execution can be // that the script evaluated to with callback. Script execution can be
// suspend. // suspend.
diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc diff --git a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
index 96799bc7f05fd5dc9bf13153ad2abf03c4056be4..a3ceb250ba8648cbf59ad71194195e4f03f9bec2 100644 index 5a9963e8ed555444a4995df22ba11cbb59fcf444..64e9262f04883a5d35ce671c422386e5b3d6420f 100644
--- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc --- a/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
+++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc +++ b/third_party/blink/renderer/core/frame/web_local_frame_impl.cc
@@ -888,6 +888,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const { @@ -888,6 +888,13 @@ v8::Local<v8::Object> WebLocalFrameImpl::GlobalProxy() const {

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

@ -5,10 +5,10 @@ Subject: can_create_window.patch
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index a76dcf7c0197a146ac060cabcdf8f0d77b7d80f1..b9871c1fb327352dd9c83a751efea0052cc1e997 100644 index 1a023385a3d27d9145f2a0a069ff6799c69ec66a..30328f5e62b4fdbb423a97454ee0591c076ac6bc 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc --- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc +++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -3664,6 +3664,38 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -3669,6 +3669,38 @@ void RenderFrameHostImpl::CreateNewWindow(
"frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url", "frame_tree_node", frame_tree_node_->frame_tree_node_id(), "url",
params->target_url.possibly_invalid_spec()); params->target_url.possibly_invalid_spec());
@ -47,7 +47,7 @@ index a76dcf7c0197a146ac060cabcdf8f0d77b7d80f1..b9871c1fb327352dd9c83a751efea005
bool no_javascript_access = false; bool no_javascript_access = false;
// Filter out URLs to which navigation is disallowed from this context. // Filter out URLs to which navigation is disallowed from this context.
@@ -3692,6 +3724,7 @@ void RenderFrameHostImpl::CreateNewWindow( @@ -3697,6 +3729,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type, last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(), params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features, params->frame_name, params->disposition, *params->features,
@ -56,10 +56,10 @@ index a76dcf7c0197a146ac060cabcdf8f0d77b7d80f1..b9871c1fb327352dd9c83a751efea005
&no_javascript_access); &no_javascript_access);
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc
index 0da371ff7af08265ff5a06c5fe8c3bea59b5f1ea..2f00c1e7fd7dd138c53c3eff3e0010f17db68ca3 100644 index 8d01f4e181793677a1eee7585fd7c484767a58b0..01f7a49e7a559e6ae70a4311a2539bc4f60849d7 100644
--- a/content/browser/security_exploit_browsertest.cc --- a/content/browser/security_exploit_browsertest.cc
+++ b/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc
@@ -387,6 +387,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest, @@ -364,6 +364,7 @@ IN_PROC_BROWSER_TEST_F(SecurityExploitBrowserTest,
mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New(); mojom::CreateNewWindowParamsPtr params = mojom::CreateNewWindowParams::New();
params->target_url = GURL("about:blank"); params->target_url = GURL("about:blank");
@ -117,7 +117,7 @@ index e566a15b798e2586fa4fae3c4db97ce5f4f2f09f..8a08c7a79eba24bce7f11cf8c4994325
// Operation result when the renderer asks the browser to create a new window. // Operation result when the renderer asks the browser to create a new window.
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index dc653fc3af345d20fbff9fc4c399bc1452c4850b..499c853a9a3d4c294ae0e6bfdb857ac67c31a144 100644 index bce9b68c989da1e287b7e593e1ae281923d1a557..e2f2b8e8d09d1f14b58eb8b093042b89141cdd35 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -494,6 +494,8 @@ bool ContentBrowserClient::CanCreateWindow( @@ -494,6 +494,8 @@ bool ContentBrowserClient::CanCreateWindow(
@ -130,7 +130,7 @@ index dc653fc3af345d20fbff9fc4c399bc1452c4850b..499c853a9a3d4c294ae0e6bfdb857ac6
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access) { bool* no_javascript_access) {
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 2e5e199c4bc6ff6b1559f8c6f1e03e344fcb110b..384b51c1faa7045f2319854db59be27af779569d 100644 index 92425b0bded161d513a3e39b8f9631d4c98c143c..5dc21230970fe23a25ad6e811d65c434760d1d1b 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -171,6 +171,7 @@ class RenderFrameHost; @@ -171,6 +171,7 @@ class RenderFrameHost;
@ -151,7 +151,7 @@ index 2e5e199c4bc6ff6b1559f8c6f1e03e344fcb110b..384b51c1faa7045f2319854db59be27a
bool opener_suppressed, bool opener_suppressed,
bool* no_javascript_access); bool* no_javascript_access);
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index ceb8568c9da3109dbc2f9a04cc8fc93e394d5294..bba68744d600f5f4482cf9cb3941f38a79478966 100644 index ad23a9040c21a674c1b011e7120d4288a722f2bb..c16005d6e20b801217249ed8b902cb42d9223dc4 100644
--- a/content/renderer/render_view_impl.cc --- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc +++ b/content/renderer/render_view_impl.cc
@@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@

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

@ -5,10 +5,10 @@ Subject: compositor_delegate.patch
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 9d960547e17cc5459a2034f15de3c0f9e4ae92c7..fb9fb933ff19bf23224fb219e70039d99e42c0f8 100644 index 5aeda7bd9caf6b5b9e2a95293e4409dc7f9a6d2d..d15e1462babe97b5d68014f4d67236653046aa5f 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc --- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc +++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -482,10 +482,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel( @@ -485,10 +485,20 @@ void GpuProcessTransportFactory::EstablishedGpuChannel(
// surfaces as they are not following the correct mode. // surfaces as they are not following the correct mode.
DisableGpuCompositing(compositor.get()); DisableGpuCompositing(compositor.get());
} }

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

@ -22,7 +22,7 @@ index 7d5a3367774f558583ea69e60c46ab8636a19a81..190565b067ef869a332b77322dc62403
} }
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index cbd25b0f44a74671c924fd7a35f6fd84632c5f8c..aebf393cf0598335bc395c5584d4e7bcce6bf737 100644 index 84b324992f22a65030b8badc05f6ce542929dea6..5703236f5ea937ebe3111fe79cf30f9ffb172a04 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -58,6 +58,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should @@ -58,6 +58,10 @@ ContentBrowserClient::SiteInstanceForNavigationType ContentBrowserClient::Should
@ -37,7 +37,7 @@ index cbd25b0f44a74671c924fd7a35f6fd84632c5f8c..aebf393cf0598335bc395c5584d4e7bc
const MainFunctionParams& parameters) { const MainFunctionParams& parameters) {
return nullptr; return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index d2aa50c1e0ff84ef2313fa058b9ecc677cd20d5c..59d53c27e66e532e7531bf0e8ccee97800a759a5 100644 index 031332e91cf38cb3d69cd73778a9e4a0701f7645..108c1e2f57b4fd86bbf819452da37da3cc96e5bb 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -237,6 +237,9 @@ class CONTENT_EXPORT ContentBrowserClient { @@ -237,6 +237,9 @@ class CONTENT_EXPORT ContentBrowserClient {

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

@ -15,7 +15,7 @@ the redraw locking mechanism, which fixes these issues. The electron issue
can be found at https://github.com/electron/electron/issues/1821 can be found at https://github.com/electron/electron/issues/1821
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index 66ddf5c2737785943c01adeb040b7da7d24ea624..a963ee677e4b3777ba6a8c6fcfd1bf0d8c7e07c8 100644 index f3523d2a05c3f93215c6a78e81e015c4b965b758..39ff4f17822b4552218cb3a11c478eb22f0ada17 100644
--- a/ui/views/win/hwnd_message_handler.cc --- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc +++ b/ui/views/win/hwnd_message_handler.cc
@@ -288,6 +288,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500; @@ -288,6 +288,10 @@ const int kSynthesizedMouseMessagesTimeDifference = 500;

48
patches/common/chromium/disable_color_correct_rendering.patch
View file

@ -19,10 +19,10 @@ to deal with color spaces. That is being tracked at
https://crbug.com/634542 and https://crbug.com/711107. https://crbug.com/634542 and https://crbug.com/711107.
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 5413674c05060cfca539037fbe4a26316fbab504..970a259c5d04d5af7191958505e7806ffa2ece65 100644 index bc110bfd003e41b1b170c4d8cd404ab0a88240e3..8979c777978216b6e0f7f89f19200afc57f08012 100644
--- a/cc/trees/layer_tree_host_impl.cc --- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc
@@ -1570,6 +1570,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw( @@ -1569,6 +1569,10 @@ void LayerTreeHostImpl::SetIsLikelyToRequireADraw(
} }
RasterColorSpace LayerTreeHostImpl::GetRasterColorSpace() const { RasterColorSpace LayerTreeHostImpl::GetRasterColorSpace() const {
@ -47,10 +47,10 @@ index 9de6c5f5f45d7cb3e9141ffb480f6052090cc696..30f491ec4a2663d18bf22c27eff8dbbd
// Image Decode Service and raster tiles without images until the decode is // Image Decode Service and raster tiles without images until the decode is
// ready. // ready.
diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
index f9df82b198680b7069516ae2a4d65fe5f529fd35..1032b3646c9479d74ebd823739778ba884d70f30 100644 index 2b8cd275a5ee29b665f1a0fb27105cf75eab13ed..3493572110e2dda18c57fe079174f0934fb288b9 100644
--- a/components/viz/common/display/renderer_settings.h --- a/components/viz/common/display/renderer_settings.h
+++ b/components/viz/common/display/renderer_settings.h +++ b/components/viz/common/display/renderer_settings.h
@@ -19,6 +19,7 @@ class VIZ_COMMON_EXPORT RendererSettings { @@ -20,6 +20,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
RendererSettings(const RendererSettings& other); RendererSettings(const RendererSettings& other);
~RendererSettings(); ~RendererSettings();
@ -80,10 +80,10 @@ index e63d201943faf1b537df711299168d0378823bd0..fb5ca48f16b78a4d0a45cb57988d1d94
!command_line->HasSwitch(switches::kUIDisablePartialSwap); !command_line->HasSwitch(switches::kUIDisablePartialSwap);
#if defined(OS_WIN) #if defined(OS_WIN)
diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc diff --git a/components/viz/service/display/gl_renderer.cc b/components/viz/service/display/gl_renderer.cc
index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7d88fc7d0 100644 index 6ee04d0919d9b4ae5e2d6719f1417f00a3d600fa..62c0b5da24e02102b268429b1d8e3654064300fc 100644
--- a/components/viz/service/display/gl_renderer.cc --- a/components/viz/service/display/gl_renderer.cc
+++ b/components/viz/service/display/gl_renderer.cc +++ b/components/viz/service/display/gl_renderer.cc
@@ -77,6 +77,9 @@ @@ -78,6 +78,9 @@
using gpu::gles2::GLES2Interface; using gpu::gles2::GLES2Interface;
@ -93,7 +93,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
namespace viz { namespace viz {
namespace { namespace {
@@ -521,8 +524,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad, @@ -523,8 +526,9 @@ void GLRenderer::DoDrawQuad(const DrawQuad* quad,
void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) { void GLRenderer::DrawDebugBorderQuad(const DebugBorderDrawQuad* quad) {
SetBlendEnabled(quad->ShouldDrawWithBlending()); SetBlendEnabled(quad->ShouldDrawWithBlending());
@ -105,7 +105,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
// Use the full quad_rect for debug quads to not move the edges based on // Use the full quad_rect for debug quads to not move the edges based on
// partial swaps. // partial swaps.
@@ -1321,7 +1325,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params, @@ -1326,7 +1330,8 @@ void GLRenderer::ChooseRPDQProgram(DrawRenderPassDrawQuadParams* params,
tex_coord_precision, sampler_type, shader_blend_mode, tex_coord_precision, sampler_type, shader_blend_mode,
params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background, params->use_aa ? USE_AA : NO_AA, mask_mode, mask_for_background,
params->use_color_matrix, tint_gl_composited_content_), params->use_color_matrix, tint_gl_composited_content_),
@ -115,7 +115,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
} }
void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) { void GLRenderer::UpdateRPDQUniforms(DrawRenderPassDrawQuadParams* params) {
@@ -1784,8 +1789,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad, @@ -1789,8 +1794,8 @@ void GLRenderer::DrawSolidColorQuad(const SolidColorDrawQuad* quad,
gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB(); gfx::ColorSpace quad_color_space = gfx::ColorSpace::CreateSRGB();
SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA, SetUseProgram(ProgramKey::SolidColor(use_aa ? USE_AA : NO_AA,
tint_gl_composited_content_), tint_gl_composited_content_),
@ -126,7 +126,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
SetShaderColor(color, opacity); SetShaderColor(color, opacity);
if (current_program_->tint_color_matrix_location() != -1) { if (current_program_->tint_color_matrix_location() != -1) {
@@ -1935,8 +1940,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad, @@ -1940,8 +1945,8 @@ void GLRenderer::DrawContentQuadAA(const ContentDrawQuadBase* quad,
quad->is_premultiplied ? PREMULTIPLIED_ALPHA quad->is_premultiplied ? PREMULTIPLIED_ALPHA
: NON_PREMULTIPLIED_ALPHA, : NON_PREMULTIPLIED_ALPHA,
false, false, tint_gl_composited_content_), false, false, tint_gl_composited_content_),
@ -137,7 +137,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
if (current_program_->tint_color_matrix_location() != -1) { if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2024,8 +2029,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad, @@ -2029,8 +2034,8 @@ void GLRenderer::DrawContentQuadNoAA(const ContentDrawQuadBase* quad,
: NON_PREMULTIPLIED_ALPHA, : NON_PREMULTIPLIED_ALPHA,
!quad->ShouldDrawWithBlending(), has_tex_clamp_rect, !quad->ShouldDrawWithBlending(), has_tex_clamp_rect,
tint_gl_composited_content_), tint_gl_composited_content_),
@ -148,7 +148,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
if (current_program_->tint_color_matrix_location() != -1) { if (current_program_->tint_color_matrix_location() != -1) {
auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix(); auto matrix = cc::DebugColors::TintCompositedContentColorTransformMatrix();
@@ -2120,7 +2125,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad, @@ -2125,7 +2130,7 @@ void GLRenderer::DrawYUVVideoQuad(const YUVVideoDrawQuad* quad,
DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB()); DCHECK_NE(src_color_space, src_color_space.GetAsFullRangeRGB());
gfx::ColorSpace dst_color_space = gfx::ColorSpace dst_color_space =
@ -157,7 +157,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
// Force sRGB output on Windows for overlay candidate video quads to match // Force sRGB output on Windows for overlay candidate video quads to match
// DirectComposition behavior in case these switch between overlays and // DirectComposition behavior in case these switch between overlays and
// compositing. See https://crbug.com/811118 for details. // compositing. See https://crbug.com/811118 for details.
@@ -2268,8 +2273,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad, @@ -2273,8 +2278,8 @@ void GLRenderer::DrawStreamVideoQuad(const StreamVideoDrawQuad* quad,
quad->resource_id()); quad->resource_id());
SetUseProgram(ProgramKey::VideoStream(tex_coord_precision), SetUseProgram(ProgramKey::VideoStream(tex_coord_precision),
@ -168,7 +168,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id()); gl_->BindTexture(GL_TEXTURE_EXTERNAL_OES, lock.texture_id());
@@ -2321,8 +2326,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) { @@ -2326,8 +2331,8 @@ void GLRenderer::FlushTextureQuadCache(BoundGeometry flush_binding) {
draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR); draw_cache_.nearest_neighbor ? GL_NEAREST : GL_LINEAR);
// Bind the program to the GL state. // Bind the program to the GL state.
@ -179,7 +179,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_)); DCHECK_EQ(GL_TEXTURE0, GetActiveTextureUnit(gl_));
gl_->BindTexture(locked_quad.target(), locked_quad.texture_id()); gl_->BindTexture(locked_quad.target(), locked_quad.texture_id());
@@ -2977,7 +2982,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) { @@ -2982,7 +2987,9 @@ void GLRenderer::PrepareGeometry(BoundGeometry binding) {
void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color, void GLRenderer::SetUseProgram(const ProgramKey& program_key_no_color,
const gfx::ColorSpace& src_color_space, const gfx::ColorSpace& src_color_space,
const gfx::ColorSpace& dst_color_space) { const gfx::ColorSpace& dst_color_space) {
@ -190,7 +190,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
ProgramKey program_key = program_key_no_color; ProgramKey program_key = program_key_no_color;
const gfx::ColorTransform* color_transform = const gfx::ColorTransform* color_transform =
@@ -3331,7 +3338,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource( @@ -3336,7 +3343,7 @@ void GLRenderer::CopyRenderPassDrawQuadToOverlayResource(
*overlay_texture = FindOrCreateOverlayTexture( *overlay_texture = FindOrCreateOverlayTexture(
params.quad->render_pass_id, iosurface_width, iosurface_height, params.quad->render_pass_id, iosurface_width, iosurface_height,
@ -199,7 +199,7 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
*new_bounds = gfx::RectF(updated_dst_rect.origin(), *new_bounds = gfx::RectF(updated_dst_rect.origin(),
gfx::SizeF((*overlay_texture)->texture.size())); gfx::SizeF((*overlay_texture)->texture.size()));
@@ -3535,8 +3542,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) { @@ -3540,8 +3547,9 @@ void GLRenderer::FlushOverdrawFeedback(const gfx::Rect& output_rect) {
PrepareGeometry(SHARED_BINDING); PrepareGeometry(SHARED_BINDING);
@ -211,17 +211,17 @@ index e7c6461cf2928282285adfebbd4eb17c1f11b015..893cd866af94a206ff98abac97f6bdd7
gfx::Transform render_matrix; gfx::Transform render_matrix;
render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(), render_matrix.Translate(0.5 * output_rect.width() + output_rect.x(),
@@ -3696,3 +3704,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize( @@ -3701,3 +3709,5 @@ gfx::Size GLRenderer::GetRenderPassBackingPixelSize(
} }
} // namespace viz } // namespace viz
+ +
+#undef PATCH_CS +#undef PATCH_CS
diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc diff --git a/components/viz/service/display/skia_renderer.cc b/components/viz/service/display/skia_renderer.cc
index cf3b497ef8415e351adf4821f3e6fc5714249178..3dbda6a3ca1ed4726e136fdb2ae83453d65284a3 100644 index 54e1614d979ef2afa5e23404541cfc2d1227e17d..97190566b60140cbdac43a5c57deb03e1fc48982 100644
--- a/components/viz/service/display/skia_renderer.cc --- a/components/viz/service/display/skia_renderer.cc
+++ b/components/viz/service/display/skia_renderer.cc +++ b/components/viz/service/display/skia_renderer.cc
@@ -709,9 +709,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad, @@ -707,9 +707,11 @@ void SkiaRenderer::DrawPictureQuad(const PictureDrawQuad* quad,
std::unique_ptr<SkCanvas> color_transform_canvas; std::unique_ptr<SkCanvas> color_transform_canvas;
// TODO(enne): color transform needs to be replicated in gles2_cmd_decoder // TODO(enne): color transform needs to be replicated in gles2_cmd_decoder
@ -268,7 +268,7 @@ index 4aa391a6bfe2408b84da4ffe5b3dc27a0544d0ca..649efb7ed16e6f4850010c8b9df5d0b7
service_manager::switches::kGpuSandboxAllowSysVShm, service_manager::switches::kGpuSandboxAllowSysVShm,
service_manager::switches::kGpuSandboxFailuresFatal, service_manager::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index f341e362a338595d617e28d9273cb4d47940dd7b..4c5d49d24962ca36cb31cee00f91d36d2433d19d 100644 index ecbfc65e474409a0d073362d6734047b098d2c7f..2aa5ba9d51adda083a5eeac2c200b2ffba106b21 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -221,6 +221,7 @@ @@ -221,6 +221,7 @@
@ -279,7 +279,7 @@ index f341e362a338595d617e28d9273cb4d47940dd7b..4c5d49d24962ca36cb31cee00f91d36d
#include "ui/gl/gl_switches.h" #include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h" #include "ui/native_theme/native_theme_features.h"
@@ -3012,6 +3013,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer( @@ -3052,6 +3053,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along // Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line. // with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = { static const char* const kSwitchNames[] = {
@ -288,10 +288,10 @@ index f341e362a338595d617e28d9273cb4d47940dd7b..4c5d49d24962ca36cb31cee00f91d36d
network::switches::kExplicitlyAllowedPorts, network::switches::kExplicitlyAllowedPorts,
service_manager::switches::kDisableInProcessStackTraces, service_manager::switches::kDisableInProcessStackTraces,
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index a03ed6d9462933bf0749e2cf5964f3abb40ec657..95d2701f64c231619e559ada41a3212122899dab 100644 index 6d5833dc1bef727aba4c012563c3e161a9dab9ae..3215ab16ad51e7d519baa1e82fd0a9c489b8e31a 100644
--- a/content/renderer/render_widget.cc --- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc +++ b/content/renderer/render_widget.cc
@@ -2601,6 +2601,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings( @@ -2641,6 +2641,9 @@ cc::LayerTreeSettings RenderWidget::GenerateLayerTreeSettings(
settings.main_frame_before_activation_enabled = settings.main_frame_before_activation_enabled =
cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation); cmd.HasSwitch(cc::switches::kEnableMainFrameBeforeActivation);

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

@ -5,10 +5,10 @@ Subject: disable_hidden.patch
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
index 17a49b9497b6c4f64bd384e932b8786f536e4982..92becaca36b8e536b9a856aa9f48f6dad0442fa6 100644 index 801517c670e4cfb5adcfa0a14d2626c2be90e833..e63f00a1c4013f1e07f3b1adcdb34ea24eac3916 100644
--- a/content/browser/renderer_host/render_widget_host_impl.cc --- a/content/browser/renderer_host/render_widget_host_impl.cc
+++ b/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -760,6 +760,9 @@ void RenderWidgetHostImpl::WasHidden() { @@ -763,6 +763,9 @@ void RenderWidgetHostImpl::WasHidden() {
if (is_hidden_) if (is_hidden_)
return; return;
@ -19,7 +19,7 @@ index 17a49b9497b6c4f64bd384e932b8786f536e4982..92becaca36b8e536b9a856aa9f48f6da
TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden"); TRACE_EVENT0("renderer_host", "RenderWidgetHostImpl::WasHidden");
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 3c8816a1e740a113317b7924dbb07e75d8b3f18a..6ec259f3508dd63e601b5fc5e8c7d6dec5acf66a 100644 index 4fd95dc7bdcd99342bd110d46b5829eb784e0f40..47af7e316c36c2f1733721170a6eff7fae39fa77 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h --- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -153,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl @@ -153,6 +153,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl

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

@ -6,10 +6,10 @@ Subject: disable_user_gesture_requirement_for_beforeunload_dialogs.patch
See https://github.com/electron/electron/issues/10754 See https://github.com/electron/electron/issues/10754
diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc
index 848a439d6e7d4f54521621a00899354b2c63dd0c..142f24f566b963d5e1c7f89099e91136b5fb3f77 100644 index 09418dad61316ad4534e8f9c71cc153ffc5e0ffd..20e90ed973b0de71c07cbcd21578d7eee8cab06e 100644
--- a/third_party/blink/renderer/core/dom/document.cc --- a/third_party/blink/renderer/core/dom/document.cc
+++ b/third_party/blink/renderer/core/dom/document.cc +++ b/third_party/blink/renderer/core/dom/document.cc
@@ -3665,7 +3665,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client, @@ -3675,7 +3675,9 @@ bool Document::DispatchBeforeUnloadEvent(ChromeClient* chrome_client,
"frame that never had a user gesture since its load. " "frame that never had a user gesture since its load. "
"https://www.chromestatus.com/feature/5082396709879808"; "https://www.chromestatus.com/feature/5082396709879808";
Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message); Intervention::GenerateReport(frame_, "BeforeUnloadNoGesture", message);

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

@ -6,7 +6,7 @@ Subject: enable_osr_components.patch
Add MouseWheelPhaseHandler for OSR. Add MouseWheelPhaseHandler for OSR.
diff --git a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h diff --git a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
index 305095fc420e1732bdf089dfeee7672f69d85167..f5ca4eda4a663b9297ce69e6a455d7554f1fbe5c 100644 index fc252b6ceffd92e85f545f848bb8bde4e518cbd9..b0dfd847ec03ca7843d2c1c217b172213bed097c 100644
--- a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h --- a/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
+++ b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h +++ b/content/browser/renderer_host/input/mouse_wheel_phase_handler.h
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@

4
patches/common/chromium/exclude-a-few-test-files-from-build.patch
View file

@ -7,10 +7,10 @@ Compilation of those files fails with the Chromium 68.
Remove the patch during the Chromium 69 upgrade. Remove the patch during the Chromium 69 upgrade.
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 0e2af5b005b740eb20ffdde67b050d049951615b..7aee0638efc5a050cf7b6825ebda953e556e1782 100644 index 145086ca57c6b72512c01e612087d4e994991bcb..2ccb86380fa944a783e8f7c131ebe71db7022f2d 100644
--- a/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1739,7 +1739,7 @@ jumbo_source_set("blink_platform_unittests_sources") { @@ -1741,7 +1741,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
"graphics/paint/drawing_display_item_test.cc", "graphics/paint/drawing_display_item_test.cc",
"graphics/paint/drawing_recorder_test.cc", "graphics/paint/drawing_recorder_test.cc",
"graphics/paint/float_clip_rect_test.cc", "graphics/paint/float_clip_rect_test.cc",

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

@ -7,7 +7,7 @@ Allows embedder to intercept site instances chosen by chromium
and respond with custom instance. and respond with custom instance.
diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc diff --git a/content/browser/frame_host/render_frame_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index 75804f991fb2e75115de6408e50fe7328dc58ef9..0cbd955d3e4ff9196e6666fe0ab0b66ffe8c5261 100644 index 53586512b68f79ebf9addf0d344a5a0785d89877..1417ce14d9e976da08c8924e32d2cb8e6408652b 100644
--- a/content/browser/frame_host/render_frame_host_manager.cc --- a/content/browser/frame_host/render_frame_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc +++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -1970,6 +1970,16 @@ bool RenderFrameHostManager::InitRenderView( @@ -1970,6 +1970,16 @@ bool RenderFrameHostManager::InitRenderView(
@ -108,7 +108,7 @@ index 75804f991fb2e75115de6408e50fe7328dc58ef9..0cbd955d3e4ff9196e6666fe0ab0b66f
} }
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
index 499c853a9a3d4c294ae0e6bfdb857ac67c31a144..cbd25b0f44a74671c924fd7a35f6fd84632c5f8c 100644 index e2f2b8e8d09d1f14b58eb8b093042b89141cdd35..84b324992f22a65030b8badc05f6ce542929dea6 100644
--- a/content/public/browser/content_browser_client.cc --- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -48,6 +48,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info, @@ -48,6 +48,16 @@ void OverrideOnBindInterface(const service_manager::BindSourceInfo& remote_info,
@ -129,7 +129,7 @@ index 499c853a9a3d4c294ae0e6bfdb857ac67c31a144..cbd25b0f44a74671c924fd7a35f6fd84
const MainFunctionParams& parameters) { const MainFunctionParams& parameters) {
return nullptr; return nullptr;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 384b51c1faa7045f2319854db59be27af779569d..d2aa50c1e0ff84ef2313fa058b9ecc677cd20d5c 100644 index 5dc21230970fe23a25ad6e811d65c434760d1d1b..031332e91cf38cb3d69cd73778a9e4a0701f7645 100644
--- a/content/public/browser/content_browser_client.h --- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -206,8 +206,37 @@ CONTENT_EXPORT void OverrideOnBindInterface( @@ -206,8 +206,37 @@ CONTENT_EXPORT void OverrideOnBindInterface(

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

@ -6,7 +6,7 @@ Subject: gtk_visibility.patch
Allow electron to depend on GTK in the GN build. Allow electron to depend on GTK in the GN build.
diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn diff --git a/build/config/linux/gtk/BUILD.gn b/build/config/linux/gtk/BUILD.gn
index a2b40d82674eec5c20f705ace36cf590d46b307a..98b93a08b9a0bdbbd68925e94bf4247666b69cc4 100644 index fe2e10627f42c8355fd176ed24b54cfab916a72a..7b48b68de04c2cbfc4380e6e38c9ac07dbc7784a 100644
--- a/build/config/linux/gtk/BUILD.gn --- a/build/config/linux/gtk/BUILD.gn
+++ b/build/config/linux/gtk/BUILD.gn +++ b/build/config/linux/gtk/BUILD.gn
@@ -26,6 +26,7 @@ group("gtk") { @@ -26,6 +26,7 @@ group("gtk") {
@ -16,4 +16,4 @@ index a2b40d82674eec5c20f705ace36cf590d46b307a..98b93a08b9a0bdbbd68925e94bf42476
+ "//electron:*", + "//electron:*",
"//examples:peerconnection_client", "//examples:peerconnection_client",
"//gpu/gles2_conform_support:gles2_conform_test_windowless", "//gpu/gles2_conform_support:gles2_conform_test_windowless",
"//remoting/host", "//remoting/host/linux",

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

@ -277,7 +277,7 @@ index 6299846975301964c4066dff1a7eec40778e8d7f..c9c64e9ea8af9c02099695db38c27871
void BluetoothAdapterMac::RemovePairingDelegateInternal( void BluetoothAdapterMac::RemovePairingDelegateInternal(
diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn diff --git a/media/audio/BUILD.gn b/media/audio/BUILD.gn
index 9dc0255ab94c11f5cbfeb9a335460294a136e125..91ac682d1abc1e82641e73e3186ae0b47f5902c2 100644 index 982904023e2538bbb3039e0014542248b6f589ca..f909eeb8ac8f876897dbbd233d6fd17636607974 100644
--- a/media/audio/BUILD.gn --- a/media/audio/BUILD.gn
+++ b/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn
@@ -186,6 +186,12 @@ source_set("audio") { @@ -186,6 +186,12 @@ source_set("audio") {

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

@ -106,10 +106,10 @@ index 653f487b0b0e01de7cdda8483f081550a9077e98..da9e5f53d07eaaf11525efd996be9420
// Removes |service| from the list of owned services, for example because the // Removes |service| from the list of owned services, for example because the
diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc diff --git a/content/browser/renderer_interface_binders.cc b/content/browser/renderer_interface_binders.cc
index 87ecafbac4bd9cdba9036238d3bd2bd4ae661e8a..75ed7fc917083e70194cee68ba19f8f8c4d20a28 100644 index 8e4df0b15aebc30c517a8c99f20201d8148777e0..ad49782df16c92a6ed0f736a5980263de908c137 100644
--- a/content/browser/renderer_interface_binders.cc --- a/content/browser/renderer_interface_binders.cc
+++ b/content/browser/renderer_interface_binders.cc +++ b/content/browser/renderer_interface_binders.cc
@@ -182,7 +182,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() { @@ -189,7 +189,7 @@ void RendererInterfaceBinders::InitializeParameterizedBinderRegistry() {
RenderProcessHost* host, const url::Origin& origin) { RenderProcessHost* host, const url::Origin& origin) {
static_cast<StoragePartitionImpl*>(host->GetStoragePartition()) static_cast<StoragePartitionImpl*>(host->GetStoragePartition())
->GetPlatformNotificationContext() ->GetPlatformNotificationContext()

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

@ -435,7 +435,7 @@ index d63e90b6c5079ab3237c4bad3d5e63ce2f99c657..c98a7bd07ddd9527fc67b05b24463ed4
return nullptr; return nullptr;
} }
diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc diff --git a/chrome/renderer/pepper/pepper_flash_renderer_host.cc b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
index 05aadc1737ec3b90448eb37dc0c3b98a2b93c2e4..6e688ded28cc802997f7cbd100a32966751f522e 100644 index 880dd83122400909c2768c339ea1e8835b214406..2eab439f74e3d65c0a07c4aba7f2119b598037e8 100644
--- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc --- a/chrome/renderer/pepper/pepper_flash_renderer_host.cc
+++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc +++ b/chrome/renderer/pepper/pepper_flash_renderer_host.cc
@@ -13,7 +13,9 @@ @@ -13,7 +13,9 @@

58
patches/common/chromium/printing.patch
View file

@ -9,7 +9,7 @@ majority of changes originally come from these PRs:
* https://github.com/electron/electron/pull/8596 * https://github.com/electron/electron/pull/8596
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index 1e2d43fb562522f7ebe50a8acc47645495f02436..1a04e1fff488dfde1cf8089ac9ba1b5acc646803 100644 index 961e1560aa914942c01372c354059d6d6b72c50f..aa51b2b2b0e1950f7a660d48bda5e61ecea8951c 100644
--- a/chrome/browser/printing/print_job_worker.cc --- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc
@@ -21,12 +21,12 @@ @@ -21,12 +21,12 @@
@ -27,7 +27,7 @@ index 1e2d43fb562522f7ebe50a8acc47645495f02436..1a04e1fff488dfde1cf8089ac9ba1b5a
#include "printing/printed_document.h" #include "printing/printed_document.h"
#include "printing/printing_utils.h" #include "printing/printing_utils.h"
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15bad85a33d 100644 index cfd13b0ac5956fe28ab81bb3cd3d71ab6fdcb747..6d4d1e2e4478bb60a1c53458a3dc7d84cd28125c 100644
--- a/chrome/browser/printing/print_view_manager_base.cc --- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -27,10 +27,7 @@ @@ -27,10 +27,7 @@
@ -66,7 +66,7 @@ index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15b
} }
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -110,12 +111,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents) @@ -109,12 +110,14 @@ PrintViewManagerBase::PrintViewManagerBase(content::WebContents* web_contents)
queue_(g_browser_process->print_job_manager()->queue()), queue_(g_browser_process->print_job_manager()->queue()),
weak_ptr_factory_(this) { weak_ptr_factory_(this) {
DCHECK(queue_); DCHECK(queue_);
@ -81,7 +81,7 @@ index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15b
} }
PrintViewManagerBase::~PrintViewManagerBase() { PrintViewManagerBase::~PrintViewManagerBase() {
@@ -123,12 +126,14 @@ PrintViewManagerBase::~PrintViewManagerBase() { @@ -122,12 +125,14 @@ PrintViewManagerBase::~PrintViewManagerBase() {
DisconnectFromCurrentPrintJob(); DisconnectFromCurrentPrintJob();
} }
@ -99,7 +99,7 @@ index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15b
} }
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@@ -244,9 +249,9 @@ void PrintViewManagerBase::StartLocalPrintJob( @@ -242,9 +247,9 @@ void PrintViewManagerBase::StartLocalPrintJob(
void PrintViewManagerBase::UpdatePrintingEnabled() { void PrintViewManagerBase::UpdatePrintingEnabled() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
// The Unretained() is safe because ForEachFrame() is synchronous. // The Unretained() is safe because ForEachFrame() is synchronous.
@ -112,7 +112,7 @@ index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15b
} }
void PrintViewManagerBase::NavigationStopped() { void PrintViewManagerBase::NavigationStopped() {
@@ -338,7 +343,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) { @@ -336,7 +341,7 @@ void PrintViewManagerBase::OnPrintingFailed(int cookie) {
PrintManager::OnPrintingFailed(cookie); PrintManager::OnPrintingFailed(cookie);
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
@ -121,7 +121,7 @@ index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15b
#endif #endif
ReleasePrinterQuery(); ReleasePrinterQuery();
@@ -586,6 +591,9 @@ void PrintViewManagerBase::ReleasePrintJob() { @@ -585,6 +590,9 @@ void PrintViewManagerBase::ReleasePrintJob() {
content::RenderFrameHost* rfh = printing_rfh_; content::RenderFrameHost* rfh = printing_rfh_;
printing_rfh_ = nullptr; printing_rfh_ = nullptr;
@ -132,7 +132,7 @@ index 620c8907653c5757c7ab88d7f1c599a876800313..1ed8551cd851f04b59a0d517a8b0f15b
return; return;
diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h diff --git a/chrome/browser/printing/print_view_manager_base.h b/chrome/browser/printing/print_view_manager_base.h
index fa8d5a178aee2399c05d4f31b42edbc563883355..a6d1430c74e6d52abf3ceaf95678fef0135f566a 100644 index a2569836d04ff968e690215f56f6de3b6d884874..6ddec22641b74d5484c2e0d4f62e5d71d8d783e9 100644
--- a/chrome/browser/printing/print_view_manager_base.h --- a/chrome/browser/printing/print_view_manager_base.h
+++ b/chrome/browser/printing/print_view_manager_base.h +++ b/chrome/browser/printing/print_view_manager_base.h
@@ -39,6 +39,8 @@ class PrintJob; @@ -39,6 +39,8 @@ class PrintJob;
@ -155,7 +155,7 @@ index fa8d5a178aee2399c05d4f31b42edbc563883355..a6d1430c74e6d52abf3ceaf95678fef0
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
// Prints the document in |print_data| with settings specified in // Prints the document in |print_data| with settings specified in
@@ -198,6 +202,9 @@ class PrintViewManagerBase : public content::NotificationObserver, @@ -197,6 +201,9 @@ class PrintViewManagerBase : public content::NotificationObserver,
// The current RFH that is printing with a system printing dialog. // The current RFH that is printing with a system printing dialog.
content::RenderFrameHost* printing_rfh_; content::RenderFrameHost* printing_rfh_;
@ -166,7 +166,7 @@ index fa8d5a178aee2399c05d4f31b42edbc563883355..a6d1430c74e6d52abf3ceaf95678fef0
bool printing_succeeded_; bool printing_succeeded_;
diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc
index e415483aaee80c0c797b04f49b69060e33253546..77dce4d5acbc6c3d9e7167480771db7ca64314fc 100644 index 8cf82aafd3fd2b8546b8fabfd8b2cc107846681d..07274855cf8311eb4f71a57b171cc04d66edbf31 100644
--- a/chrome/browser/printing/printing_message_filter.cc --- a/chrome/browser/printing/printing_message_filter.cc
+++ b/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc
@@ -22,6 +22,7 @@ @@ -22,6 +22,7 @@
@ -218,9 +218,9 @@ index e415483aaee80c0c797b04f49b69060e33253546..77dce4d5acbc6c3d9e7167480771db7c
printer_query = queue_->PopPrinterQuery(0); printer_query = queue_->PopPrinterQuery(0);
if (!printer_query.get()) { if (!printer_query.get()) {
printer_query = printer_query =
@@ -311,11 +317,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings( @@ -309,11 +315,13 @@ void PrintingMessageFilter::OnUpdatePrintSettings(int document_cookie,
std::unique_ptr<base::DictionaryValue> new_settings(job_settings.DeepCopy()); base::Value job_settings,
IPC::Message* reply_msg) {
scoped_refptr<PrinterQuery> printer_query; scoped_refptr<PrinterQuery> printer_query;
+#if 0 +#if 0
if (!is_printing_enabled_.GetValue()) { if (!is_printing_enabled_.GetValue()) {
@ -232,7 +232,7 @@ index e415483aaee80c0c797b04f49b69060e33253546..77dce4d5acbc6c3d9e7167480771db7c
printer_query = queue_->PopPrinterQuery(document_cookie); printer_query = queue_->PopPrinterQuery(document_cookie);
if (!printer_query.get()) { if (!printer_query.get()) {
printer_query = queue_->CreatePrinterQuery( printer_query = queue_->CreatePrinterQuery(
@@ -374,7 +382,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply( @@ -372,7 +380,7 @@ void PrintingMessageFilter::OnUpdatePrintSettingsReply(
#if BUILDFLAG(ENABLE_PRINT_PREVIEW) #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids, void PrintingMessageFilter::OnCheckForCancel(const PrintHostMsg_PreviewIds& ids,
bool* cancel) { bool* cancel) {
@ -242,12 +242,12 @@ index e415483aaee80c0c797b04f49b69060e33253546..77dce4d5acbc6c3d9e7167480771db7c
#endif #endif
diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h diff --git a/chrome/browser/printing/printing_message_filter.h b/chrome/browser/printing/printing_message_filter.h
index a881a853bfb0b46d0e074b7e86121429a5a761a3..0b41890bb9b5f10765c12158f6e8b7d373b335b9 100644 index 63b71257e4ad25fa27b461969ffec0afb9505203..e18dfc55a02db46300fe96fda00199271d07ba7a 100644
--- a/chrome/browser/printing/printing_message_filter.h --- a/chrome/browser/printing/printing_message_filter.h
+++ b/chrome/browser/printing/printing_message_filter.h +++ b/chrome/browser/printing/printing_message_filter.h
@@ -29,6 +29,10 @@ struct FileDescriptor; @@ -29,6 +29,10 @@ struct FileDescriptor;
#endif
} }
#endif
+namespace content { +namespace content {
+class BrowserContext; +class BrowserContext;
@ -283,10 +283,10 @@ index 7dd892feb181293d3c52fb6a3fd9600c899ee2d3..1ca51744e1046e5dfbedf5af8c6f7535
// Like PrintMsg_PrintPages, but using the print preview document's frame/node. // Like PrintMsg_PrintPages, but using the print preview document's frame/node.
IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog) IPC_MESSAGE_ROUTED0(PrintMsg_PrintForSystemDialog)
diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72cb76fa8e 100644 index 0af11fbfa50e334af7926f7e98304960869415d3..d747dd0f2e162b1b4efa89a99ccc0f417202e8e8 100644
--- a/components/printing/renderer/print_render_frame_helper.cc --- a/components/printing/renderer/print_render_frame_helper.cc
+++ b/components/printing/renderer/print_render_frame_helper.cc +++ b/components/printing/renderer/print_render_frame_helper.cc
@@ -1114,7 +1114,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) { @@ -1115,7 +1115,9 @@ void PrintRenderFrameHelper::ScriptedPrint(bool user_initiated) {
web_frame->DispatchBeforePrintEvent(); web_frame->DispatchBeforePrintEvent();
if (!weak_this) if (!weak_this)
return; return;
@ -297,7 +297,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
if (weak_this) if (weak_this)
web_frame->DispatchAfterPrintEvent(); web_frame->DispatchAfterPrintEvent();
} }
@@ -1162,7 +1164,10 @@ void PrintRenderFrameHelper::OnDestruct() { @@ -1163,7 +1165,10 @@ void PrintRenderFrameHelper::OnDestruct() {
delete this; delete this;
} }
@ -309,7 +309,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
return; return;
@@ -1175,7 +1180,8 @@ void PrintRenderFrameHelper::OnPrintPages() { @@ -1176,7 +1181,8 @@ void PrintRenderFrameHelper::OnPrintPages() {
// If we are printing a PDF extension frame, find the plugin node and print // If we are printing a PDF extension frame, find the plugin node and print
// that instead. // that instead.
auto plugin = delegate_->GetPdfElement(frame); auto plugin = delegate_->GetPdfElement(frame);
@ -319,7 +319,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
if (weak_this) if (weak_this)
frame->DispatchAfterPrintEvent(); frame->DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and // WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1192,7 +1198,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() { @@ -1193,7 +1199,7 @@ void PrintRenderFrameHelper::OnPrintForSystemDialog() {
} }
auto weak_this = weak_ptr_factory_.GetWeakPtr(); auto weak_this = weak_ptr_factory_.GetWeakPtr();
Print(frame, print_preview_context_.source_node(), Print(frame, print_preview_context_.source_node(),
@ -328,7 +328,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
if (weak_this) if (weak_this)
frame->DispatchAfterPrintEvent(); frame->DispatchAfterPrintEvent();
// WARNING: |this| may be gone at this point. Do not do any more work here and // WARNING: |this| may be gone at this point. Do not do any more work here and
@@ -1228,6 +1234,8 @@ void PrintRenderFrameHelper::OnPrintPreview( @@ -1229,6 +1235,8 @@ void PrintRenderFrameHelper::OnPrintPreview(
if (ipc_nesting_level_ > 1) if (ipc_nesting_level_ > 1)
return; return;
@ -337,7 +337,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
print_preview_context_.OnPrintPreview(); print_preview_context_.OnPrintPreview();
UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent", UMA_HISTOGRAM_ENUMERATION("PrintPreview.PreviewEvent",
@@ -1622,7 +1630,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { @@ -1623,7 +1631,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
auto self = weak_ptr_factory_.GetWeakPtr(); auto self = weak_ptr_factory_.GetWeakPtr();
Print(duplicate_node.GetDocument().GetFrame(), duplicate_node, Print(duplicate_node.GetDocument().GetFrame(), duplicate_node,
@ -349,7 +349,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
// Check if |this| is still valid. // Check if |this| is still valid.
if (!self) if (!self)
return; return;
@@ -1633,7 +1644,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) { @@ -1634,7 +1645,10 @@ void PrintRenderFrameHelper::PrintNode(const blink::WebNode& node) {
void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
const blink::WebNode& node, const blink::WebNode& node,
@ -361,7 +361,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
// If still not finished with earlier print request simply ignore. // If still not finished with earlier print request simply ignore.
if (prep_frame_view_) if (prep_frame_view_)
return; return;
@@ -1646,7 +1660,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -1647,7 +1661,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
} }
int expected_page_count = 0; int expected_page_count = 0;
@ -370,7 +370,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
DidFinishPrinting(FAIL_PRINT_INIT); DidFinishPrinting(FAIL_PRINT_INIT);
return; // Failed to init print page settings. return; // Failed to init print page settings.
} }
@@ -1666,8 +1680,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -1667,8 +1681,9 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
PrintMsg_PrintPages_Params print_settings; PrintMsg_PrintPages_Params print_settings;
auto self = weak_ptr_factory_.GetWeakPtr(); auto self = weak_ptr_factory_.GetWeakPtr();
@ -382,7 +382,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
// Check if |this| is still valid. // Check if |this| is still valid.
if (!self) if (!self)
return; return;
@@ -1677,6 +1692,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame, @@ -1678,6 +1693,7 @@ void PrintRenderFrameHelper::Print(blink::WebLocalFrame* frame,
? blink::kWebPrintScalingOptionSourceSize ? blink::kWebPrintScalingOptionSourceSize
: scaling_option; : scaling_option;
SetPrintPagesParams(print_settings); SetPrintPagesParams(print_settings);
@ -390,7 +390,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
if (print_settings.params.dpi.IsEmpty() || if (print_settings.params.dpi.IsEmpty() ||
!print_settings.params.document_cookie) { !print_settings.params.document_cookie) {
DidFinishPrinting(OK); // Release resources and fail silently on failure. DidFinishPrinting(OK); // Release resources and fail silently on failure.
@@ -1867,10 +1883,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages( @@ -1868,10 +1884,24 @@ std::vector<int> PrintRenderFrameHelper::GetPrintedPages(
return printed_pages; return printed_pages;
} }
@ -418,7 +418,7 @@ index 748bc9432518d699f414f809daec20972bdc9514..acb0759c6cdf95819e4444f0ac8b6e72
// Check if the printer returned any settings, if the settings is empty, we // Check if the printer returned any settings, if the settings is empty, we
// can safely assume there are no printer drivers configured. So we safely // can safely assume there are no printer drivers configured. So we safely
// terminate. // terminate.
@@ -1890,12 +1920,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) { @@ -1891,12 +1921,14 @@ bool PrintRenderFrameHelper::InitPrintSettings(bool fit_to_paper_size) {
return result; return result;
} }

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

@ -66,7 +66,7 @@ index 57a608c1a1d4463ba813e1d9132e7f565be85305..be122f9ce470519e630d418550a60324
return validAttributesForMarkedText_.get(); return validAttributesForMarkedText_.get();
} }
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 6a40bd5c67aa14b47727c61d8392195ebeb704d0..534b3bd2c70b5d68e02856f068a1fdb6269aab4f 100644 index 7bdf6790c3b2275979cfcbe8c100c05e0f668ee7..82e72fd8bd923cb013dc655c83ccf4b5838d569f 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -61,6 +61,7 @@ @@ -61,6 +61,7 @@

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

@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
does touch a security-sensitive class. does touch a security-sensitive class.
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index e5f26ffd7ee5d3dc543c40f77a564a02b439399a..f341e362a338595d617e28d9273cb4d47940dd7b 100644 index e27ad6494834c9948f1b85fcef894372d62c5c23..ecbfc65e474409a0d073362d6734047b098d2c7f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc --- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -470,6 +470,10 @@ class RendererSandboxedProcessLauncherDelegate @@ -470,6 +470,10 @@ class RendererSandboxedProcessLauncherDelegate
@ -58,7 +58,7 @@ index e5f26ffd7ee5d3dc543c40f77a564a02b439399a..f341e362a338595d617e28d9273cb4d4
}; };
const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey"; const char kSessionStorageHolderKey[] = "kSessionStorageHolderKey";
@@ -1835,11 +1847,18 @@ bool RenderProcessHostImpl::Init() { @@ -1856,11 +1868,18 @@ bool RenderProcessHostImpl::Init() {
cmd_line->PrependWrapper(renderer_prefix); cmd_line->PrependWrapper(renderer_prefix);
AppendRendererCommandLine(cmd_line.get()); AppendRendererCommandLine(cmd_line.get());

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

@ -11,10 +11,10 @@ system.
See https://github.com/atom/electron/issues/3666 See https://github.com/atom/electron/issues/3666
diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
index ee0fa017409099bf4574a8c7aa4fbb0f53ed07c2..aeec2cb89b23f80997c9d5f195f099d95fa6068b 100644 index 542567f3ee58776a8ca915f1f62dcffa29141798..0f5f017b0ee63bbe7107f39143484bc6d728104e 100644
--- a/sandbox/linux/services/credentials.cc --- a/sandbox/linux/services/credentials.cc
+++ b/sandbox/linux/services/credentials.cc +++ b/sandbox/linux/services/credentials.cc
@@ -348,8 +348,10 @@ pid_t Credentials::ForkAndDropCapabilitiesInChild() { @@ -352,8 +352,10 @@ pid_t Credentials::ForkAndDropCapabilitiesInChild() {
return pid; return pid;
} }

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

@ -5,10 +5,10 @@ Subject: web_contents.patch
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5f747b549e8dde330c44be29faa009d8fae332bf..e729d0b650194bd2c961338aa9bee6c7cd533093 100644 index 9e41df626aa90ad9afbadcaca76c02dbaec4d719..9d9d16afd710153eac4fe70e87d1b7eecbce831f 100644
--- a/content/browser/web_contents/web_contents_impl.cc --- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2020,6 +2020,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2033,6 +2033,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
std::string unique_name; std::string unique_name;
frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name); frame_tree_.root()->SetFrameName(params.main_frame_name, unique_name);
@ -21,7 +21,7 @@ index 5f747b549e8dde330c44be29faa009d8fae332bf..e729d0b650194bd2c961338aa9bee6c7
WebContentsViewDelegate* delegate = WebContentsViewDelegate* delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this); GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -2035,6 +2041,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) { @@ -2048,6 +2054,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
&render_view_host_delegate_view_); &render_view_host_delegate_view_);
} }
} }

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

@ -5,10 +5,10 @@ Subject: webgl_context_attributes.patch
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index e4acd1d1ec3ca10f10aacb6f4a4ad132ea8d4316..e75ddaf4d518172242287ee277f7e5bc6f91bcbe 100644 index 704ee01d0a30f68275653591428e9d16eeb5d5a0..2adc208e36b66fcf8cbdbf05abfa1cd877361745 100644
--- a/content/renderer/renderer_blink_platform_impl.cc --- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -895,8 +895,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider( @@ -896,8 +896,10 @@ RendererBlinkPlatformImpl::CreateOffscreenGraphicsContext3DProvider(
attributes.sample_buffers = 0; attributes.sample_buffers = 0;
attributes.bind_generates_resource = false; attributes.bind_generates_resource = false;
attributes.enable_raster_interface = web_attributes.enable_raster_interface; attributes.enable_raster_interface = web_attributes.enable_raster_interface;

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

@ -5,7 +5,7 @@ Subject: webview_cross_drag.patch
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 04cd7481f4e8ba382411dfad0d3c8afc74bca45b..0185081062ead3c00237d3d4692a8ebe00425749 100644 index 8e02ca39a947abc26b001f230f4e568fa9e61a89..dfed57b3f79ad359a3807567765fa70214771a3a 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc --- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -676,6 +676,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const { @@ -676,6 +676,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
@ -17,10 +17,10 @@ index 04cd7481f4e8ba382411dfad0d3c8afc74bca45b..0185081062ead3c00237d3d4692a8ebe
GetRenderViewHostID(web_contents_->GetRenderViewHost()) != GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
drag_start_view_id_; drag_start_view_id_;
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
index e8ae8e1f8da88dbb3be0274c8254098c038bda58..2dc8e8c5937c28b542d238bfb39b41079cef635c 100644 index 576d60b4718e7742ee3eab31904590ed0b447e88..c28be0a78759b48954298cd9bbfdae37a0b72fb8 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm --- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm +++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -334,6 +334,7 @@ - (void)setDragStartTrackersForProcess:(int)processID { @@ -335,6 +335,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
} }
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH { - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {

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

@ -21,10 +21,10 @@ index cfe87b6c3903db7835c3998a65cf18a2301bbf87..e9046ad91236418942cc98372220bf59
// An empty URL is returned if the URL is not overriden. // An empty URL is returned if the URL is not overriden.
virtual GURL OverrideFlashEmbedWithHTML(const GURL& url); virtual GURL OverrideFlashEmbedWithHTML(const GURL& url);
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index e75ddaf4d518172242287ee277f7e5bc6f91bcbe..05cc8f80549c76919087ac4a108c3c5c7fe76f79 100644 index 2adc208e36b66fcf8cbdbf05abfa1cd877361745..7df930a5114a3cfd930eb801958f5c421395e5c3 100644
--- a/content/renderer/renderer_blink_platform_impl.cc --- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -1035,6 +1035,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() { @@ -1036,6 +1036,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread(); WorkerThreadRegistry::Instance()->WillStopCurrentWorkerThread();
} }

2
patches/common/config.json
View file

@ -5,7 +5,5 @@
"src/electron/patches/common/ffmpeg": "src/third_party/ffmpeg", "src/electron/patches/common/ffmpeg": "src/third_party/ffmpeg",
"src/electron/patches/common/swiftshader": "src/third_party/swiftshader",
"src/electron/patches/common/v8": "src/v8" "src/electron/patches/common/v8": "src/v8"
} }

1
patches/common/swiftshader/.patches
View file

@ -1 +0,0 @@
fix_arm64.patch

38
patches/common/swiftshader/fix_arm64.patch
View file

@ -1,38 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu Dec 6 02:00:06 2018 +0000
Backport fed67899a7b44c9409e94442eaca0deab2f809e3 to fix build on arm64.
https://swiftshader.googlesource.com/SwiftShader.git/+/fed67899a7b44c9409e94442eaca0deab2f809e3%5E%21/
Can be removed after updating to Chrome 73.
diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
index c983c4361..be5e5055d 100644
--- a/src/Reactor/BUILD.gn
+++ b/src/Reactor/BUILD.gn
@@ -170,6 +170,9 @@ config("swiftshader_reactor_private_config") {
]
} else {
cflags = [ "-Wno-unused-local-typedef" ]
+ if(target_cpu == "arm64") {
+ cflags += [ "-Wno-defaulted-function-deleted" ]
+ }
defines = [
"__STDC_CONSTANT_MACROS",
"__STDC_LIMIT_MACROS",
diff --git a/third_party/llvm-7.0/BUILD.gn b/third_party/llvm-7.0/BUILD.gn
index 4ccc6d15e..f0b3dc807 100644
--- a/third_party/llvm-7.0/BUILD.gn
+++ b/third_party/llvm-7.0/BUILD.gn
@@ -61,6 +61,10 @@ config("swiftshader_llvm_private_config") {
}
}
+ if(target_cpu == "arm64") {
+ cflags += [ "-Wno-defaulted-function-deleted" ]
+ }
+
cflags += [
"-Wno-attributes",
"-Wno-deprecated-declarations",

6
patches/common/v8/add_realloc.patch
View file

@ -12,10 +12,10 @@ when we override ReallocateBufferMemory, so we therefore need to implement
Realloc on the v8 side. Realloc on the v8 side.
diff --git a/include/v8.h b/include/v8.h diff --git a/include/v8.h b/include/v8.h
index dd81ef81e3c0df11f5cac7a4c934b0a04e9de003..4b8fb04bc8210c0273157009b3560983b1322b18 100644 index c56c31b31f13dd55dc528afb2b3468f48fbfa177..4d513fc2e28ce60ae4c0e50a56e4e59084a017cf 100644
--- a/include/v8.h --- a/include/v8.h
+++ b/include/v8.h +++ b/include/v8.h
@@ -4604,6 +4604,13 @@ class V8_EXPORT ArrayBuffer : public Object { @@ -4608,6 +4608,13 @@ class V8_EXPORT ArrayBuffer : public Object {
*/ */
virtual void* AllocateUninitialized(size_t length) = 0; virtual void* AllocateUninitialized(size_t length) = 0;
@ -30,7 +30,7 @@ index dd81ef81e3c0df11f5cac7a4c934b0a04e9de003..4b8fb04bc8210c0273157009b3560983
* Free the memory block of size |length|, pointed to by |data|. * Free the memory block of size |length|, pointed to by |data|.
* That memory is guaranteed to be previously allocated by |Allocate|. * That memory is guaranteed to be previously allocated by |Allocate|.
diff --git a/src/api.cc b/src/api.cc diff --git a/src/api.cc b/src/api.cc
index 634ad37115faa1795a20155ed0faf51421eb1543..56be5e2e007c0ea84653a5487abef49cc206efc3 100644 index 3d8611671fe8aabc939c62b9c9b5169ec9245456..95d242de7d11b1ea990d277d2f09c23749401f5e 100644
--- a/src/api.cc --- a/src/api.cc
+++ b/src/api.cc +++ b/src/api.cc
@@ -512,6 +512,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) { @@ -512,6 +512,10 @@ void V8::SetSnapshotDataBlob(StartupData* snapshot_blob) {

6
patches/common/v8/array_buffer.patch
View file

@ -5,10 +5,10 @@ Subject: array_buffer.patch
diff --git a/include/v8.h b/include/v8.h diff --git a/include/v8.h b/include/v8.h
index 4b8fb04bc8210c0273157009b3560983b1322b18..f10a7950de2166804f779346bce580cfb2e7c3ec 100644 index 4d513fc2e28ce60ae4c0e50a56e4e59084a017cf..fd061fde06956418373ded038f6f37e4488ac1a3 100644
--- a/include/v8.h --- a/include/v8.h
+++ b/include/v8.h +++ b/include/v8.h
@@ -7701,6 +7701,9 @@ class V8_EXPORT Isolate { @@ -7705,6 +7705,9 @@ class V8_EXPORT Isolate {
*/ */
void SetIdle(bool is_idle); void SetIdle(bool is_idle);
@ -19,7 +19,7 @@ index 4b8fb04bc8210c0273157009b3560983b1322b18..f10a7950de2166804f779346bce580cf
bool InContext(); bool InContext();
diff --git a/src/api.cc b/src/api.cc diff --git a/src/api.cc b/src/api.cc
index 56be5e2e007c0ea84653a5487abef49cc206efc3..dd22b2a30b632fb9507eb2e2b95837dd9b8810db 100644 index 95d242de7d11b1ea990d277d2f09c23749401f5e..d963a10525dbdeb60c9d762f1fa5038c4d410010 100644
--- a/src/api.cc --- a/src/api.cc
+++ b/src/api.cc +++ b/src/api.cc
@@ -7966,6 +7966,13 @@ void Isolate::SetIdle(bool is_idle) { @@ -7966,6 +7966,13 @@ void Isolate::SetIdle(bool is_idle) {

6
patches/common/v8/build-torque-with-x64-toolchain-on-arm.patch
View file

@ -6,7 +6,7 @@ Subject: build-torque-with-x64-toolchain-on-arm.patch
torque binary has to be run during the build. torque binary has to be run during the build.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index 2f8a6c932efb66c5e273b9e9d2dc5887db8c6265..698b6c827f7f3cd7dc6871156daf8467bc7ff605 100644 index 8bdc4ac595e82e1272ade2f715188bcb07653c82..b593ac20ef722146ca0c50ba01d6ee6b8d6d3035 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -184,7 +184,8 @@ declare_args() { @@ -184,7 +184,8 @@ declare_args() {
@ -19,7 +19,7 @@ index 2f8a6c932efb66c5e273b9e9d2dc5887db8c6265..698b6c827f7f3cd7dc6871156daf8467
v8_generator_toolchain = "//build/toolchain/linux:clang_x64" v8_generator_toolchain = "//build/toolchain/linux:clang_x64"
} }
@@ -3354,7 +3355,7 @@ if (v8_monolithic) { @@ -3351,7 +3352,7 @@ if (v8_monolithic) {
# Executables # Executables
# #
@ -28,7 +28,7 @@ index 2f8a6c932efb66c5e273b9e9d2dc5887db8c6265..698b6c827f7f3cd7dc6871156daf8467
v8_executable("bytecode_builtins_list_generator") { v8_executable("bytecode_builtins_list_generator") {
visibility = [ ":*" ] # Only targets in this file can depend on this. visibility = [ ":*" ] # Only targets in this file can depend on this.
@@ -3404,7 +3405,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { @@ -3401,7 +3402,7 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
} }
} }

4
patches/common/v8/build_gn.patch
View file

@ -5,7 +5,7 @@ Subject: build_gn.patch
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index bdbb29c66b2fa82e8a942421a8bdfce3d94d6e8f..fb3cfe848e97e0952829e39db5b56571e993d6a2 100644 index cc9b7a906a111451eff86e8f78571617256136f1..139a777e304ab0449693664feb248a714995aa26 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -236,7 +236,7 @@ config("internal_config") { @@ -236,7 +236,7 @@ config("internal_config") {
@ -17,7 +17,7 @@ index bdbb29c66b2fa82e8a942421a8bdfce3d94d6e8f..fb3cfe848e97e0952829e39db5b56571
defines = [ "BUILDING_V8_SHARED" ] defines = [ "BUILDING_V8_SHARED" ]
} }
} }
@@ -3389,6 +3389,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { @@ -3386,6 +3386,8 @@ if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ] configs = [ ":internal_config" ]

10
patches/common/v8/dcheck.patch
View file

@ -5,7 +5,7 @@ Subject: dcheck.patch
diff --git a/src/api.cc b/src/api.cc diff --git a/src/api.cc b/src/api.cc
index b23105badb1ce643b0d3dcf6716776c53af4dfec..1df0e8a1dd8b7d490c215fb0a65b7a89aefdc231 100644 index 63538cc4ab571f9be27ea8e0d1e7df94ff3dac71..5b8948425fd9f9db2f175eb2d0f435f4c045be0c 100644
--- a/src/api.cc --- a/src/api.cc
+++ b/src/api.cc +++ b/src/api.cc
@@ -8613,7 +8613,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) { @@ -8613,7 +8613,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@ -14,14 +14,14 @@ index b23105badb1ce643b0d3dcf6716776c53af4dfec..1df0e8a1dd8b7d490c215fb0a65b7a89
void Isolate::RunMicrotasks() { void Isolate::RunMicrotasks() {
- DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy()); - DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
+ // DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy()); + // DCHECK_NE(MicrotasksPolicy::kScoped, GetMicrotasksPolicy());
reinterpret_cast<i::Isolate*>(this)->RunMicrotasks(); i::Isolate* isolate = reinterpret_cast<i::Isolate*>(this);
isolate->default_microtask_queue()->RunMicrotasks(isolate);
} }
diff --git a/src/heap/heap.cc b/src/heap/heap.cc diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index ed1bb91037677a25a8b22a7096a100f7f1cd4d1b..2ca299a96a66c000b4ff2061f283c31f906846b7 100644 index 6a277353d721feb9f76b70e4e18f17f1deb5e281..d3f403555669838124d6720186230b01b18d6092 100644
--- a/src/heap/heap.cc --- a/src/heap/heap.cc
+++ b/src/heap/heap.cc +++ b/src/heap/heap.cc
@@ -4710,9 +4710,9 @@ void Heap::TearDown() { @@ -4719,9 +4719,9 @@ void Heap::TearDown() {
void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback, void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
GCType gc_type, void* data) { GCType gc_type, void* data) {
DCHECK_NOT_NULL(callback); DCHECK_NOT_NULL(callback);

4
patches/common/v8/deps_backport_detailed_line_info_for_cpu_profiler.patch
View file

@ -20,10 +20,10 @@ Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/src/flag-definitions.h b/src/flag-definitions.h diff --git a/src/flag-definitions.h b/src/flag-definitions.h
index e0d486feb1da25db98faa4222f014d79d9bc37e2..26798147f40e35f3496ceebd225f2de0fd105296 100644 index 82729fe9a3e8ac4c7ea7ec984421d2af055d4922..b5de2854a6ff348b44f0bae8169b1d16a0209d71 100644
--- a/src/flag-definitions.h --- a/src/flag-definitions.h
+++ b/src/flag-definitions.h +++ b/src/flag-definitions.h
@@ -1276,7 +1276,7 @@ DEFINE_BOOL(log_function_events, false, @@ -1289,7 +1289,7 @@ DEFINE_BOOL(log_function_events, false,
DEFINE_BOOL(prof, false, DEFINE_BOOL(prof, false,
"Log statistical profiling information (implies --log-code).") "Log statistical profiling information (implies --log-code).")

12
patches/common/v8/deps_provide_more_v8_backwards_compatibility.patch
View file

@ -22,7 +22,7 @@ Reviewed-By: Yang Guo <yangguo@chromium.org>
Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com>
diff --git a/include/v8.h b/include/v8.h diff --git a/include/v8.h b/include/v8.h
index f10a7950de2166804f779346bce580cfb2e7c3ec..44c2e648baa708d7f30105504795e4ba5402e3b3 100644 index fd061fde06956418373ded038f6f37e4488ac1a3..46592e3e57dbb00b617c5c8ad29b0f83dbd57eb4 100644
--- a/include/v8.h --- a/include/v8.h
+++ b/include/v8.h +++ b/include/v8.h
@@ -994,6 +994,10 @@ class V8_EXPORT PrimitiveArray { @@ -994,6 +994,10 @@ class V8_EXPORT PrimitiveArray {
@ -134,7 +134,7 @@ index f10a7950de2166804f779346bce580cfb2e7c3ec..44c2e648baa708d7f30105504795e4ba
Value(Isolate* isolate, Local<v8::Value> obj); Value(Isolate* isolate, Local<v8::Value> obj);
~Value(); ~Value();
uint16_t* operator*() { return str_; } uint16_t* operator*() { return str_; }
@@ -5265,6 +5304,8 @@ class V8_EXPORT BooleanObject : public Object { @@ -5269,6 +5308,8 @@ class V8_EXPORT BooleanObject : public Object {
class V8_EXPORT StringObject : public Object { class V8_EXPORT StringObject : public Object {
public: public:
static Local<Value> New(Isolate* isolate, Local<String> value); static Local<Value> New(Isolate* isolate, Local<String> value);
@ -143,7 +143,7 @@ index f10a7950de2166804f779346bce580cfb2e7c3ec..44c2e648baa708d7f30105504795e4ba
Local<String> ValueOf() const; Local<String> ValueOf() const;
@@ -10103,6 +10144,30 @@ template <class T> Value* Value::Cast(T* value) { @@ -10123,6 +10164,30 @@ template <class T> Value* Value::Cast(T* value) {
} }
@ -175,7 +175,7 @@ index f10a7950de2166804f779346bce580cfb2e7c3ec..44c2e648baa708d7f30105504795e4ba
#ifdef V8_ENABLE_CHECKS #ifdef V8_ENABLE_CHECKS
CheckCast(value); CheckCast(value);
diff --git a/src/api.cc b/src/api.cc diff --git a/src/api.cc b/src/api.cc
index dd22b2a30b632fb9507eb2e2b95837dd9b8810db..b23105badb1ce643b0d3dcf6716776c53af4dfec 100644 index d963a10525dbdeb60c9d762f1fa5038c4d410010..63538cc4ab571f9be27ea8e0d1e7df94ff3dac71 100644
--- a/src/api.cc --- a/src/api.cc
+++ b/src/api.cc +++ b/src/api.cc
@@ -2181,6 +2181,10 @@ int PrimitiveArray::Length() const { @@ -2181,6 +2181,10 @@ int PrimitiveArray::Length() const {
@ -330,7 +330,7 @@ index dd22b2a30b632fb9507eb2e2b95837dd9b8810db..b23105badb1ce643b0d3dcf6716776c5
Local<v8::Value> v8::StringObject::New(Isolate* v8_isolate, Local<v8::Value> v8::StringObject::New(Isolate* v8_isolate,
Local<String> value) { Local<String> value) {
i::Handle<i::String> string = Utils::OpenHandle(*value); i::Handle<i::String> string = Utils::OpenHandle(*value);
@@ -8919,6 +9001,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) { @@ -8927,6 +9009,9 @@ bool MicrotasksScope::IsRunningMicrotasks(Isolate* v8Isolate) {
return isolate->default_microtask_queue()->IsRunningMicrotasks(); return isolate->default_microtask_queue()->IsRunningMicrotasks();
} }
@ -340,7 +340,7 @@ index dd22b2a30b632fb9507eb2e2b95837dd9b8810db..b23105badb1ce643b0d3dcf6716776c5
String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj) String::Utf8Value::Utf8Value(v8::Isolate* isolate, v8::Local<v8::Value> obj)
: str_(nullptr), length_(0) { : str_(nullptr), length_(0) {
if (obj.IsEmpty()) return; if (obj.IsEmpty()) return;
@@ -8938,6 +9023,9 @@ String::Utf8Value::~Utf8Value() { @@ -8946,6 +9031,9 @@ String::Utf8Value::~Utf8Value() {
i::DeleteArray(str_); i::DeleteArray(str_);
} }

2
patches/common/v8/do_not_run_arm_arm64_mksnapshot_binaries.patch
View file

@ -10,7 +10,7 @@ Electron does, so this patch makes sure that the build doesn't try to run
the mksnapshot binary if it was built for arm or arm64. the mksnapshot binary if it was built for arm or arm64.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index 698b6c827f7f3cd7dc6871156daf8467bc7ff605..022c55b3fe32bbde57e97f08ab2c374cc1ea047a 100644 index b593ac20ef722146ca0c50ba01d6ee6b8d6d3035..da0d7810547ab1205f7ad768b76ce27b197f6505 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -1240,9 +1240,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) { @@ -1240,9 +1240,19 @@ if (v8_use_snapshot && v8_use_external_startup_data) {

4
patches/common/v8/expose_mksnapshot.patch
View file

@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to build mksnapshot on arm. Needed in order to build mksnapshot on arm.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
index fb3cfe848e97e0952829e39db5b56571e993d6a2..2f8a6c932efb66c5e273b9e9d2dc5887db8c6265 100644 index 139a777e304ab0449693664feb248a714995aa26..8bdc4ac595e82e1272ade2f715188bcb07653c82 100644
--- a/BUILD.gn --- a/BUILD.gn
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -3379,8 +3379,6 @@ if (current_toolchain == v8_generator_toolchain) { @@ -3376,8 +3376,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) { if (v8_use_snapshot && current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") { v8_executable("mksnapshot") {