Skip to content

Commit 8bbdc22

Browse files
electron-botlocdeepak1556MarshallOfSoundJohn Kleinschmidt
authored
chore: bump chromium to 6d130075d378a64187360ba4e7820 (master) (electron#24256)
* chore: bump chromium in DEPS to 7fb9778894d73378bff51087ce869ea5aa6e5d5d * chore: bump chromium in DEPS to 83da426e53d423f0530fc23433b6d2c4d0548442 * update patches * remove chromeos-only TtsControllerDelegate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2255314 * SharedUserScriptMaster -> SharedUserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2258357 * avoid deprecated DISALLOW_COPY_AND_ASSIGN https://groups.google.com/a/chromium.org/forum/#!msg/cxx/qwH2hxaEjac/TUKq6eqfCwAJ * chore: bump chromium in DEPS to b2eaf9ff4e6b03267bf279583ea20ceb2b25e9d0 * update patches * rename GetHighContrastColorScheme -> GetPlatformHighContrastColorScheme Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2250224 * remove vulkan info collection Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2252818 * add max_xcode_version build var Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2264867 * add missing headers * chore: bump chromium in DEPS to cded18ca1138f7e8efc904f077ddcca34f0135cf * update patches * add empty floc blocklist to BrowserProcessImpl Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240873 * chore: bump chromium in DEPS to f06602226cd80bf677b2ce013a94a2fb7f6ac58d * chore: bump chromium in DEPS to 747aa4bfc74fc6cf7f08ee72624cd69ae41ae28d * chore: bump chromium in DEPS to 31c0105e50fcc4e94de33e5c8602c755ace4a32b * chore: update patches * Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" https://chromium-review.googlesource.com/c/chromium/src/+/2264297 * X11 and Ozone: make sure gfx::AcceleratedWidget to be uint32_t https://chromium-review.googlesource.com/c/chromium/src/+/2260554 * Move zygote from //services/service_manager back to //content https://chromium-review.googlesource.com/c/chromium/src/+/2252466 * chore: update v8 patches * [XProto] Remove usage of Shape extension https://chromium-review.googlesource.com/c/chromium/src/+/2262113 * fixup! add empty floc blocklist to BrowserProcessImpl * Require macOS 10.15.1 sdk https://chromium-review.googlesource.com/c/chromium/src/+/2238504 * Use newer Xcode version 11.5.0 * update src cache * chore: bump chromium in DEPS to 60a9883e35db3f6f91916f0878e88e1849c17b11 * chore: update patches * Reland "Reland "New toolchain for Windows 10 19041 SDK"" https://chromium-review.googlesource.com/c/chromium/src/+/2255527 * update patches * Convert raw NonClientFrameViews to unique_ptrs https://chromium-review.googlesource.com/c/chromium/src/+/2240417 * [printing] Move PrintHostMsg_DidPreviewDocument_Params to print.mojom https://chromium-review.googlesource.com/c/chromium/src/+/2257035 * chore: bump chromium in DEPS to 12c233c2a85bfa28fb279f390121ba681e52a71b * chore: update patches * Removing oppressive language for the directory chrome/browser/apps https://chromium-review.googlesource.com/c/chromium/src/+/2269822 * Inclusion: rename SpellcheckLanguageBlacklistPolicyHandler https://chromium-review.googlesource.com/c/chromium/src/+/2267646 * Clean up duplicate WebContents "is fullscreen" functions https://chromium-review.googlesource.com/c/chromium/src/+/2275148 * Adds icon loading service with sandbox for Windows. https://chromium-review.googlesource.com/c/chromium/src/+/1987273 * No more Vulkan info collection for UMA on Windows https://chromium-review.googlesource.com/c/chromium/src/+/2252818 * fix lint * chore: update buildflag conditions * chore: bump chromium in DEPS to a837d4c4230ace4f10b2768728f4044b7995dfa5 * update hunspell files * chore: update patches * Make content::FileSelectListener a RefCounted https://chromium-review.googlesource.com/c/chromium/src/+/2275338 * fix build failures on MAS * update patches * fixup! Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" * fix build on windows * Check for GDI exhaustion if window creation fails https://chromium-review.googlesource.com/c/chromium/src/+/2244124 * chore: bump chromium in DEPS to 2c9b2a73be4ef9ec22d8b6da8e174cb80753f125 * chore: update patches * Network Service: Move DeleteCookiePredicate into public folder https://chromium-review.googlesource.com/c/chromium/src/+/2264186 * chore: bump chromium in DEPS to fa2606299bcc02c362528d26b5dcf8c8a0db0735 * chore: bump chromium in DEPS to d9c235d1227204dbae3708daae851573a3566b94 * chore: bump chromium in DEPS to 2f82c284243c035f49a747fd1ead6c44b4b31093 * chore: update patches * Move creating the LayerTreeSettings into blink. https://chromium-review.googlesource.com/c/chromium/src/+/2267720 * chore: bump chromium in DEPS to 914112f1d9af9e4974059dc403da62699a55550f * update patches * chore: bump chromium in DEPS to e0bc1ffae6393fc543a2da94c88167df75859b36 * refactor: match upstream print preview handling (electron#24452) * update patches * chore: bump chromium in DEPS to 0881423156abe084164b51ab58ce93a8bd380524 * update patches * update patches * give a type to pendingPromise * chore: bump chromium in DEPS to 11a8c1534b16d130075d378a64187360ba4e7820 * update patches * 2272609: Move //services/service_manager/sandbox to //sandbox/policy. https://chromium-review.googlesource.com/c/chromium/src/+/2272609 * update patches * fixup! 2272609: Move //services/service_manager/sandbox to //sandbox/policy. * fixup! 2272609: Move //services/service_manager/sandbox to //sandbox/policy. * 2264511: Cookies: Update SetCanonicalCookie to return CookieAccessResult https://chromium-review.googlesource.com/c/chromium/src/+/2264511 * chore: fix setAlwaysOnTop test The window must be visible for state to be updated properly. * Revert "Migrate modules/desktop_capture and modules/video_capture to webrtc::Mutex." https://webrtc-review.googlesource.com/c/src/+/179080 * update patches Co-authored-by: Andy Locascio <[email protected]> Co-authored-by: deepak1556 <[email protected]> Co-authored-by: Samuel Attard <[email protected]> Co-authored-by: John Kleinschmidt <[email protected]> Co-authored-by: Electron Bot <[email protected]> Co-authored-by: Shelley Vohr <[email protected]> Co-authored-by: Jeremy Rose <[email protected]> Co-authored-by: Samuel Attard <[email protected]>
1 parent 36bd940 commit 8bbdc22

File tree

140 files changed

+836
-734
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+836
-734
lines changed

‎.circleci/config.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge
7777

7878
machine-mac: &machine-mac
7979
macos:
80-
xcode: "11.1.0"
80+
xcode: "11.5.0"
8181

8282
machine-mac-large: &machine-mac-large
8383
resource_class: large
8484
macos:
85-
xcode: "11.1.0"
85+
xcode: "11.5.0"
8686

8787
# Build configurations options.
8888
env-testing-build: &env-testing-build
@@ -812,7 +812,7 @@ step-touch-sync-done: &step-touch-sync-done
812812
step-maybe-restore-src-cache: &step-maybe-restore-src-cache
813813
restore_cache:
814814
keys:
815-
- v7-src-cache-{{ checksum "src/electron/.depshash" }}
815+
- v8-src-cache-{{ checksum "src/electron/.depshash" }}
816816
name: Restoring src cache
817817

818818
# Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -890,8 +890,8 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
890890
step-save-src-cache: &step-save-src-cache
891891
save_cache:
892892
paths:
893-
- /portal
894-
key: v7-src-cache-{{ checksum "/portal/src/electron/.depshash" }}
893+
- /var/portal
894+
key: v8-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
895895
name: Persisting src cache
896896

897897
# Check for doc only change
@@ -1019,9 +1019,9 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
10191019
- run:
10201020
name: Move src folder to the cross-OS portal
10211021
command: |
1022-
sudo mkdir -p /portal
1023-
sudo chown -R $(id -u):$(id -g) /portal
1024-
mv ./src /portal
1022+
sudo mkdir -p /var/portal
1023+
sudo chown -R $(id -u):$(id -g) /var/portal
1024+
mv ./src /var/portal
10251025
- *step-save-src-cache
10261026

10271027
steps-electron-gn-check: &steps-electron-gn-check
@@ -1230,16 +1230,16 @@ commands:
12301230
- run:
12311231
name: Prepare for cross-OS sync restore
12321232
command: |
1233-
sudo mkdir -p /portal
1234-
sudo chown -R $(id -u):$(id -g) /portal
1233+
sudo mkdir -p /var/portal
1234+
sudo chown -R $(id -u):$(id -g) /var/portal
12351235
- *step-maybe-restore-src-cache
12361236
- run:
12371237
name: Fix the src cache restore point on macOS
12381238
command: |
1239-
if [ -d "/portal/src" ]; then
1239+
if [ -d "/var/portal/src" ]; then
12401240
echo Relocating Cache
12411241
rm -rf src
1242-
mv /portal/src ./
1242+
mv /var/portal/src ./
12431243
fi
12441244
checkout-from-cache:
12451245
steps:

‎DEPS

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ gclient_gn_args = [
88
'checkout_pgo_profiles',
99
'checkout_oculus_sdk',
1010
'checkout_openxr',
11-
'checkout_google_benchmark'
11+
'checkout_google_benchmark',
12+
'mac_xcode_version',
1213
]
1314

1415
vars = {
1516
'chromium_version':
16-
'9ae03ef8f7d4f6ac663f725bcfe70311987652f3',
17+
'17d931b6d2190fac716f92a66c7578fa4db6501a',
1718
'node_version':
1819
'v12.18.2',
1920
'nan_version':
@@ -54,6 +55,8 @@ vars = {
5455
# Python "requests" module is used for releases only.
5556
'checkout_requests': False,
5657

58+
'mac_xcode_version': 'default',
59+
5760
# To allow running hooks without parsing the DEPS tree
5861
'process_deps': True,
5962

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
version: 1.0.{build}
3131
build_cloud: electron-16-core
32-
image: vs2019bt-16.4.0
32+
image: vs2019bt-16.6.2
3333
environment:
3434
GIT_CACHE_PATH: C:\Users\electron\libcc_cache
3535
ELECTRON_OUT_DIR: Default

‎chromium_src/BUILD.gn

+10-9
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,14 @@ static_library("chrome") {
9393
]
9494
}
9595

96+
if (is_win) {
97+
sources += [
98+
"//chrome/browser/win/icon_reader_service.cc",
99+
"//chrome/browser/win/icon_reader_service.h",
100+
]
101+
public_deps += [ "//chrome/services/util_win:lib" ]
102+
}
103+
96104
if (enable_desktop_capturer) {
97105
sources += [
98106
"//chrome/browser/media/webrtc/desktop_media_list.h",
@@ -153,13 +161,6 @@ static_library("chrome") {
153161
}
154162
}
155163

156-
if (enable_tts) {
157-
sources += [
158-
"//chrome/browser/speech/tts_controller_delegate_impl.cc",
159-
"//chrome/browser/speech/tts_controller_delegate_impl.h",
160-
]
161-
}
162-
163164
if (enable_widevine) {
164165
sources += [
165166
"//chrome/renderer/media/chrome_key_systems.cc",
@@ -364,8 +365,8 @@ source_set("chrome_spellchecker") {
364365
"//chrome/browser/spellchecker/spellcheck_factory.h",
365366
"//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
366367
"//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
367-
"//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
368-
"//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
368+
"//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
369+
"//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
369370
"//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
370371
"//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
371372
"//chrome/browser/spellchecker/spellcheck_service.cc",

‎docs/api/web-contents.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1372,19 +1372,22 @@ An example of `webContents.printToPDF`:
13721372
```javascript
13731373
const { BrowserWindow } = require('electron')
13741374
const fs = require('fs')
1375+
const path = require('path')
1376+
const os = require('os')
13751377

13761378
const win = new BrowserWindow({ width: 800, height: 600 })
13771379
win.loadURL('http://github.com')
13781380

13791381
win.webContents.on('did-finish-load', () => {
13801382
// Use default printing options
13811383
win.webContents.printToPDF({}).then(data => {
1382-
fs.writeFile('/tmp/print.pdf', data, (error) => {
1384+
const pdfPath = path.join(os.homedir(), 'Desktop', 'temp.pdf')
1385+
fs.writeFile(pdfPath, data, (error) => {
13831386
if (error) throw error
1384-
console.log('Write PDF successfully.')
1387+
console.log(`Wrote PDF successfully to ${pdfPath}`)
13851388
})
13861389
}).catch(error => {
1387-
console.log(error)
1390+
console.log(`Failed to write PDF to ${pdfPath}: `, error)
13881391
})
13891392
})
13901393
```

‎electron_strings.grdp

+5
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,9 @@
7575
<message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
7676
en-US,en
7777
</message>
78+
<if expr="is_win">
79+
<message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
80+
Windows Utilities
81+
</message>
82+
</if>
7883
</grit-part>

‎filenames.hunspell.gni

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ hunspell_dictionaries = [
1010
"//third_party/hunspell_dictionaries/en-AU-9-0.bdic",
1111
"//third_party/hunspell_dictionaries/en-CA-9-0.bdic",
1212
"//third_party/hunspell_dictionaries/en-GB-9-0.bdic",
13+
"//third_party/hunspell_dictionaries/en-GB-oxendict-9-0.bdic",
1314
"//third_party/hunspell_dictionaries/en-US-9-0.bdic",
1415
"//third_party/hunspell_dictionaries/es-ES-3-0.bdic",
1516
"//third_party/hunspell_dictionaries/et-EE-3-0.bdic",

‎lib/browser/api/web-contents.ts

+9-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (worldId
225225
};
226226

227227
// Translate the options of printToPDF.
228-
WebContents.prototype.printToPDF = function (options) {
228+
229+
let pendingPromise: Promise<any> | undefined;
230+
WebContents.prototype.printToPDF = async function (options) {
229231
const printSettings = {
230232
...defaultPrintingSetting,
231233
requestID: getNextId()
@@ -358,7 +360,12 @@ WebContents.prototype.printToPDF = function (options) {
358360
// PrinterType enum from //printing/print_job_constants.h
359361
printSettings.printerType = 2;
360362
if (this._printToPDF) {
361-
return this._printToPDF(printSettings);
363+
if (pendingPromise) {
364+
pendingPromise = pendingPromise.then(() => this._printToPDF(printSettings));
365+
} else {
366+
pendingPromise = this._printToPDF(printSettings);
367+
}
368+
return pendingPromise;
362369
} else {
363370
const error = new Error('Printing feature is disabled');
364371
return Promise.reject(error);

‎patches/chromium/.patches

+1-5
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ notification_provenance.patch
4444
content_browser_main_loop.patch
4545
dump_syms.patch
4646
command-ismediakey.patch
47-
tts.patch
4847
printing.patch
4948
support_mixed_sandbox_with_zygote.patch
5049
fix_disable_usage_of_abort_report_np_in_mas_builds.patch
@@ -84,7 +83,6 @@ delay_lock_the_protocol_scheme_registry.patch
8483
gpu_notify_when_dxdiag_request_fails.patch
8584
feat_allow_embedders_to_add_observers_on_created_hunspell.patch
8685
feat_add_onclose_to_messageport.patch
87-
fix_account_for_print_preview_disabled_when_printing_to_pdf.patch
8886
web_contents.patch
8987
ui_gtk_public_header.patch
9088
refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
@@ -95,8 +93,6 @@ breakpad_allow_getting_string_values_for_crash_keys.patch
9593
crash_allow_disabling_compression_on_linux.patch
9694
allow_setting_secondary_label_via_simplemenumodel.patch
9795
disable_unnecessary_ischromefirstrun_check.patch
98-
disable_dcheck_that_fails_with_software_compositing.patch
9996
fix_swap_global_proxies_before_initializing_the_windows_proxies.patch
10097
feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
101-
fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch
102-
remove_menu_window_task_item.patch
98+
use_electron_resources_in_icon_reader_service.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Allows Electron to restore WER when ELECTRON_DEFAULT_ERROR_MODE is set.
1010
This should be upstreamed.
1111

1212
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
13-
index b502af8bb93dd45b5de046850f69ef34f9d04732..a6c84cd7909c6a1c70f3f4b5bd65531bf26f1a94 100644
13+
index 1a2c3b6a910c24b7d124ea1b3180a3c9655580d8..e6795df82114e85cbda78ca89ca0716f963ba180 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
1616
@@ -255,6 +255,10 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -24,7 +24,7 @@ index b502af8bb93dd45b5de046850f69ef34f9d04732..a6c84cd7909c6a1c70f3f4b5bd65531b
2424
// We are experiencing what appear to be memory-stomp issues in the GPU
2525
// process. These issues seem to be impacting the task executor and listeners
2626
// registered to it. Create the task executor on the heap to guard against
27-
@@ -373,7 +377,6 @@ int GpuMain(const MainFunctionParams& parameters) {
27+
@@ -389,7 +393,6 @@ int GpuMain(const MainFunctionParams& parameters) {
2828
}
2929
#endif
3030

‎patches/chromium/add_didinstallconditionalfeatures.patch

+14-14
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DidCreateScriptContext is called, not all JS APIs are available in the
1010
context, which can cause some preload scripts to trip.
1111

1212
diff --git a/content/public/renderer/render_frame_observer.h b/content/public/renderer/render_frame_observer.h
13-
index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307654d42f6 100644
13+
index 3e059605c55d88d52cf2544d6aca3446efee5750..398229becb8fd00022b08cc6afed7d1875766e25 100644
1414
--- a/content/public/renderer/render_frame_observer.h
1515
+++ b/content/public/renderer/render_frame_observer.h
1616
@@ -115,6 +115,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index 4e195f960d7b9bf50f6784ce380a84a10867914f..dbf85ffe8504bdbab1c4c29f085e5307
2323
int32_t world_id) {}
2424
virtual void DidClearWindowObject() {}
2525
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
26-
index 0cb96dd693459a9747aa1e2c46c5257df510211a..010ed22b5da75c445b777bd0db503b268c7a767f 100644
26+
index c9e8e396135befdd67549326daa2ef5c2339f418..1df3376ca5a8fefc926634c197a8bf043a4f3897 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4745,6 +4745,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4796,6 +4796,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index 0cb96dd693459a9747aa1e2c46c5257df510211a..010ed22b5da75c445b777bd0db503b26
4040
int world_id) {
4141
for (auto& observer : observers_)
4242
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
43-
index b1465918040a8eaafd5780aaf9fb6f870c9ea943..2fb7927168ac62c52d2e65942608dd9b73ac3133 100644
43+
index eeac74bc62d6c276d31f714e5a1a024c9ec02838..cf6cfe870b63d675e16fc0e8b80914e19c796ae6 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -722,6 +722,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -738,6 +738,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
bool ShouldTrackUseCounter(const blink::WebURL& url) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -53,10 +53,10 @@ index b1465918040a8eaafd5780aaf9fb6f870c9ea943..2fb7927168ac62c52d2e65942608dd9b
5353
int world_id) override;
5454
void DidChangeScrollOffset() override;
5555
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h
56-
index 902504b8399c53fee972fe5549a4dbd39274a3c8..ddf6b6b696f7d990b7455ac6c9b8156a733b6c07 100644
56+
index 54a40d9a90d1dbb13d8234494ab53893ca339ee4..aee9160cba302b394594debfbc8dd0e400efbb46 100644
5757
--- a/third_party/blink/public/web/web_local_frame_client.h
5858
+++ b/third_party/blink/public/web/web_local_frame_client.h
59-
@@ -542,6 +542,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -546,6 +546,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -67,7 +67,7 @@ index 902504b8399c53fee972fe5549a4dbd39274a3c8..ddf6b6b696f7d990b7455ac6c9b8156a
6767
virtual void WillReleaseScriptContext(v8::Local<v8::Context>,
6868
int32_t world_id) {}
6969
diff --git a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
70-
index 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b385bdc582 100644
70+
index 17ebe5efb8b0bfcf17eda69fe4373b61b213af72..b7296a900c04006812d5f01b05c46a223fb40dc2 100644
7171
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7272
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
7373
@@ -201,6 +201,7 @@ void LocalWindowProxy::Initialize() {
@@ -79,10 +79,10 @@ index 5ac9a7ed3d0f91764452579992471c83104de64f..15ac214bc9177f2fc228cf93c459a7b3
7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
8181
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
82-
index ba02a164a799b2b9e92bbeeb2bff2a4a2fd7d662..42ed050d572b13f1302bfb9eb5b59b15ba5a6904 100644
82+
index c586e0f7c21060f5f6a088631b5b0b9d57fad4eb..fc0fc331ecd535422eeb15bd831d64946edff3b2 100644
8383
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
8484
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.cc
85-
@@ -349,6 +349,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
85+
@@ -391,6 +391,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
8686
web_frame_->Client()->DidCreateScriptContext(context, world_id);
8787
}
8888

@@ -97,7 +97,7 @@ index ba02a164a799b2b9e92bbeeb2bff2a4a2fd7d662..42ed050d572b13f1302bfb9eb5b59b15
9797
v8::Local<v8::Context> context,
9898
int32_t world_id) {
9999
diff --git a/third_party/blink/renderer/core/exported/local_frame_client_impl.h b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
100-
index 183a009cf58399966c9002786ede3d540aa068cb..dbe445cf40ec53e4b36e4a323334662c70359a38 100644
100+
index b21e7f5ba906d13045f38f986677106d35cc1d60..024188a4365261ba47ac200d15d8c0e52eb80a90 100644
101101
--- a/third_party/blink/renderer/core/exported/local_frame_client_impl.h
102102
+++ b/third_party/blink/renderer/core/exported/local_frame_client_impl.h
103103
@@ -78,6 +78,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {
@@ -110,10 +110,10 @@ index 183a009cf58399966c9002786ede3d540aa068cb..dbe445cf40ec53e4b36e4a323334662c
110110
int32_t world_id) override;
111111

112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
113-
index a8443a8bfc2542ffad472206214279c1223d493f..8c7a4dec19d6fbca615b7bc282b0388189eef886 100644
113+
index 4c6f1b9decbc5292d8349816fbac88dfd22b4774..ab28222f6be19cfc78c410633d20dc8646f98a2c 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
116-
@@ -297,6 +297,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
116+
@@ -296,6 +296,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
117117

118118
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
119119
int32_t world_id) = 0;
@@ -123,7 +123,7 @@ index a8443a8bfc2542ffad472206214279c1223d493f..8c7a4dec19d6fbca615b7bc282b03881
123123
int32_t world_id) = 0;
124124
virtual bool AllowScriptExtensions() = 0;
125125
diff --git a/third_party/blink/renderer/core/loader/empty_clients.h b/third_party/blink/renderer/core/loader/empty_clients.h
126-
index a3797ca04ff968d67ce4c5da6b9f17abc1d7651d..e3f26a61cdc4042131ea58d744a9b487dd6f52ca 100644
126+
index 006c575be0f9a33b0a5833b2d5d7bca6ca7fe2b0..d21901198b3b118b153ae2f77d071775c08574d4 100644
127127
--- a/third_party/blink/renderer/core/loader/empty_clients.h
128128
+++ b/third_party/blink/renderer/core/loader/empty_clients.h
129129
@@ -336,6 +336,8 @@ class CORE_EXPORT EmptyLocalFrameClient : public LocalFrameClient {

‎patches/chromium/add_realloc.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ index 2aef366ac8194aa261cbca6abc051f7da8a988d3..3c7d66c81032636abcca4f1538ce9b7f
3939

4040
GIN_EXPORT static ArrayBufferAllocator* SharedInstance();
4141
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
42-
index fa88b2bd0233a4c5ff35a26d10e20fa1b91e33b2..21504ce01403d20067c8439c0c61ee0d71de84a5 100644
42+
index 77724df403e7ec9f1995e62b8737cb1d46ce20b1..244412c9a52ba701b161d1391e5f3cfb73307afc 100644
4343
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
4444
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
4545
@@ -672,6 +672,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {

0 commit comments

Comments
 (0)