Skip to content

Commit d608a30

Browse files
electron-botlocElectron Botdeepak1556John Kleinschmidt
authored
chore: bump chromium to 85.0.4183.19 (10-x-y) (electron#24299)
* chore: bump chromium in DEPS to 85.0.4182.1 * chore: bump chromium in DEPS to 85.0.4183.2 * chore: bump chromium in DEPS to 85.0.4183.4 * chore: bump chromium in DEPS to 85.0.4183.5 * update patches * chore: bump chromium in DEPS to 85.0.4183.6 * chore: bump chromium in DEPS to 85.0.4183.7 * update patches * chore: bump chromium in DEPS to 85.0.4183.8 * remove chromeos-only TtsControllerDelegate Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2255314 (cherry picked from commit f975f84) * rename GetHighContrastColorScheme -> GetPlatformHighContrastColorScheme Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2250224 (cherry picked from commit 014b487) * add max_xcode_version build var Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2264867 (cherry picked from commit 2c3b94f) * add empty floc blocklist to BrowserProcessImpl Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2240873 (cherry picked from commit 3cdaae1) * Move zygote from //services/service_manager back to //content https://chromium-review.googlesource.com/c/chromium/src/+/2252466 (cherry picked from commit e0d6dbc) * Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" https://chromium-review.googlesource.com/c/chromium/src/+/2264297 (cherry picked from commit 1407040) * Update mas private api patch * Reland "Reland "New toolchain for Windows 10 19041 SDK"" https://chromium-review.googlesource.com/c/chromium/src/+/2255527 (cherry picked from commit 8101d95) * [XProto] Remove usage of Shape extension https://chromium-review.googlesource.com/c/chromium/src/+/2262113 (cherry picked from commit 72b6f11) * chore: bump chromium in DEPS to 85.0.4183.9 * chore: bump chromium in DEPS to 85.0.4183.10 * chore: bump chromium in DEPS to 85.0.4183.11 * chore: bump chromium in DEPS to 85.0.4183.12 * chore: bump chromium in DEPS to 85.0.4183.13 * update patches * fixup! add empty floc blocklist to BrowserProcessImpl (cherry picked from commit 07b0b65) * fixup! Reland "[base] Stop including check.h, notreached.h, etc. in logging.h" (cherry picked from commit f91c1ab) * Check for GDI exhaustion if window creation fails https://chromium-review.googlesource.com/c/chromium/src/+/2244124 (cherry picked from commit 3d45d7b) * chore: bump chromium in DEPS to 85.0.4183.14 * Fixup lint issue * update patches * fix: include missing header file * chore: bump chromium in DEPS to 85.0.4183.19 * update patches * refactor: match upstream print preview handling (electron#24452) (cherry picked from commit 004e29a) * use PrintHostMsg_DidPreviewPage_Params https://chromium-review.googlesource.com/c/chromium/src/+/2257124 Co-authored-by: Andy Locascio <andy@slack-corp.com> Co-authored-by: Electron Bot <anonymous@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent 74efe8d commit d608a30

77 files changed

Lines changed: 482 additions & 410 deletions

File tree

Some content is hidden

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

‎DEPS‎

Lines changed: 5 additions & 2 deletions
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-
'85.0.4181.1',
17+
'85.0.4183.19',
1718
'node_version':
1819
'v12.16.3',
1920
'nan_version':
@@ -51,6 +52,8 @@ vars = {
5152
# Python "requests" module is used for releases only.
5253
'checkout_requests': False,
5354

55+
'mac_xcode_version': 'default',
56+
5457
# To allow running hooks without parsing the DEPS tree
5558
'process_deps': True,
5659

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,13 +161,6 @@ static_library("chrome") {
161161
}
162162
}
163163

164-
if (enable_tts) {
165-
sources += [
166-
"//chrome/browser/speech/tts_controller_delegate_impl.cc",
167-
"//chrome/browser/speech/tts_controller_delegate_impl.h",
168-
]
169-
}
170-
171164
if (enable_widevine) {
172165
sources += [
173166
"//chrome/renderer/media/chrome_key_systems.cc",

‎docs/api/web-contents.md‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,19 +1371,22 @@ An example of `webContents.printToPDF`:
13711371
```javascript
13721372
const { BrowserWindow } = require('electron')
13731373
const fs = require('fs')
1374+
const path = require('path')
1375+
const os = require('os')
13741376

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

13781380
win.webContents.on('did-finish-load', () => {
13791381
// Use default printing options
13801382
win.webContents.printToPDF({}).then(data => {
1381-
fs.writeFile('/tmp/print.pdf', data, (error) => {
1383+
const pdfPath = path.join(os.homedir(), 'Desktop', 'temp.pdf')
1384+
fs.writeFile(pdfPath, data, (error) => {
13821385
if (error) throw error
1383-
console.log('Write PDF successfully.')
1386+
console.log(`Wrote PDF successfully to ${pdfPath}`)
13841387
})
13851388
}).catch(error => {
1386-
console.log(error)
1389+
console.log(`Failed to write PDF to ${pdfPath}: `, error)
13871390
})
13881391
})
13891392
```

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,9 @@ WebContents.prototype.executeJavaScriptInIsolatedWorld = async function (code, h
215215
};
216216

217217
// Translate the options of printToPDF.
218-
WebContents.prototype.printToPDF = function (options) {
218+
219+
let pendingPromise;
220+
WebContents.prototype.printToPDF = async function (options) {
219221
const printSettings = {
220222
...defaultPrintingSetting,
221223
requestID: getNextId()
@@ -341,7 +343,12 @@ WebContents.prototype.printToPDF = function (options) {
341343
// PrinterType enum from //printing/print_job_constants.h
342344
printSettings.printerType = 2;
343345
if (this._printToPDF) {
344-
return this._printToPDF(printSettings);
346+
if (pendingPromise) {
347+
pendingPromise = pendingPromise.then(() => this._printToPDF(printSettings));
348+
} else {
349+
pendingPromise = this._printToPDF(printSettings);
350+
}
351+
return pendingPromise;
345352
} else {
346353
const error = new Error('Printing feature is disabled');
347354
return Promise.reject(error);

‎patches/chromium/.patches‎

Lines changed: 1 addition & 5 deletions
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
crash_allow_setting_more_options.patch
@@ -96,7 +94,5 @@ fix_swap_global_proxies_before_initializing_the_windows_proxies.patch
9694
allow_setting_secondary_label_via_simplemenumodel.patch
9795
refactor_expose_cursor_changes_to_the_webcontentsobserver.patch
9896
disable_unnecessary_ischromefirstrun_check.patch
99-
disable_dcheck_that_fails_with_software_compositing.patch
100-
fix_handling_non_client_pointer_events_from_pen_on_windows_10.patch
101-
remove_menu_window_task_item.patch
10297
use_electron_resources_in_icon_reader_service.patch
98+
fix_include_missing_header_file.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 2 additions & 2 deletions
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 82f55455fe365f54bdc3eefac8bd538af13f642d..5da552f02472299e09bc33c5ab0aa184b62953a4 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‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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 5586d724ef30e8183787c1cbba21fe9741d587c5..a5a95523e16fd35018f9646ae4a4d51e5ca626c0 100644
26+
index 74e98485b4646b5e91ff2c15e85d85205df2851c..55af1205b90a1fce035a6b7abf1797fe20ea1f7b 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4735,6 +4735,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4741,6 +4741,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index 5586d724ef30e8183787c1cbba21fe9741d587c5..a5a95523e16fd35018f9646ae4a4d51e
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 745610204f08a39912b92f8b8ba9028465c9c57f..ddc571fbec08a38ada5c84acdadd618f1b349bed 100644
43+
index c6d8de45561cbcb6beeb6a28ce0517587b72a030..aef52b00d00392490d43cf7b7ef96ebad7b227e4 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -721,6 +721,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -719,6 +719,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 745610204f08a39912b92f8b8ba9028465c9c57f..ddc571fbec08a38ada5c84acdadd618f
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 f0a05ead42b7a5eb70fc4e5cae13710391f14b5c..b1bbdcf6f69128b9943001a2b64e8a92e5148ab1 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+
@@ -550,6 +550,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -79,7 +79,7 @@ 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 f9d867fb84e544a2705d22c9fef1f04e639c052b..9b26988f4c7dd96269fd44c57dc9632f47ec409f 100644
82+
index adc00866f436b59bd50881949379014222d71a50..71631b77c13ea1e6e8a4f558ef5ac5a09886218d 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
8585
@@ -363,6 +363,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -97,7 +97,7 @@ index f9d867fb84e544a2705d22c9fef1f04e639c052b..9b26988f4c7dd96269fd44c57dc9632f
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 23a196c72164b41bfff97d105957889cce3a7fbe..c702d1dc09b5026ab77a0ba8ec03c4d0cc7c2d67 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,7 +110,7 @@ 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 27ab3b3056c81ca367f45e0a1f7bd74a153353c4..790f7fac77677aad8c1d69c287273a9bf9436ac2 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
116116
@@ -297,6 +297,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {

‎patches/chromium/add_trustedauthclient_to_urlloaderfactory.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,18 @@ index 6d15b6b5ff7b36b85f6b8200b76a32b285f0e675..c21234572976a6de7db5b0f2f7f44ec7
4949
// the per-context allow patterns that is managed via NetworkContext
5050
// interface. This still respects the per-context block lists.
5151
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
52-
index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fbd24e112d 100644
52+
index 628b38e9db47f9730aebd5dfe9c785ceea28ea0a..6007a8f2d350b8951ba5f2ce910813f044bcf381 100644
5353
--- a/services/network/url_loader.cc
5454
+++ b/services/network/url_loader.cc
55-
@@ -437,6 +437,7 @@ URLLoader::URLLoader(
55+
@@ -470,6 +470,7 @@ URLLoader::URLLoader(
5656
base::WeakPtr<KeepaliveStatisticsRecorder> keepalive_statistics_recorder,
5757
base::WeakPtr<NetworkUsageAccumulator> network_usage_accumulator,
5858
mojom::TrustedURLLoaderHeaderClient* url_loader_header_client,
5959
+ mojom::TrustedURLLoaderAuthClient* url_loader_auth_client,
6060
mojom::OriginPolicyManager* origin_policy_manager,
6161
std::unique_ptr<TrustTokenRequestHelperFactory> trust_token_helper_factory,
6262
mojo::PendingRemote<mojom::CookieAccessObserver> cookie_observer)
63-
@@ -497,6 +498,11 @@ URLLoader::URLLoader(
63+
@@ -533,6 +534,11 @@ URLLoader::URLLoader(
6464
header_client_.set_disconnect_handler(
6565
base::BindOnce(&URLLoader::OnMojoDisconnect, base::Unretained(this)));
6666
}
@@ -72,7 +72,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb
7272
if (want_raw_headers_) {
7373
options_ |= mojom::kURLLoadOptionSendSSLInfoWithResponse |
7474
mojom::kURLLoadOptionSendSSLInfoForCertificateError;
75-
@@ -1016,7 +1022,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
75+
@@ -1056,7 +1062,7 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
7676
// |this| may have been deleted.
7777
return;
7878
}
@@ -81,7 +81,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb
8181
OnAuthCredentials(base::nullopt);
8282
return;
8383
}
84-
@@ -1032,11 +1038,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
84+
@@ -1072,11 +1078,20 @@ void URLLoader::OnAuthRequired(net::URLRequest* url_request,
8585
if (url_request->response_headers())
8686
head->headers = url_request->response_headers();
8787
head->auth_challenge_info = auth_info;
@@ -108,7 +108,7 @@ index 80dc1f91fd4051dc054f1c9e9a5ab0087c4d66fd..4eec90182ae4944f219e12ff2673d0fb
108108
auth_challenge_responder_receiver_.set_disconnect_handler(
109109
base::BindOnce(&URLLoader::DeleteSelf, base::Unretained(this)));
110110
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
111-
index f5436f10a312c713e95fac4670eab3edf048a742..02212de14459ee6cd15492e7b35cd2791f48205c 100644
111+
index 33e6b100ef3ebfea62a9445bb8aa4b45034f7f25..b70780428d056e5306e215ba7d86a2e729ffaeda 100644
112112
--- a/services/network/url_loader.h
113113
+++ b/services/network/url_loader.h
114114
@@ -115,6 +115,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader

‎patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ Subject: allow new privileges in unsandboxed child processes
66
This allows unsandboxed renderers to launch setuid processes on Linux.
77

88
diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc
9-
index e53e60ef146f8024e503f9ffad663a4d2dbc4f80..cee204cf6447c4b2a8cfd9c4ca257fe46af3e2e9 100644
9+
index e63dfcf43147c7174942277b2c129675014c9e59..7121ec638809c5964d22af496559cb7f46c794ef 100644
1010
--- a/content/browser/child_process_launcher_helper_linux.cc
1111
+++ b/content/browser/child_process_launcher_helper_linux.cc
12-
@@ -54,6 +54,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
12+
@@ -53,6 +53,18 @@ bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread(
13+
if (GetProcessType() == switches::kRendererProcess) {
1314
const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket();
14-
options->fds_to_remap.push_back(
15-
std::make_pair(sandbox_fd, service_manager::GetSandboxFD()));
15+
options->fds_to_remap.push_back(std::make_pair(sandbox_fd, GetSandboxFD()));
1616
+
1717
+ // (For Electron), if we're launching without zygote, that means we're
1818
+ // launching an unsandboxed process (since all sandboxed processes are
1919
+ // forked from the zygote). Relax the allow_new_privs option to permit
2020
+ // launching suid processes from unsandboxed renderers.
21-
+ service_manager::ZygoteHandle zygote_handle =
21+
+ ZygoteHandle zygote_handle =
2222
+ base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
2323
+ ? nullptr
2424
+ : delegate_->GetZygote();

0 commit comments

Comments
 (0)