Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump chromium to 93.0.4536.0 (14-x-y) #29617

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gclient_gn_args = [

vars = {
'chromium_version':
'93.0.4535.0',
'93.0.4536.0',
'node_version':
'v14.17.0',
'nan_version':
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/add_didinstallconditionalfeatures.patch
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ index 3d985164eee3d7d8ef9e7ff2215ec9a17ec157a5..9c1c4fd8528fbb088f1836c8503c5875
int32_t world_id) {}
virtual void DidClearWindowObject() {}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 031f052207aaec4bfde791e7d5b54ef982834559..6dd68320093b5c16383aff7c0bd5f07d2c8aed57 100644
index d2a0ef47f32fd0eed6854d4d3c6c6c02a37c3e88..768301dae0e1c8ad0bc8e3f1762670fb636c36d4 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -4263,6 +4263,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ index e122d4ffb857023841dabcb6fed352d7586d8344..3c7cd1cb8b204024a0835150302ee889
+ SetSchedulerThrottling(bool allowed);
};
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
index 7acd3f2bf496172490e8bf3ea033ee213fcfdb02..ebc73fa9fbaf689f50deb547ac778f0a74c376fb 100644
index 97e150f7d7f1ccba622ca0a286023ebd75438bb6..85333052af3dcdf39325033f345ae15674dd8768 100644
--- a/third_party/blink/public/web/web_view.h
+++ b/third_party/blink/public/web/web_view.h
@@ -364,6 +364,7 @@ class WebView {
Expand All @@ -85,10 +85,10 @@ index 7acd3f2bf496172490e8bf3ea033ee213fcfdb02..ebc73fa9fbaf689f50deb547ac778f0a
// Visibility -----------------------------------------------------------

diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index f2fbcc760726822b86a9ca7ae37ef07d209a0984..ac730780c3f643b7131b742bd8fb6fd34aae0d9b 100644
index 81c88781d0b7d5c662164b787d581dbfddaa138a..b627f400d16ee1c605ef7657dc3ba63319c5fd56 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -3573,6 +3573,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
@@ -3577,6 +3577,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
return GetPage()->GetPageScheduler();
}

Expand All @@ -102,7 +102,7 @@ index f2fbcc760726822b86a9ca7ae37ef07d209a0984..ac730780c3f643b7131b742bd8fb6fd3
void WebViewImpl::SetVisibilityState(
mojom::blink::PageVisibilityState visibility_state,
bool is_initial_state) {
@@ -3584,7 +3591,8 @@ void WebViewImpl::SetVisibilityState(
@@ -3588,7 +3595,8 @@ void WebViewImpl::SetVisibilityState(
}
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
GetPage()->GetPageScheduler()->SetPageVisible(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ categories in use are known / declared. This patch is required for us
to introduce a new Electron category for Electron-specific tracing.

diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
index c0bcfbab13bc243a4cf575340867463d79358ab7..6d51381b8d9414e44dba0fc1246066e97f9ff88a 100644
index a9616406d4d3742c90aa0d1cf65ab84cfb8890ed..32142ed13cfca009e09578dff79e94030233cfbf 100644
--- a/base/trace_event/builtin_categories.h
+++ b/base/trace_event/builtin_categories.h
@@ -77,6 +77,7 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ index 8e07f7000de932bc9b6bf484b1a9fce4d4580b4a..eac65b694c0a0857f73f75228b8d673b
"//base",
"//build:branding_buildflags",
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 19409f6cd402e4d0aa53344ceab03ecf418bb2ea..05f555823ff8c3481aeb7f340cbf50c4ba7a4c30 100644
index a7b5475c29acff9032ceb28f1237c4901559deba..db2b9ea0a08d6dc72afc67b305f628eb2ad67a38 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4281,7 +4281,7 @@ static_library("browser") {
@@ -4277,7 +4277,7 @@ static_library("browser") {

# On Windows, the hashes are embedded in //chrome:chrome_initial rather
# than here in :chrome_dll.
Expand All @@ -46,10 +46,10 @@ index 19409f6cd402e4d0aa53344ceab03ecf418bb2ea..05f555823ff8c3481aeb7f340cbf50c4
}

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 1d849f6140e7a8f1d39bb3161644fbbdddeca833..6661518018b582e96038e5d3b6dab05303611c14 100644
index d5f3e36ccf1aad7a88424befeed9d7be59cb4ad5..7a0809f33c376154720e204b1b0456bc59b341b7 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5027,10 +5027,15 @@ test("unit_tests") {
@@ -5025,10 +5025,15 @@ test("unit_tests") {
assert(toolkit_views)
sources += [ "../browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc" ]
deps += [
Expand Down
8 changes: 4 additions & 4 deletions patches/chromium/can_create_window.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 d90b9001191600d5659085f4ba0820393c9bbcb1..6794dc92e1bda455a2f32a3af7eb382cdebc40b9 100644
index 491c8b441dfe84862c8b0caa7941cc1e7d16e331..74b3fb5010895869b606890f1523512cd2ee96af 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5974,6 +5974,7 @@ void RenderFrameHostImpl::CreateNewWindow(
@@ -5979,6 +5979,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,
Expand Down Expand Up @@ -150,7 +150,7 @@ index 8a3c4c24a55ae7c520514ded527eb6214a5708a9..631c9b3aab0f2dfe8e6d8437b3f31676
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 9f0234214130857b55ef9735edfe1478c30e800d..e6c947467f260b0f973a656bd828d60c3016c436 100644
index a229509d7254f87af5128ffdaad4cd9c74c3e980..766adb31cf654ff964fbca3acc941c092e382448 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -26,6 +26,7 @@
Expand All @@ -161,7 +161,7 @@ index 9f0234214130857b55ef9735edfe1478c30e800d..e6c947467f260b0f973a656bd828d60c
#include "third_party/blink/public/web/modules/mediastream/web_media_stream_device_observer.h"
#include "third_party/blink/public/web/web_frame_widget.h"
#include "third_party/blink/public/web/web_local_frame.h"
@@ -289,6 +290,10 @@ WebView* RenderViewImpl::CreateView(
@@ -284,6 +285,10 @@ WebView* RenderViewImpl::CreateView(
params->impression = blink::ConvertWebImpressionToImpression(*impression);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
Electrons grit header instead of Chromes

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 29691cfbd621cb6fab1c22ad8e344ea8bfda863d..19409f6cd402e4d0aa53344ceab03ecf418bb2ea 100644
index 519eba1795836a69c8eab33b3ec094eb15440b9b..a7b5475c29acff9032ceb28f1237c4901559deba 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6370,6 +6370,7 @@ static_library("browser") {
@@ -6366,6 +6366,7 @@ static_library("browser") {
deps += [
"//components/spellcheck/browser",
"//components/spellcheck/common",
Expand Down
10 changes: 5 additions & 5 deletions patches/chromium/delay_lock_the_protocol_scheme_registry.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ https://chromium-review.googlesource.com/c/chromium/src/+/1901591, we should try
re-submitting the patch.

diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
index 8b557bdeb4b8f3660cb9aa1adaf2bf28b6a326bf..aa8ffdd580292b88ff32ea536d34080c12db1778 100644
index 7fe69095589d1f12b12ca2e91cf30f89aaf3d986..57d230c76ae5d28bff0bd2eb4be01880189b20bd 100644
--- a/content/app/content_main_runner_impl.cc
+++ b/content/app/content_main_runner_impl.cc
@@ -737,7 +737,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
@@ -738,7 +738,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
}
#endif

Expand Down Expand Up @@ -68,7 +68,7 @@ index 3038f9d25798f36811b6398f8cc0e7d83ecc41b0..68189c36c47ef85b345b0ccc40c456f8
// Re-initializes schemes for tests.
CONTENT_EXPORT void ReRegisterContentSchemesForTests();
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc
index 17d256b852b6e7615cf4e52e4a2d7fa326a4df44..bd0512902df4484e8714cda9ab1352b1c672a1cd 100644
index 8c71a579ee69d77547698c2135e3b4453c126b97..9b7fd8949b13d97982a100a36d9f73c9947b8853 100644
--- a/content/public/app/content_main_delegate.cc
+++ b/content/public/app/content_main_delegate.cc
@@ -42,6 +42,10 @@ bool ContentMainDelegate::ShouldHandleConsoleControlEvents() {
Expand All @@ -83,10 +83,10 @@ index 17d256b852b6e7615cf4e52e4a2d7fa326a4df44..bd0512902df4484e8714cda9ab1352b1
return true;
}
diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
index dd16f2c082665e74cc3c0aaa1ddb53977ce4a7ea..1806baf2d97b36e5c5097516c82d14fce7ca41a5 100644
index 5e45724edf07ac33c9a423ecb6b6077f19e13b04..84f77390772828554e446d1e6f99198b76e9f835 100644
--- a/content/public/app/content_main_delegate.h
+++ b/content/public/app/content_main_delegate.h
@@ -65,6 +65,20 @@ class CONTENT_EXPORT ContentMainDelegate {
@@ -69,6 +69,20 @@ class CONTENT_EXPORT ContentMainDelegate {
// returning initialization error code. Default behavior is CHECK(false).
virtual int TerminateForFatalInitializationError();

Expand Down
8 changes: 4 additions & 4 deletions patches/chromium/disable_color_correct_rendering.patch
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ index 3a817e6450f8ee3239294d1ec5ead0d0fd584b5e..4a0a1c8104ee9d2989d10b1110ef9d30

// If we are likely to software composite the resource, we use sRGB because
diff --git a/cc/trees/layer_tree_settings.h b/cc/trees/layer_tree_settings.h
index 7fa2b4da8c86c89b97a747a5f965485923fae7c9..dd91f7c9eff59824b6571a97be0529f62592d185 100644
index bd5bcf4a03022869fe610015e882ff1980d8a0e8..a3fdd7ae208719bd10ddf1044a501e44e0897ae8 100644
--- a/cc/trees/layer_tree_settings.h
+++ b/cc/trees/layer_tree_settings.h
@@ -95,6 +95,8 @@ class CC_EXPORT LayerTreeSettings {
Expand Down Expand Up @@ -241,7 +241,7 @@ index 262633bdb89ffefb78091788b4b48d23e0e473e6..69016f864405f87a5ee161b52b9dacf9
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
sandbox::policy::switches::kGpuSandboxFailuresFatal,
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 3a9fd06967f4e086639105486b0626aedbe1c4c6..168c1599412b383d1f868eee32555cee0fb5b922 100644
index 3a8aa147230ab18d9f1e485decc7eb4995ac111f..abf6ae39e99d4d592412c548cbac78862eeb463f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -213,6 +213,7 @@
Expand All @@ -252,7 +252,7 @@ index 3a9fd06967f4e086639105486b0626aedbe1c4c6..168c1599412b383d1f868eee32555cee
#include "ui/gl/gl_switches.h"
#include "ui/native_theme/native_theme_features.h"
#include "url/origin.h"
@@ -3311,6 +3312,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
@@ -3317,6 +3318,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
// Propagate the following switches to the renderer command line (along
// with any associated values) if present in the browser command line.
static const char* const kSwitchNames[] = {
Expand Down Expand Up @@ -293,7 +293,7 @@ index 628c6bca129cd58a25984ff8300bfb4c33ec7ebf..ff9ce55f2701990b5b6119c18575477b
}

diff --git a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
index f5751beeb390b556dde8598b67b5fc9270e6805b..b155ad47f19950602000cecba52b1176ef95a749 100644
index 82757ec0893fb1a0c4a31549d85ed95194826d8c..e7ba24aec0d1aabc0093fe0ecaf72438c6009a8f 100644
--- a/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
+++ b/third_party/blink/renderer/platform/widget/compositing/layer_tree_settings.cc
@@ -25,6 +25,7 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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 aba7cafd7731309f8cd8e478a4bb9fd3dfda4e45..3960d578a3d829c28f29b4f611a38142f4058cb6 100644
index 12c7198e22e07a745949bae3e8a6765899d39875..d8a4990222ce3ba81d51400c57be3c5d94aea953 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2328,7 +2328,7 @@ const blink::WebView* RenderFrameImpl::GetWebView() const {
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/extend_apply_webpreferences.patch
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Ideally we could add an embedder observer pattern here but that can be
done in future work.

diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
index ac730780c3f643b7131b742bd8fb6fd34aae0d9b..4db50c1dc41b4b0bec636f885a1fad6a11c0b5b7 100644
index b627f400d16ee1c605ef7657dc3ba63319c5fd56..455b0fd461d0c32de39800d4d7cef2ceb30dc7fb 100644
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -155,6 +155,7 @@
Expand All @@ -23,7 +23,7 @@ index ac730780c3f643b7131b742bd8fb6fd34aae0d9b..4db50c1dc41b4b0bec636f885a1fad6a
#include "third_party/blink/renderer/platform/graphics/image.h"
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
@@ -1788,6 +1789,16 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
@@ -1792,6 +1793,16 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,

RuntimeEnabledFeatures::SetTranslateServiceEnabled(
prefs.translate_service_available);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ index 1026b739d283f0fc252fa2af83a6d4cf51bc8553..fe562ab60ce98b8bb0c5080a6428deb3
private:
const HWND hwnd_;
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index 2ff8732060011e2e1d06861e1197c80b2fba2692..3b954f2f5ae931bf4c297141137315ebbff03cdc 100644
index 7692a2aaf9e4aced560ee4af170e967b7d612eb9..85a2af12aee6eca62b624ae68bccf824750b367b 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -135,6 +135,8 @@ viz_component("service") {
@@ -137,6 +137,8 @@ viz_component("service") {
"display_embedder/output_surface_provider_impl.h",
"display_embedder/server_shared_bitmap_manager.cc",
"display_embedder/server_shared_bitmap_manager.h",
Expand Down
4 changes: 2 additions & 2 deletions patches/chromium/notification_provenance.patch
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ index b195cb84d8bba3c51b04f8c32cf909d15bf34335..37528715db985d12771ba2dca86dcec8
const GURL& document_url,
mojo::PendingReceiver<blink::mojom::NotificationService> receiver);
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index b1ccf7dd7b52f0d9597b11f964bbe754e6344412..39a9562bc82c169e3c06cd7172603cd10378ddbf 100644
index f0b0a33da3ea2c38b6f83631999b936375c0233c..b6b10e30c06016eb4a56722c470d2b2d54a0209b 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -2265,7 +2265,7 @@ void RenderProcessHostImpl::CreateNotificationService(
@@ -2269,7 +2269,7 @@ void RenderProcessHostImpl::CreateNotificationService(
document_url = rfh->GetLastCommittedURL();

storage_partition_impl_->GetPlatformNotificationContext()->CreateService(
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/picture-in-picture.patch
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ index 4b741d67c4c20766e248f0799825103ba4f2a1ce..adf85811da98e1666e8e93e5b339e176
#include "ui/base/l10n/l10n_util.h"
#include "ui/gfx/paint_vector_icon.h"
diff --git a/chrome/browser/ui/views/overlay/overlay_window_views.cc b/chrome/browser/ui/views/overlay/overlay_window_views.cc
index c996365b075abf026b4c26bce0ec89668cf933b8..04c6218f5f59b2d0d3d8e005461fa016fc4e1f33 100644
index da92f8e841ccd6b239b4f081518921da1d3afb79..b443212cb77afe875df37fed820175f09aca1899 100644
--- a/chrome/browser/ui/views/overlay/overlay_window_views.cc
+++ b/chrome/browser/ui/views/overlay/overlay_window_views.cc
@@ -16,9 +16,11 @@
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ index d8c7a1954d5acc0eb4bb675795038eae0e16bc05..bfc7b531b3d0958d8638330eb155e85c
// |url|. If the function returns a valid |new_url|, the request must be
// updated to use it.
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 6dd68320093b5c16383aff7c0bd5f07d2c8aed57..aba7cafd7731309f8cd8e478a4bb9fd3dfda4e45 100644
index 768301dae0e1c8ad0bc8e3f1762670fb636c36d4..12c7198e22e07a745949bae3e8a6765899d39875 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -5038,6 +5038,22 @@ void RenderFrameImpl::BeginNavigation(
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/scroll_bounce_flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 32dd9d006c4d4301fc2272e2e942f0a46ebd4060..ed60a3229dcc8709b0e0f8ad3b64ce4383398156 100644
index 3a5834f68dadd0de9071c8e7c7bd416d59d40d55..dbaa8c95ab0a5572b2194c02a73ae54b8f676ac7 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -1259,7 +1259,7 @@ bool RenderThreadImpl::IsLcdTextEnabled() {
Expand Down
2 changes: 1 addition & 1 deletion patches/chromium/support_mixed_sandbox_with_zygote.patch
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ However, the patch would need to be reviewed by the security team, as it
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
index 39a9562bc82c169e3c06cd7172603cd10378ddbf..3a9fd06967f4e086639105486b0626aedbe1c4c6 100644
index b6b10e30c06016eb4a56722c470d2b2d54a0209b..3a8aa147230ab18d9f1e485decc7eb4995ac111f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -422,10 +422,18 @@ class RendererSandboxedProcessLauncherDelegate
Expand Down
6 changes: 3 additions & 3 deletions patches/v8/build_gn.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 d54096f80ed7c5196d9a92bea01cee00601e50a1..c209419b2f1fac22ba38c5e72ef8a532846bc346 100644
index 764849fca94271fcacdc2a34062aee822bd5fc2f..5d32612cce2d7d59aa138cfdf6ec8875434916b3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -521,7 +521,7 @@ config("internal_config") {
Expand All @@ -21,7 +21,7 @@ index d54096f80ed7c5196d9a92bea01cee00601e50a1..c209419b2f1fac22ba38c5e72ef8a532
defines += [ "BUILDING_V8_SHARED" ]
}
}
@@ -5235,7 +5235,7 @@ if (current_toolchain == v8_generator_toolchain) {
@@ -5237,7 +5237,7 @@ if (current_toolchain == v8_generator_toolchain) {
"src/interpreter/bytecodes.h",
]

Expand All @@ -30,7 +30,7 @@ index d54096f80ed7c5196d9a92bea01cee00601e50a1..c209419b2f1fac22ba38c5e72ef8a532

deps = [
":v8_libbase",
@@ -5273,6 +5273,8 @@ if (current_toolchain == v8_snapshot_toolchain) {
@@ -5275,6 +5275,8 @@ if (current_toolchain == v8_snapshot_toolchain) {

configs = [ ":internal_config" ]

Expand Down
4 changes: 2 additions & 2 deletions patches/v8/dcheck.patch
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ index c6cd830d70cd865d6e3a8fe2c4bc05258f3bf6ad..22ed27c0c7250fe29bc6e4800631fbad
isolate->default_microtask_queue()->PerformCheckpoint(this);
}
diff --git a/src/heap/heap.cc b/src/heap/heap.cc
index 556f6cf092b50ae62b42126dac2f1bf5ee572ee8..5b8ba9c8e1456f7aeb11d4c248001b6707b77679 100644
index 69eb033f0fc8ef6c5a61ac6e3b7bb556884bf5ae..f28a65d2242a26c58a0ae96ed6fc7dd9a298cd36 100644
--- a/src/heap/heap.cc
+++ b/src/heap/heap.cc
@@ -5841,9 +5841,9 @@ void Heap::DeinitSharedSpaces() {
@@ -5843,9 +5843,9 @@ void Heap::DeinitSharedSpaces() {
void Heap::AddGCPrologueCallback(v8::Isolate::GCCallbackWithData callback,
GCType gc_type, void* data) {
DCHECK_NOT_NULL(callback);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 da465cca885d753eed77049ce85ebc7ec0eca701..657d48a9b1f1151511939b90eeeac9ef8344386f 100644
index 3eeac10700fa06790b0691b0b52d9c413a79a94f..49fd11008d1841e6d3868fc0546d8703c6c3e554 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -521,6 +521,10 @@ config("internal_config") {
Expand Down