Skip to content

Commit eb2d226

Browse files
electron-botnornagon
electron-bot
authored and
nornagon
committed
chore: bump chromium to 63be48daea281d4f8c834c2e707a7 (master) (electron#19923)
1 parent 104088b commit eb2d226

File tree

124 files changed

+1736
-1410
lines changed

Some content is hidden

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

124 files changed

+1736
-1410
lines changed

‎DEPS‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ gclient_gn_args = [
55
'checkout_android_native_support',
66
'checkout_libaom',
77
'checkout_nacl',
8-
'checkout_oculus_sdk'
8+
'checkout_oculus_sdk',
9+
'checkout_openxr'
910
]
1011

1112
vars = {
1213
'chromium_version':
13-
'62327c655093c821aa0fcfc6db53f5fd943e08c7',
14+
'af5e1805f244bb71328690460ddd3d48ef3b1eca',
1415
'node_version':
1516
'v12.9.1',
1617
'nan_version':
@@ -60,6 +61,8 @@ vars = {
6061
True,
6162
'checkout_oculus_sdk':
6263
False,
64+
'checkout_openxr':
65+
False,
6366
'build_with_chromium':
6467
True,
6568
'checkout_android':

‎build/args/all.gn‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ is_cfi = false
2424
# TODO: Remove this and update CI to contain 10.14 SDK once
2525
# crbug.com/986701 is fixed.
2626
mac_sdk_min = "10.13"
27+
28+
# TODO: disabled due to crashes. re-enable.
29+
enable_osr = false

‎chromium_src/BUILD.gn‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ static_library("chrome") {
135135
sources += [
136136
"//chrome/browser/speech/tts_controller_delegate_impl.cc",
137137
"//chrome/browser/speech/tts_controller_delegate_impl.h",
138-
"//chrome/browser/speech/tts_message_filter.cc",
139-
"//chrome/browser/speech/tts_message_filter.h",
140-
"//chrome/renderer/tts_dispatcher.cc",
141-
"//chrome/renderer/tts_dispatcher.h",
142138
]
143139
}
144140

@@ -202,8 +198,6 @@ static_library("chrome") {
202198
"//chrome/browser/ui/views/overlay/back_to_tab_image_button.h",
203199
"//chrome/browser/ui/views/overlay/close_image_button.cc",
204200
"//chrome/browser/ui/views/overlay/close_image_button.h",
205-
"//chrome/browser/ui/views/overlay/mute_image_button.cc",
206-
"//chrome/browser/ui/views/overlay/mute_image_button.h",
207201
"//chrome/browser/ui/views/overlay/overlay_window_views.cc",
208202
"//chrome/browser/ui/views/overlay/overlay_window_views.h",
209203
"//chrome/browser/ui/views/overlay/playback_image_button.cc",

‎chromium_src/chrome/browser/certificate_manager_model.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
7373
void CertificateManagerModel::Create(content::BrowserContext* browser_context,
7474
const CreationCallback& callback) {
7575
DCHECK_CURRENTLY_ON(BrowserThread::UI);
76-
base::PostTaskWithTraits(
76+
base::PostTask(
7777
FROM_HERE, {BrowserThread::IO},
7878
base::BindOnce(&CertificateManagerModel::GetCertDBOnIOThread,
7979
browser_context->GetResourceContext(), callback));
@@ -146,7 +146,7 @@ void CertificateManagerModel::DidGetCertDBOnIOThread(
146146
DCHECK_CURRENTLY_ON(BrowserThread::IO);
147147

148148
bool is_user_db_available = !!cert_db->GetPublicSlot();
149-
base::PostTaskWithTraits(
149+
base::PostTask(
150150
FROM_HERE, {BrowserThread::UI},
151151
base::BindOnce(&CertificateManagerModel::DidGetCertDBOnUIThread, cert_db,
152152
is_user_db_available, callback));

‎chromium_src/chrome/browser/process_singleton_posix.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ void ProcessSingleton::LinuxWatcher::SocketReader::FinishWithACK(
705705
if (shutdown(fd_, SHUT_WR) < 0)
706706
PLOG(ERROR) << "shutdown() failed";
707707

708-
base::PostTaskWithTraits(
708+
base::PostTask(
709709
FROM_HERE, {BrowserThread::IO},
710710
base::BindOnce(&ProcessSingleton::LinuxWatcher::RemoveSocketReader,
711711
parent_, this));
@@ -885,10 +885,9 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
885885

886886
void ProcessSingleton::StartListeningOnSocket() {
887887
watcher_ = new LinuxWatcher(this);
888-
base::PostTaskWithTraits(
889-
FROM_HERE, {BrowserThread::IO},
890-
base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening, watcher_,
891-
sock_));
888+
base::PostTask(FROM_HERE, {BrowserThread::IO},
889+
base::BindOnce(&ProcessSingleton::LinuxWatcher::StartListening,
890+
watcher_, sock_));
892891
}
893892

894893
void ProcessSingleton::OnBrowserReady() {

‎components/pepper_flash/BUILD.gn‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ component("pepper_flash") {
5454
"//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
5555
"//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
5656
]
57+
libs = [ "CoreGraphics.framework" ]
5758
}
5859
if (is_linux) {
5960
deps += [ "//components/services/font/public/cpp" ]

‎patches/chromium/.patches‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ mas-cgdisplayusesforcetogray.patch
3636
mas-audiodeviceduck.patch
3737
mas-lssetapplicationlaunchservicesserverconnectionstatus.patch
3838
ignore_rc_check.patch
39-
enable_widevine.patch
4039
chrome_key_systems.patch
4140
allow_nested_error_trackers.patch
4241
blink_initialization_order.patch
@@ -62,7 +61,6 @@ unsandboxed_ppapi_processes_skip_zygote.patch
6261
patch_the_ensure_gn_version_py_script_to_work_on_mac_ci.patch
6362
build_add_electron_tracing_category.patch
6463
disable_custom_libcxx_on_windows.patch
65-
feat_offscreen_rendering_with_viz_compositor.patch
6664
worker_context_will_destroy.patch
6765
fix_breakpad_symbol_generation_on_linux_arm.patch
6866
frame_host_manager.patch
@@ -78,3 +76,5 @@ disable_compositor_recycling.patch
7876
allow_new_privileges_in_unsandboxed_child_processes.patch
7977
expose_setuseragent_on_networkcontext.patch
8078
feat_add_set_theme_source_to_allow_apps_to.patch
79+
revert_cleanup_remove_menu_subtitles_sublabels.patch
80+
ui_views_fix_jumbo_build.patch

‎patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch‎

Lines changed: 1 addition & 1 deletion
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 46d92835eadd6429ea0c6a53c5a39ff04f1c2634..1b99a1e601f4226280cdf1382af555b4d61b92fa 100644
13+
index 4373f508964cb1e9fd51c952122ac2f41fb35ae9..065a7a57b77f1e3bf5e03fac900f1936d48ad4ff 100644
1414
--- a/content/gpu/gpu_main.cc
1515
+++ b/content/gpu/gpu_main.cc
1616
@@ -236,6 +236,10 @@ int GpuMain(const MainFunctionParams& parameters) {

‎patches/chromium/add_realloc.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ 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 7ca876bc7f2afa192167f0689690d73d5a420c60..d58085e0b14241d666f533cb23dd89159c27d8b2 100644
42+
index 3eeafca490b1fbbedc2c16f203a4ac28b23da675..fee684296357c2c3af7395bdd17ac8b8445f55c4 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
45-
@@ -642,6 +642,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
45+
@@ -647,6 +647,10 @@ class ArrayBufferAllocator : public v8::ArrayBuffer::Allocator {
4646
size, WTF::ArrayBufferContents::kDontInitialize);
4747
}
4848

@@ -70,7 +70,7 @@ index ac76d127b96b80c8260a7e2cda0b669cd98787ad..dcab64586700a8740262aede8dba2755
7070
Partitions::ArrayBufferPartition()->Free(data);
7171
}
7272
diff --git a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
73-
index ee7c89a4950d6b3c97a810c41a62fee7e372018d..c2b60f20a72cca46d05af369f33d9c19395b34ef 100644
73+
index 3f44cd2fdf648057be8defcf041574b4c91e0363..55c0e7c66649ae9d9cbef6179daac7ad771b755c 100644
7474
--- a/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
7575
+++ b/third_party/blink/renderer/platform/wtf/typed_arrays/array_buffer_contents.h
7676
@@ -140,6 +140,7 @@ class WTF_EXPORT ArrayBufferContents {

‎patches/chromium/blink_initialization_order.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ to fix electron/electron#13787. The backport landed in Chromium 67 but the
1010
DidCreateScriptContext re-ordering needs to be upstreamed or kept indefinitely
1111

1212
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
13-
index c0ec993ca6d96c5f95eb7b918ca9c37d9defff43..2522add8f9b1e3ada14fcc5c09d161b0820f4418 100644
13+
index 8331c466ac9ae91d79c32f17b815f048c7e30a8b..e066abfc3341ff620191116d87ff0e135cdf43e7 100644
1414
--- a/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
1515
+++ b/third_party/blink/renderer/bindings/core/v8/local_window_proxy.cc
1616
@@ -205,11 +205,10 @@ void LocalWindowProxy::Initialize() {
@@ -24,5 +24,5 @@ index c0ec993ca6d96c5f95eb7b918ca9c37d9defff43..2522add8f9b1e3ada14fcc5c09d161b0
2424
- InstallConditionalFeatures();
2525
-
2626
// This needs to go after everything else since it accesses the window object.
27+
// WARNING: May modify the global object!
2728
InitializeV8ExtrasBinding(script_state_);
28-

0 commit comments

Comments
 (0)