github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: fixup patch indices

Browse Source
This commit is contained in:
Shelley Vohr
2022-06-02 16:06:56 +02:00
parent 43024a74c2
commit fccfc1bb29
25 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/chromium/add_didinstallconditionalfeatures.patch
View File

@@ -23,10 +23,10 @@ index d921125d153742dd09e34418c19195a3d61bef1f..5348c3289a94c86bbbc9bb07be26cc56
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6c0e195bafa9400c72484151a303d0af67503313..6f5e9f868cdaadb09df4841f688dbb780921aaea 100644
index 233bfa4b8b06c4814a0e0c3f9438aacaf5c312ee..d48b88ea9444d911e49e2b430f105b2dad01d8b2 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4515,6 +4515,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
@@ -4471,6 +4471,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
observer.DidCreateScriptContext(context, world_id);
}

8
patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
View File

@@ -33,7 +33,7 @@ index f1806b49a24c1f78b5a34f3c286e09671cb782d9..07be5296842515bff655846e33259fb6
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 24b2d5aa3f522188a889716422e8d4a82f5c25e4..de5d8c17006a2a99d314f9441d6d7509f4a0b969 100644
index c064308807866c039a4160d47ef65bf84b5e954a..be100268336239a17a24bb6424fec427eaf3ab10 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4546,7 +4546,7 @@ static_library("browser") {
@@ -46,7 +46,7 @@ index 24b2d5aa3f522188a889716422e8d4a82f5c25e4..de5d8c17006a2a99d314f9441d6d7509
sources += [ "certificate_viewer_stub.cc" ]
}
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 69e39d5c7d2bedcefc68fbe15b21d9f72b6c67bc..f6f29f7aeba3fbee8f663e19e6189b7c62f1adbc 100644
index 5f92e3b598fa3ad8767d20db975cb29329577613..9e122f609e67192c4fa58ed93d11dadc44c42b13 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5903,7 +5903,6 @@ test("unit_tests") {
@@ -68,7 +68,7 @@ index 69e39d5c7d2bedcefc68fbe15b21d9f72b6c67bc..f6f29f7aeba3fbee8f663e19e6189b7c
ldflags = [
"/DELAYLOAD:api-ms-win-core-winrt-error-l1-1-0.dll",
"/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
@@ -6821,7 +6824,6 @@ test("unit_tests") {
@@ -6822,7 +6825,6 @@ test("unit_tests") {
}
deps += [
@@ -76,7 +76,7 @@ index 69e39d5c7d2bedcefc68fbe15b21d9f72b6c67bc..f6f29f7aeba3fbee8f663e19e6189b7c
"//chrome/browser:cart_db_content_proto",
"//chrome/browser:coupon_db_content_proto",
"//chrome/browser/media/router:test_support",
@@ -6924,6 +6926,10 @@ test("unit_tests") {
@@ -6926,6 +6928,10 @@ test("unit_tests") {
}
}

10
patches/chromium/can_create_window.patch
View File

@@ -9,10 +9,10 @@ potentially prevent a window from being created.
TODO(loc): this patch is currently broken.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 32297a40a68ae618db358fbd0608e6b08543b551..bfa637f6667e2f21ae30f2fb114b9cab12a65a56 100644
index c0c99d3a664868858edffa5662b854337bef5feb..0fb248e89875b9b6040cf37c455c8ba50de265e9 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6988,6 +6988,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -6989,6 +6989,7 @@ void RenderFrameHostImpl::CreateNewWindow(
last_committed_origin_, params->window_container_type,
params->target_url, params->referrer.To<Referrer>(),
params->frame_name, params->disposition, *params->features,
@@ -68,10 +68,10 @@ index bdcbb09cdd884dda769a5501e3dc94547f454be9..0b25def9601d8baadee6283f526687b3
// 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 82d33875526759dda05a1818543c0605382597f4..ec89c920f0e0ad3638749b1468bcd54f74b3cce5 100644
index 08b6c6f89b4ec107c8ac459315f38eaf3fcc5c1a..ea55f2b41cc985a64e611d80caeb50cf5dc4a0fd 100644
--- a/content/public/browser/content_browser_client.cc
+++ b/content/public/browser/content_browser_client.cc
@@ -594,6 +594,8 @@ bool ContentBrowserClient::CanCreateWindow(
@@ -595,6 +595,8 @@ bool ContentBrowserClient::CanCreateWindow(
const std::string& frame_name,
WindowOpenDisposition disposition,
const blink::mojom::WindowFeatures& features,
@@ -81,7 +81,7 @@ index 82d33875526759dda05a1818543c0605382597f4..ec89c920f0e0ad3638749b1468bcd54f
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 e2c88a7e692406c9774a0e9783df612cbc38d7cd..4e069af9256eb106b50e84d1243c92353daf2015 100644
index c048f7e16d543312bc5fc5adc023b06aa05fb4f6..ab229b15262a3c598bd93529cc96cc78d93ae750 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -165,6 +165,7 @@ class NetworkService;

5
patches/chromium/disable_color_correct_rendering.patch
View File

@@ -47,7 +47,7 @@ index 14a2e02d9a6edc3a7002ca43bc82c8ef98eb32b5..10abba0f0610719cc4be0ce792ce64ab
// Image Decode Service and raster tiles without images until the decode is
// ready.
diff --git a/components/viz/common/display/renderer_settings.h b/components/viz/common/display/renderer_settings.h
index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562e8f93da5 100644
index bc48a50a7664f12a454997db54d893cde9b04881..810a8ce52bf9ac74f47a710f8b332980754996f5 100644
--- a/components/viz/common/display/renderer_settings.h
+++ b/components/viz/common/display/renderer_settings.h
@@ -24,6 +24,7 @@ class VIZ_COMMON_EXPORT RendererSettings {
@@ -59,7 +59,7 @@ index 8b0b5eda59c863efb6f4c67636810871677894c5..eea098eab3c2a5c36fab1a71d888e562
bool force_antialiasing = false;
bool force_blending_with_shaders = false;
diff --git a/components/viz/host/renderer_settings_creation.cc b/components/viz/host/renderer_settings_creation.cc
index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47da860679 100644
index 9d34ced366026eb7cdd00ce40a4eb1af56180d39..abf67f8246bfa37df08cd2216c388dd316fb6499 100644
--- a/components/viz/host/renderer_settings_creation.cc
+++ b/components/viz/host/renderer_settings_creation.cc
@@ -17,6 +17,7 @@
@@ -79,7 +79,6 @@ index 6a830ec9f29b9764cd425f0681dafbb18d90b457..a7a095ceb9e626c79db21e0d16c8ef47
renderer_settings.partial_swap_enabled =
!command_line->HasSwitch(switches::kUIDisablePartialSwap);
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index 8ca8002b9680a5e1aa2280199fdb87cdcad15961..089e0e68292d9636973878b955204a6ae7a15299 100644
--- a/content/browser/gpu/gpu_process_host.cc

6
patches/chromium/disable_unload_metrics.patch
View File

@@ -24,10 +24,10 @@ This patch temporarily disables the metrics so we can have green CI, and we
should continue seeking for a real fix.
diff --git a/content/browser/renderer_host/navigator.cc b/content/browser/renderer_host/navigator.cc
index dfa1e9ac5b50620b42b541b0aea7a2573a88f3bb..93e7b8db5432ec951924066c74aaf1fc6e071c48 100644
index ccf890a5e6577fd1834873971dd72cc816b2033e..abbe35ee1401711d0755418ec9132d21e18b9ba5 100644
--- a/content/browser/renderer_host/navigator.cc
+++ b/content/browser/renderer_host/navigator.cc
@@ -1295,6 +1295,7 @@ void Navigator::RecordNavigationMetrics(
@@ -1299,6 +1299,7 @@ void Navigator::RecordNavigationMetrics(
.InMilliseconds());
}
@@ -35,7 +35,7 @@ index dfa1e9ac5b50620b42b541b0aea7a2573a88f3bb..93e7b8db5432ec951924066c74aaf1fc
// If this is a same-process navigation and we have timestamps for unload
// durations, fill those metrics out as well.
if (params.unload_start && params.unload_end &&
@@ -1341,6 +1342,7 @@ void Navigator::RecordNavigationMetrics(
@@ -1345,6 +1346,7 @@ void Navigator::RecordNavigationMetrics(
first_before_unload_start_time)
.InMilliseconds());
}

4
patches/chromium/don_t_use_potentially_null_getwebframe_-_view_when_get_blink.patch
View File

@@ -11,10 +11,10 @@ This regressed in https://chromium-review.googlesource.com/c/chromium/src/+/2572
Upstream: https://chromium-review.googlesource.com/c/chromium/src/+/2598393
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6f5e9f868cdaadb09df4841f688dbb780921aaea..d03346987f41488a214b7a6b4b6125b999f1ba1e 100644
index d48b88ea9444d911e49e2b430f105b2dad01d8b2..b287b001833914b729ce64194124100f37fc00af 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2403,7 +2403,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
@@ -2370,7 +2370,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
}
const blink::web_pref::WebPreferences& RenderFrameImpl::GetBlinkPreferences() {

2
patches/chromium/expose_setuseragent_on_networkcontext.patch
View File

@@ -33,7 +33,7 @@ index 14c71cc69388da46f62d9835e2a06fef0870da02..9481ea08401ae29ae9c1d960491b05b3
} // namespace net
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 1a5fc50bb1fab817ff3455bd453dad3895e243c9..56ab6c7793db4edf463e0c39d73e8687bc2f3063 100644
index 5f1d26f37b6d734d8d94c3de18abdcc55b18b460..12a92f542aa924a68a1b5a02a33653cb77c60689 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -1407,6 +1407,13 @@ void NetworkContext::SetNetworkConditions(

20
patches/chromium/feat_enable_offscreen_rendering_with_viz_compositor.patch
View File

@@ -81,7 +81,7 @@ index 309422bcf85810db88a048bd0930c4072b41f234..759549f3046f4a897b597409b670bb1c
private:
const HWND hwnd_;
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index fe988e3bbcf0c9deb5592f24fdeda3016114e3bf..da82b0458d0c87cf4de793007b826984d010cbb2 100644
index 33e1f40fa0083843cfed7b145088a99b8e1a3d85..7b73bf1bb8e265eaec33d9ab0b44c30662be5d19 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -105,6 +105,8 @@ viz_component("service") {
@@ -94,10 +94,10 @@ index fe988e3bbcf0c9deb5592f24fdeda3016114e3bf..da82b0458d0c87cf4de793007b826984
"display_embedder/software_output_surface.h",
"display_embedder/vsync_parameter_listener.cc",
diff --git a/components/viz/service/display_embedder/output_surface_provider.h b/components/viz/service/display_embedder/output_surface_provider.h
index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e365803633459a86 100644
index 2e9453c18f2f6623d31b477aa856152ddacc3e23..93b6080135c08bc9d4cf7020f4fcb15c06a01a60 100644
--- a/components/viz/service/display_embedder/output_surface_provider.h
+++ b/components/viz/service/display_embedder/output_surface_provider.h
@@ -39,7 +39,8 @@ class OutputSurfaceProvider {
@@ -38,7 +38,8 @@ class OutputSurfaceProvider {
mojom::DisplayClient* display_client,
DisplayCompositorMemoryAndTaskController* gpu_dependency,
const RendererSettings& renderer_settings,
@@ -108,7 +108,7 @@ index 77d463e683d8b8d3a202681a6884eacaab79d70d..05d51cb2637d34c073cd0025e3658036
} // namespace viz
diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.cc b/components/viz/service/display_embedder/output_surface_provider_impl.cc
index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefbdd2c0f71 100644
index 555b911352277820d9d58ca35eace175748e12bd..6e54db0452f6bcb324a03aa7b9a7659e235ddcd0 100644
--- a/components/viz/service/display_embedder/output_surface_provider_impl.cc
+++ b/components/viz/service/display_embedder/output_surface_provider_impl.cc
@@ -23,6 +23,7 @@
@@ -127,7 +127,7 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefb
#include "ui/base/ui_base_switches.h"
#if BUILDFLAG(IS_WIN)
@@ -126,7 +128,8 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
@@ -107,7 +109,8 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
mojom::DisplayClient* display_client,
DisplayCompositorMemoryAndTaskController* gpu_dependency,
const RendererSettings& renderer_settings,
@@ -137,7 +137,7 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefb
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (surface_handle == gpu::kNullSurfaceHandle)
return std::make_unique<OutputSurfaceUnified>();
@@ -119,7 +121,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
@@ -119,7 +122,7 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
if (!gpu_compositing) {
output_surface = std::make_unique<SoftwareOutputSurface>(
@@ -146,7 +146,7 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefb
} else {
DCHECK(gpu_dependency);
{
@@ -243,10 +246,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
@@ -156,10 +159,22 @@ std::unique_ptr<OutputSurface> OutputSurfaceProviderImpl::CreateOutputSurface(
std::unique_ptr<SoftwareOutputDevice>
OutputSurfaceProviderImpl::CreateSoftwareOutputDeviceForPlatform(
gpu::SurfaceHandle surface_handle,
@@ -171,10 +171,10 @@ index 8a277c6337d446890bb32814a68db2a9d3d3cd72..1c967969a03c985e68f744cf4815cefb
return CreateSoftwareOutputDeviceWin(surface_handle, &output_device_backing_,
display_client);
diff --git a/components/viz/service/display_embedder/output_surface_provider_impl.h b/components/viz/service/display_embedder/output_surface_provider_impl.h
index fa9bc45b5c12821789270907f73c7e6f3c0c1424..6d2ad1d88631db82f41de2852c3e9a6ad1431b2e 100644
index 0dd6a4debc0587199acd2626e3decf4a6651e7a9..04d78d0c015c5eede01dec759a16d56dca4c19ae 100644
--- a/components/viz/service/display_embedder/output_surface_provider_impl.h
+++ b/components/viz/service/display_embedder/output_surface_provider_impl.h
@@ -66,12 +66,14 @@ class VIZ_SERVICE_EXPORT OutputSurfaceProviderImpl
@@ -65,12 +65,14 @@ class VIZ_SERVICE_EXPORT OutputSurfaceProviderImpl
mojom::DisplayClient* display_client,
DisplayCompositorMemoryAndTaskController* gpu_dependency,
const RendererSettings& renderer_settings,
@@ -503,7 +503,7 @@ index 583e3e2525c753a0962d481fc67a3582df75d0e9..9416ec929bebcff7f07088e635376ef2
waiting_on_draw_ack_ = true;
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
index 4e38e0f49054cef3fd1a712c89608ce39003edeb..427882f8ed0d85c6e4170b213c3a3678b60a62df 100644
index 8eeb87e2322821ac52e4bc0000cb777d69515a2c..5a7d1501aed1f01b1b67ae156cfb927ee696f83b 100644
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
@@ -84,7 +84,8 @@ RootCompositorFrameSinkImpl::Create(

2
patches/chromium/frame_host_manager.patch
View File

@@ -20,7 +20,7 @@ index dd1e91e5d3f7cffafaf14116bd33aef2ce1aaa1f..b7fdd58a21a863bb5eb777be93521755
}
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 4e069af9256eb106b50e84d1243c92353daf2015..8e8ba0a946c3382045691b788566885fb0e41ce5 100644
index ab229b15262a3c598bd93529cc96cc78d93ae750..2fe16e5bc73ffe510b9d64cc0b013a1e92b55b20 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -271,6 +271,11 @@ class CONTENT_EXPORT ContentBrowserClient {

2
patches/chromium/gtk_visibility.patch
View File

@@ -18,7 +18,7 @@ index 349043f8a3cfc9f91cbae951e74258799a4fd126..0f7e3e544f524a7ad6660b54912cb119
# on GTK.
"//examples:peerconnection_client",
diff --git a/ui/ozone/platform/x11/BUILD.gn b/ui/ozone/platform/x11/BUILD.gn
index b1180a85530a7dd65022e174fe335ede0c7c55ca..c12133d82b111d37c8bac92980c22e406125c8df 100644
index 252986ee44f9492ada6e11c08dea188bf17e741e..288ff1de7a09d501e0a86563c90e33d064517dac 100644
--- a/ui/ozone/platform/x11/BUILD.gn
+++ b/ui/ozone/platform/x11/BUILD.gn
@@ -6,7 +6,7 @@ import("//build/config/chromeos/ui_mode.gni")

2
patches/chromium/introduce_ozoneplatform_electron_can_call_x11_property.patch
View File

@@ -21,7 +21,7 @@ index 9008af973427d7dab8170449bc5767cebc9d2e9e..e312287e4aca61b51a69c8413088f56f
properties->supports_global_application_menus = true;
properties->app_modal_dialogs_use_event_blocker = true;
diff --git a/ui/ozone/public/ozone_platform.h b/ui/ozone/public/ozone_platform.h
index 22ba32317a74df24249d1528dcaaa28ff18bd0f4..fa57f97520a0327be2c7f5179591ca61b801c8b0 100644
index df6b551b94bd4e04f4c0d6e976c68cc187a57d85..3b6dd20277af88568cdb17a7fddf89bdf89b5640 100644
--- a/ui/ozone/public/ozone_platform.h
+++ b/ui/ozone/public/ozone_platform.h
@@ -132,6 +132,10 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {

4
patches/chromium/load_v8_snapshot_in_browser_process.patch
View File

@@ -9,10 +9,10 @@ but due to the nature of electron, we need to load the v8 snapshot
in the browser process.
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 4ea2ad7697bd4531f9538c16778b76ed7b439d74..bdc2e97e41705abe0f7b259635842c4f2e122b41 100644
index 4ca7ffbee2670193c896e34d7b8d92198af8d0e7..fa4e58ee3ce47b5607384f90986e3bbff1c0ef8f 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -251,11 +251,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
@@ -253,11 +253,8 @@ void LoadV8SnapshotFile(const base::CommandLine& command_line) {
bool ShouldLoadV8Snapshot(const base::CommandLine& command_line,
const std::string& process_type) {

2
patches/chromium/mas_disable_remote_accessibility.patch
View File

@@ -44,7 +44,7 @@ index 306db835fe203f663b1d84dd3490b619eb3f60b2..7a41d7afe6197e0a78934206782b1063
} // namespace
diff --git a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
index 23acd2a188522a6f2f9f0009faf1b52f35db6450..654003552a466e84d68bc2706272d183ddf3824d 100644
index f313f0b3f5f0e49735ec8b1f889638c6a6b67972..a10e294e67fb963a8e66d93013028616328b5fe2 100644
--- a/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
+++ b/components/remote_cocoa/app_shim/native_widget_ns_window_bridge.mm
@@ -580,10 +580,12 @@ NSUInteger CountBridgedWindows(NSArray* child_windows) {

2
patches/chromium/network_service_allow_remote_certificate_verification_logic.patch
View File

@@ -7,7 +7,7 @@ This adds a callback from the network service that's used to implement
session.setCertificateVerifyCallback.
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
index 52f1d8b1fd024b0252daaa86dc0704636fdcee3e..1a5fc50bb1fab817ff3455bd453dad3895e243c9 100644
index 40a552fc5b083c261b1c5904286dec7542f61a1d..5f1d26f37b6d734d8d94c3de18abdcc55b18b460 100644
--- a/services/network/network_context.cc
+++ b/services/network/network_context.cc
@@ -128,6 +128,11 @@

4
patches/chromium/printing.patch
View File

@@ -113,7 +113,7 @@ index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf0
void PrintJobWorkerOop::UnregisterServiceManagerClient() {
diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0adb5365a94 100644
index 88a2f2b88a729d0874094a1e7b906edf0e91d799..a50df7d3f2f1bf9948532b21f68e1fd37a059690 100644
--- a/chrome/browser/printing/print_view_manager_base.cc
+++ b/chrome/browser/printing/print_view_manager_base.cc
@@ -30,8 +30,6 @@
@@ -350,7 +350,7 @@ index e74a2d0858c187b11ac322033b122e046a45967e..09f6d4a575225ac5df9994fd0620e0ad
void PrintViewManagerBase::OnFailed() {
TerminatePrintJob(true);
}
@@ -912,7 +912,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
@@ -912,7 +946,10 @@ bool PrintViewManagerBase::CreateNewPrintJob(
// Disconnect the current `print_job_`.
auto weak_this = weak_ptr_factory_.GetWeakPtr();

2
patches/chromium/scroll_bounce_flag.patch
View File

@@ -6,7 +6,7 @@ Subject: scroll_bounce_flag.patch
Patch to make scrollBounce option work.
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index eb49980db934e8ba1c58faed569c79de8439b5c2..0e75627f31e8bcf0131ba8e0a38316f068e12382 100644
index ab74207b348f211ee78de1384c9c75f7682926fe..ff475b3978b215cdbe921c620661070309bc5f5d 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1283,7 +1283,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {

4
patches/chromium/webview_fullscreen.patch
View File

@@ -14,10 +14,10 @@ Note that we also need to manually update embedder's
`api::WebContents::IsFullscreenForTabOrPending` value.
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index bfa637f6667e2f21ae30f2fb114b9cab12a65a56..3f3ab45d2e240747ceddf7fd507d58d8ca81b459 100644
index 0fb248e89875b9b6040cf37c455c8ba50de265e9..a432eb192374bedb1c3e834076f66b20645e98fc 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -6347,6 +6347,15 @@ void RenderFrameHostImpl::EnterFullscreen(
@@ -6348,6 +6348,15 @@ void RenderFrameHostImpl::EnterFullscreen(
notified_instances.insert(parent_site_instance);
}

6
patches/chromium/worker_context_will_destroy.patch
View File

@@ -26,7 +26,7 @@ index 1dfe162dc69f404b49bae6197fa7b713600eb9bd..dedfb41c933ad7930cbab5aae502e1df
// 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 aac0af96c3a7c5fb3a5932f61fe9fa6acfb217ce..c3817c998734cd8a57809ac91e5fd4a5f62b655b 100644
index dea9f8dd904846c0151452287c23e93af869392d..e2669b2cc946772d7be05947426db2e52b2a7794 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -967,6 +967,12 @@ void RendererBlinkPlatformImpl::WillStopWorkerThread() {
@@ -43,7 +43,7 @@ index aac0af96c3a7c5fb3a5932f61fe9fa6acfb217ce..c3817c998734cd8a57809ac91e5fd4a5
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 213b0b9c28974aecbdd2dd1297dfa21cd716a337..f77763977aee112b854ade93b59172247599a16b 100644
index 3c2eeb7a58bbba75fcc2683ce99c4c3a662fc475..86534f2243ca3e5f280c34839d15e99442792bd2 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -209,6 +209,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -55,7 +55,7 @@ index 213b0b9c28974aecbdd2dd1297dfa21cd716a337..f77763977aee112b854ade93b5917224
const blink::WebSecurityOrigin& script_origin) override;
blink::ProtocolHandlerSecurityLevel GetProtocolHandlerSecurityLevel()
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 5efae88063c2cb479246849c06b5c22456b055b3..c2ca4ec944dfe7b131d78d7690233a7986b388b3 100644
index af57a949f2a15ca88b13bc023fc957cb4cb433ef..70dc8b130d5231f7ac5981e512cbf96a2499f034 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -722,6 +722,7 @@ class BLINK_PLATFORM_EXPORT Platform {

6
patches/chromium/worker_feat_add_hook_to_notify_script_ready.patch
View File

@@ -35,7 +35,7 @@ index dedfb41c933ad7930cbab5aae502e1df28cf05e4..8ad7306886109e827a8a692fee39f7c7
// from the worker thread.
virtual void WillDestroyWorkerContextOnWorkerThread(
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index c3817c998734cd8a57809ac91e5fd4a5f62b655b..254740eafed5ff2bc2afcd526a2fec4f572085b0 100644
index e2669b2cc946772d7be05947426db2e52b2a7794..b6bea6cbb021435fee4480fbdd4b23f1304f9423 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -979,6 +979,12 @@ void RendererBlinkPlatformImpl::WorkerContextCreated(
@@ -52,7 +52,7 @@ index c3817c998734cd8a57809ac91e5fd4a5f62b655b..254740eafed5ff2bc2afcd526a2fec4f
const blink::WebSecurityOrigin& script_origin) {
return GetContentClient()->renderer()->AllowScriptExtensionForServiceWorker(
diff --git a/content/renderer/renderer_blink_platform_impl.h b/content/renderer/renderer_blink_platform_impl.h
index f77763977aee112b854ade93b59172247599a16b..f3518973a5e071bf428d928f20255c208cf4d0b9 100644
index 86534f2243ca3e5f280c34839d15e99442792bd2..2b80e0993a13cd403532e15ab4e589c3cf0e60c4 100644
--- a/content/renderer/renderer_blink_platform_impl.h
+++ b/content/renderer/renderer_blink_platform_impl.h
@@ -209,6 +209,8 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
@@ -65,7 +65,7 @@ index f77763977aee112b854ade93b59172247599a16b..f3518973a5e071bf428d928f20255c20
bool AllowScriptExtensionForServiceWorker(
const blink::WebSecurityOrigin& script_origin) override;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index c2ca4ec944dfe7b131d78d7690233a7986b388b3..c274faccf2141576d7fcc9340e8f840fc7da1dc1 100644
index 70dc8b130d5231f7ac5981e512cbf96a2499f034..a443f59b36fb6f9d5276e77414a8707998db83ad 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -722,6 +722,8 @@ class BLINK_PLATFORM_EXPORT Platform {

2
patches/v8/allow_disabling_of_v8_sandboxed_pointers.patch
View File

@@ -8,7 +8,7 @@ https://chromium-review.googlesource.com/c/v8/v8/+/3114136, so for
now we need a way to disable v8 sandboxed pointers.
diff --git a/BUILD.gn b/BUILD.gn
index 2b2b6061d281cc2db4f9d9ee05e7a0d1ea99691b..43ec64e208d74adc300e650f569922b1f58fd77c 100644
index f3b269bf948d7c8cb1b9c9157fc91924a5336ffc..4beb0cc5ff13cd5c8509ce7ef7c95150982650db 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -508,9 +508,9 @@ if (v8_enable_sandbox == "") {

6
patches/v8/build_gn.patch
View File

@@ -9,7 +9,7 @@ necessary for native modules to load.
Also, some fixes relating to mksnapshot on ARM.
diff --git a/BUILD.gn b/BUILD.gn
index 870332a06a5bd81745d602a51b11afff0194c507..723d777bcfcbbe6cc48a5b7712b134d7b4ba9e29 100644
index adffeec107f8455ad6e4e7c0ccb1d9feb5e42df4..43efd9c09d5d64e4131325b3326ca7723a3e58f6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -623,7 +623,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index 870332a06a5bd81745d602a51b11afff0194c507..723d777bcfcbbe6cc48a5b7712b134d7
defines += [ "BUILDING_V8_SHARED" ]
}
@@ -5923,7 +5923,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5932,7 +5932,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]
@@ -30,7 +30,7 @@ index 870332a06a5bd81745d602a51b11afff0194c507..723d777bcfcbbe6cc48a5b7712b134d7
deps = [
":v8_libbase",
@@ -5961,6 +5961,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
@@ -5970,6 +5970,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
configs = [ ":internal_config" ]

8
patches/v8/dcheck.patch
View File

@@ -6,10 +6,10 @@ Subject: dcheck.patch
https://github.com/auchenberg/volkswagen
diff --git a/src/api/api.cc b/src/api/api.cc
index bf0e1b2a3e661fdb38a91e1a62a12a6da65cab98..6009c0526d5b713f5899d99e726b832ae2735e8d 100644
index ab8a3358c263b1d46279869e8a31855c5f5357c8..cb09a5df3d2da31abbbc256aeda1210a56615121 100644
--- a/src/api/api.cc
+++ b/src/api/api.cc
@@ -9116,7 +9116,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
@@ -9115,7 +9115,7 @@ void Isolate::SetPromiseRejectCallback(PromiseRejectCallback callback) {
}
void Isolate::PerformMicrotaskCheckpoint() {
@@ -19,10 +19,10 @@ index bf0e1b2a3e661fdb38a91e1a62a12a6da65cab98..6009c0526d5b713f5899d99e726b832a
i_isolate->default_microtask_queue()->PerformCheckpoint(this);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 78462e99f5724e0a8a6ffcc6b1518218a7f76bbf..d74fde9829ecd132f02fe1140e2e0a2c066402c8 100644
index 089347e923156a1aeb383bd845a0aa2b6696e2c4..416cd9fc8af3acb9b4245b90ee812679b4022c78 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -6210,9 +6210,9 @@ void Heap::TearDown() {
@@ -6214,9 +6214,9 @@ void Heap::TearDown() {
void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
GCType gc_type, void* data) {
DCHECK_NOT_NULL(callback);

2
patches/v8/do_not_export_private_v8_symbols_on_windows.patch
View File

@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
contain any standard C++ library exports (e.g. `std::ostringstream`).
diff --git a/BUILD.gn b/BUILD.gn
index e1ced3441d5886cfd2e77c191e433e939f159d7f..2b2b6061d281cc2db4f9d9ee05e7a0d1ea99691b 100644
index aa0d29f6ba3059d384e877068ad1aa2a6429a334..f3b269bf948d7c8cb1b9c9157fc91924a5336ffc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -623,6 +623,10 @@ config("internal_config") {

4
patches/v8/expose_mksnapshot.patch
View File

@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
Needed in order to target mksnapshot for mksnapshot zip.
diff --git a/BUILD.gn b/BUILD.gn
index 723d777bcfcbbe6cc48a5b7712b134d7b4ba9e29..e1ced3441d5886cfd2e77c191e433e939f159d7f 100644
index 43efd9c09d5d64e4131325b3326ca7723a3e58f6..aa0d29f6ba3059d384e877068ad1aa2a6429a334 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -5935,7 +5935,6 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5944,7 +5944,6 @@ if (current_toolchain == v8_generator_toolchain) {
if (current_toolchain == v8_snapshot_toolchain) {
v8_executable("mksnapshot") {

4
patches/v8/revert_runtime_dhceck_terminating_exception_in_microtasks.patch
View File

@@ -18,7 +18,7 @@ index ca4b1dc557f573bfcde200201cbd2f05e3c6b530..9edc8ce00c524a63cb23911a474f1904
StoreRoot(RootIndex::kCurrentMicrotask, microtask);
TNode<IntPtrT> saved_entered_context_count = GetEnteredContextCount();
diff --git a/src/codegen/code-stub-assembler.cc b/src/codegen/code-stub-assembler.cc
index d66a2ee47fdaf4395b0c2d350990c06c23883a3b..b4b766de891ae368727427444727f1d0a6e7c509 100644
index d35929d7f2155af23320aa70fe5cdff178fe6fc7..007284be5a29ae6e30c9c13b1ed0e41ce8e7a4c4 100644
--- a/src/codegen/code-stub-assembler.cc
+++ b/src/codegen/code-stub-assembler.cc
@@ -6142,12 +6142,6 @@ void CodeStubAssembler::SetPendingMessage(TNode<HeapObject> message) {
@@ -35,7 +35,7 @@ index d66a2ee47fdaf4395b0c2d350990c06c23883a3b..b4b766de891ae368727427444727f1d0
int type) {
return Word32Equal(instance_type, Int32Constant(type));
diff --git a/src/codegen/code-stub-assembler.h b/src/codegen/code-stub-assembler.h
index e93423fbbb947fb06fe86372eeebc58b8d940502..d218de34b15702dc1ad6a79168032932565ff15c 100644
index 2b469c5e351debf1b684c003f0c256497709ccf6..c5bbe11ae949a076d9b51efbd8a845c8a05c7653 100644
--- a/src/codegen/code-stub-assembler.h
+++ b/src/codegen/code-stub-assembler.h
@@ -2513,7 +2513,6 @@ class V8_EXPORT_PRIVATE CodeStubAssembler