X Tutup
Skip to content

Commit b6246dc

Browse files
electron-botnornagon
electron-bot
authored and
nornagon
committed
chore: bump chromium to f5b345dd470f14eef6e44732ccf23 (master) (electron#20649)
1 parent fb8b1fd commit b6246dc

File tree

154 files changed

+1489
-1196
lines changed

Some content is hidden

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

154 files changed

+1489
-1196
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge
6565

6666
machine-mac: &machine-mac
6767
macos:
68-
xcode: "9.4.1"
68+
xcode: "10.3.0"
6969

7070
machine-mac-large: &machine-mac-large
7171
resource_class: large
7272
macos:
73-
xcode: "9.4.1"
73+
xcode: "10.3.0"
7474

7575
# Build configurations options.
7676
env-debug-build: &env-debug-build

‎BUILD.gn‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,10 @@ source_set("electron_lib") {
546546
]
547547

548548
sources += filenames.lib_sources_nss
549+
sources += [
550+
"shell/browser/ui/gtk_util.cc",
551+
"shell/browser/ui/gtk_util.h",
552+
]
549553
}
550554
if (is_win) {
551555
libs += [ "dwmapi.lib" ]
@@ -705,7 +709,6 @@ if (is_mac) {
705709
public_deps += [ "//third_party/icu:icudata" ]
706710
}
707711
if (v8_use_external_startup_data) {
708-
sources += [ "$root_out_dir/natives_blob.bin" ]
709712
public_deps += [ "//v8" ]
710713
if (use_v8_context_snapshot) {
711714
sources += [ "$root_out_dir/v8_context_snapshot.bin" ]

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ gclient_gn_args = [
1111

1212
vars = {
1313
'chromium_version':
14-
'c3a0220e7bde049d599a8332b9b2785b0178be74',
14+
'62521aaefdef5b345dd470f14eef6e44732ccf23',
1515
'node_version':
1616
'v12.13.0',
1717
'nan_version':

‎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: libcc-20
32-
image: vs2017-15.9-10.0.18362
32+
image: vs2019-16.3-10.0.18362
3333
environment:
3434
GIT_CACHE_PATH: C:\Users\electron\libcc_cache
3535
ELECTRON_OUT_DIR: Default

‎build/args/all.gn‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,5 @@ angle_enable_vulkan_validation_layers = false
2121

2222
is_cfi = false
2323

24-
# TODO: Remove this and update CI to contain 10.14 SDK once
25-
# crbug.com/986701 is fixed.
26-
mac_sdk_min = "10.13"
27-
2824
# TODO: disabled due to crashes. re-enable.
2925
enable_osr = false

‎chromium_src/chrome/browser/certificate_manager_model.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
3737
// public and private slot.
3838
// Redirect any slot usage to this persistent slot on Linux.
3939
g_nss_cert_database = new net::NSSCertDatabase(
40-
crypto::ScopedPK11Slot(
41-
crypto::GetPersistentNSSKeySlot()) /* public slot */,
42-
crypto::ScopedPK11Slot(
43-
crypto::GetPersistentNSSKeySlot()) /* private slot */);
40+
crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* public slot */,
41+
crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* private slot */);
4442
}
4543
return g_nss_cert_database;
4644
}

‎docs/tutorial/snapcraft.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ The output should look roughly like this:
6161
├── libgcrypt.so.11
6262
├── libnode.so
6363
├── locales
64-
├── natives_blob.bin
6564
├── resources
6665
├── v8_context_snapshot.bin
6766
└── version

‎docs/tutorial/windows-store-guide.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ The output should look roughly like this:
6262
│   ├── am.pak
6363
│   ├── ar.pak
6464
│   ├── [...]
65-
├── natives_blob.bin
6665
├── node.dll
6766
├── resources
6867
│   ├── app

‎filenames.gni‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ filenames = {
177177
"shell/browser/lib/power_observer.h",
178178
"shell/browser/lib/power_observer_linux.h",
179179
"shell/browser/lib/power_observer_linux.cc",
180+
"shell/browser/linux/unity_service.cc",
181+
"shell/browser/linux/unity_service.h",
180182
"shell/browser/login_handler.cc",
181183
"shell/browser/login_handler.h",
182184
"shell/browser/mac/atom_application.h",
@@ -324,8 +326,6 @@ filenames = {
324326
"shell/browser/ui/file_dialog_gtk.cc",
325327
"shell/browser/ui/file_dialog_mac.mm",
326328
"shell/browser/ui/file_dialog_win.cc",
327-
"shell/browser/ui/util_gtk.cc",
328-
"shell/browser/ui/util_gtk.h",
329329
"shell/browser/ui/inspectable_web_contents.cc",
330330
"shell/browser/ui/inspectable_web_contents.h",
331331
"shell/browser/ui/inspectable_web_contents_delegate.h",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,8 @@ WebContents.prototype.printToPDF = function (options) {
249249

250250
// Chromium expects this in a 0-100 range number, not as float
251251
printingSetting.scaleFactor = Math.ceil(printingSetting.scaleFactor) % 100
252+
// PrinterType enum from //printing/print_job_constants.h
253+
printingSetting.printerType = 2
252254
if (features.isPrintingEnabled()) {
253255
return this._printToPDF(printingSetting)
254256
} else {

0 commit comments

Comments
 (0)
X Tutup