X Tutup
Skip to content

Commit a518e4b

Browse files
electron-roller[bot]patchup[bot]ckerr
authored
chore: bump chromium to 93.0.4552.0 (main) (electron#29862)
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
1 parent f9bfd1d commit a518e4b

File tree

35 files changed

+89
-87
lines changed

35 files changed

+89
-87
lines changed

‎.circleci/config.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
452452
# Fix Clang Install (wrong binary)
453453
rm -rf src/third_party/llvm-build
454454
python src/tools/clang/scripts/update.py
455-
python src/tools/clang/scripts/update.py --package=lld_mac
456455
fi
457456
458457
step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac

‎DEPS‎

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

1616
vars = {
1717
'chromium_version':
18-
'93.0.4550.0',
18+
'93.0.4552.0',
1919
'node_version':
2020
'v16.2.0',
2121
'nan_version':

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ index e24c169444c699f295de2c1f1f42683eeca73436..4675cdccb1876a318a9a0253cdf552bb
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 ba2e26d366595f4918f294db3471346ae393bd08..8818e803bc10c3032ecbf582df49dd37487f137d 100644
26+
index 4d78d4f667e6068ba98bc4044ee6437a5afab15b..8602f563a6de20fb5feb7aaac12a7a99adac088e 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4254,6 +4254,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4310,6 +4310,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,7 +40,7 @@ index ba2e26d366595f4918f294db3471346ae393bd08..8818e803bc10c3032ecbf582df49dd37
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 1e7e47992ea4b244025ab5b21d21ea6c2aeea49e..0efbe970cdc0191155c61e0c8baad74a5833f527 100644
43+
index 578da3c68bca81ebd7d14023571655946aaa99bc..dbbaf8eed62b7e4b57894b96b0321c5a78a498b4 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
4646
@@ -583,6 +583,8 @@ class CONTENT_EXPORT RenderFrameImpl

‎patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ index 04906f28c8e03f1692690713b2ca5c9e3b188236..c4e453bb2dfa1857e73ac4dcc1e202e7
8585
// Visibility -----------------------------------------------------------
8686

8787
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
88-
index 698667e16c8d497ef8ebe8387e1d947e755afa1b..f66fac88796852de406f26dcfeff667acebd8326 100644
88+
index c91848389bebee7e25e8243f1490e1fff6db638a..d0f12dd329ac67e635ce39601b9939ffceddc0c0 100644
8989
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
9090
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
91-
@@ -3575,6 +3575,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
91+
@@ -3577,6 +3577,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
9292
return GetPage()->GetPageScheduler();
9393
}
9494

@@ -102,7 +102,7 @@ index 698667e16c8d497ef8ebe8387e1d947e755afa1b..f66fac88796852de406f26dcfeff667a
102102
void WebViewImpl::SetVisibilityState(
103103
mojom::blink::PageVisibilityState visibility_state,
104104
bool is_initial_state) {
105-
@@ -3586,7 +3593,8 @@ void WebViewImpl::SetVisibilityState(
105+
@@ -3588,7 +3595,8 @@ void WebViewImpl::SetVisibilityState(
106106
}
107107
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
108108
GetPage()->GetPageScheduler()->SetPageVisible(

‎patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ index 8a1315f7f89588bb21c6d3c21a7de7c07fed9679..51cc790f7e1ba1440a6ffaa56c9e0168
3535
accelerated_video_decode_enabled(false),
3636
animation_policy(
3737
diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
38-
index 0fbfd605edf37e63740a82ff231789c1759c909a..33ef6c435e660a4ec161dd7e1ac353d0aa5582b6 100644
38+
index c6b92861449ffd929b03971fb62efc18305eb1fe..ce78fe29ab799944c2c3d7b41a0c44b970b11d05 100644
3939
--- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
4040
+++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
4141
@@ -23,6 +23,10 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
@@ -49,7 +49,7 @@ index 0fbfd605edf37e63740a82ff231789c1759c909a..33ef6c435e660a4ec161dd7e1ac353d0
4949
!data.ReadLazyFrameLoadingDistanceThresholdsPx(
5050
&out->lazy_frame_loading_distance_thresholds_px) ||
5151
!data.ReadLazyImageLoadingDistanceThresholdsPx(
52-
@@ -153,6 +157,21 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
52+
@@ -155,6 +159,21 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
5353
data.fake_no_alloc_direct_call_for_testing_enabled();
5454
out->v8_cache_options = data.v8_cache_options();
5555
out->record_whole_document = data.record_whole_document();
@@ -72,7 +72,7 @@ index 0fbfd605edf37e63740a82ff231789c1759c909a..33ef6c435e660a4ec161dd7e1ac353d0
7272
out->accelerated_video_decode_enabled =
7373
data.accelerated_video_decode_enabled();
7474
diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
75-
index 8a8bc79a2e9dbc78830528cee8883bb8d65fe51f..1be461b65302bd7eda42547e8062ce28cc4abb77 100644
75+
index 4517bf43c1b80f1aa0f3ba8e67e78b8b91e19f8a..492f6c948af74bb925826a1075e6343f147f0eb2 100644
7676
--- a/third_party/blink/public/common/web_preferences/web_preferences.h
7777
+++ b/third_party/blink/public/common/web_preferences/web_preferences.h
7878
@@ -10,6 +10,7 @@
@@ -83,7 +83,7 @@ index 8a8bc79a2e9dbc78830528cee8883bb8d65fe51f..1be461b65302bd7eda42547e8062ce28
8383
#include "net/nqe/effective_connection_type.h"
8484
#include "third_party/blink/public/common/common_export.h"
8585
#include "third_party/blink/public/mojom/css/preferred_color_scheme.mojom-shared.h"
86-
@@ -161,6 +162,24 @@ struct BLINK_COMMON_EXPORT WebPreferences {
86+
@@ -162,6 +163,24 @@ struct BLINK_COMMON_EXPORT WebPreferences {
8787
blink::mojom::V8CacheOptions v8_cache_options;
8888
bool record_whole_document;
8989

@@ -109,7 +109,7 @@ index 8a8bc79a2e9dbc78830528cee8883bb8d65fe51f..1be461b65302bd7eda42547e8062ce28
109109
// only controls whether or not the "document.cookie" field is properly
110110
// connected to the backing store, for instance if you wanted to be able to
111111
diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
112-
index 90a2bb1a13afd749b540545fff22ba2134917b5d..609ae3c04bd52ac837401de35b70e4b01dce72d1 100644
112+
index 0313bac28edf43e84c6e914f85af75fb541bb7ea..6eedfe15cc02b3c1ee531a94d77f8d4e04feb11f 100644
113113
--- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
114114
+++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
115115
@@ -6,6 +6,7 @@
@@ -190,18 +190,18 @@ index 90a2bb1a13afd749b540545fff22ba2134917b5d..609ae3c04bd52ac837401de35b70e4b0
190190
return r.cookie_enabled;
191191
}
192192
diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
193-
index db9994ca72f244d6e626d8793ec0cc181a582ea4..ff254afea1a871c075a59bcef1ae079441318737 100644
193+
index 121ea7b186d6cadc0d3a9ebbca64ca9a1563e8f2..a0c29218cf5196a248dc93e76d5a50a242fb0a9c 100644
194194
--- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
195195
+++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
196-
@@ -9,6 +9,7 @@ import "third_party/blink/public/mojom/css/preferred_contrast.mojom";
197-
import "third_party/blink/public/mojom/v8_cache_options.mojom";
196+
@@ -10,6 +10,7 @@ import "third_party/blink/public/mojom/v8_cache_options.mojom";
198197
import "url/mojom/url.mojom";
198+
import "url/mojom/origin.mojom";
199199
import "mojo/public/mojom/base/string16.mojom";
200200
+import "mojo/public/mojom/base/file_path.mojom";
201201

202202
enum PointerType {
203203
kPointerNone = 1, // 1 << 0
204-
@@ -212,6 +213,24 @@ struct WebPreferences {
204+
@@ -213,6 +214,24 @@ struct WebPreferences {
205205
V8CacheOptions v8_cache_options;
206206
bool record_whole_document;
207207

‎patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index 72567c45bafd90556c133b594053f18c45265da0..ee2b95656d1bc1dc37d9bbf0ad2e9c21
3333
"//base",
3434
"//build:branding_buildflags",
3535
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
36-
index b1f4b2d531eb6b60fb47fc533ea550b0755acaae..93985806e21d355e7aa716cd682b24d19c5079c6 100644
36+
index cb21679be696a3e657dcc81c5ac2c7e2ca492481..15e2df00e3be64ad3be1e2664c04b0ee82d02f76 100644
3737
--- a/chrome/browser/BUILD.gn
3838
+++ b/chrome/browser/BUILD.gn
39-
@@ -4292,7 +4292,7 @@ static_library("browser") {
39+
@@ -4286,7 +4286,7 @@ static_library("browser") {
4040

4141
# On Windows, the hashes are embedded in //chrome:chrome_initial rather
4242
# than here in :chrome_dll.
@@ -46,7 +46,7 @@ index b1f4b2d531eb6b60fb47fc533ea550b0755acaae..93985806e21d355e7aa716cd682b24d1
4646
}
4747

4848
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
49-
index 897f3a5896b1d8b5a4e3fbda47767c80376f6725..407d55f03fe90feadb2a49345438795db6f701ad 100644
49+
index 9f662133dcf029d2f2805b2fbfc2df2fa977e4be..c52362df8b3a729459b0aa13798d55c4f5225439 100644
5050
--- a/chrome/test/BUILD.gn
5151
+++ b/chrome/test/BUILD.gn
5252
@@ -5218,7 +5218,6 @@ test("unit_tests") {
@@ -70,15 +70,15 @@ index 897f3a5896b1d8b5a4e3fbda47767c80376f6725..407d55f03fe90feadb2a49345438795d
7070
}
7171

7272
if (is_win || is_chromeos_ash || is_mac) {
73-
@@ -5790,7 +5795,6 @@ test("unit_tests") {
73+
@@ -5792,7 +5797,6 @@ test("unit_tests") {
7474
}
7575

7676
deps += [
7777
- "//chrome:packed_resources_integrity_hash",
7878
"//chrome/browser:cart_db_content_proto",
7979
"//chrome/browser/media/router:test_support",
8080
"//chrome/browser/promo_browser_command:mojo_bindings",
81-
@@ -5825,6 +5829,9 @@ test("unit_tests") {
81+
@@ -5827,6 +5831,9 @@ test("unit_tests") {
8282
"//ui/color:test_support",
8383
"//ui/native_theme:test_support",
8484
]

‎patches/chromium/can_create_window.patch‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
99
TODO(loc): this patch is currently broken.
1010

1111
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
12-
index 88b7b88dddb93ebd684f6c3d166cfaf5fcedd692..33d91dd924f90dc4b2f697b2d0260bb64f32a88e 100644
12+
index f050e8863b2412242cb4cd025444abcc1ad85889..f9f15b4b95208cbd9ff0269c882ac4b4b80e4125 100644
1313
--- a/content/browser/renderer_host/render_frame_host_impl.cc
1414
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
15-
@@ -6004,6 +6004,7 @@ void RenderFrameHostImpl::CreateNewWindow(
15+
@@ -6082,6 +6082,7 @@ void RenderFrameHostImpl::CreateNewWindow(
1616
last_committed_origin_, params->window_container_type,
1717
params->target_url, params->referrer.To<Referrer>(),
1818
params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index 88b7b88dddb93ebd684f6c3d166cfaf5fcedd692..33d91dd924f90dc4b2f697b2d0260bb6
2121
&no_javascript_access);
2222

2323
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
24-
index b78bca867ef48fcc35f8057ca304abfda4f5a60b..e72c930a9498e270bf5358c4358d1417d609e020 100644
24+
index 8b51334cfaff6f8b2de5c969c01c0dfec6e381c3..9fa5062a0eb8754c1a3e560a8d0bcd3098bcdb2e 100644
2525
--- a/content/browser/web_contents/web_contents_impl.cc
2626
+++ b/content/browser/web_contents/web_contents_impl.cc
27-
@@ -3778,6 +3778,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
27+
@@ -3788,6 +3788,14 @@ FrameTree* WebContentsImpl::CreateNewWindow(
2828
}
2929
auto* new_contents_impl = new_contents.get();
3030

@@ -39,7 +39,7 @@ index b78bca867ef48fcc35f8057ca304abfda4f5a60b..e72c930a9498e270bf5358c4358d1417
3939
new_contents_impl->GetController().SetSessionStorageNamespace(
4040
partition_id, session_storage_namespace);
4141

42-
@@ -3820,12 +3828,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
42+
@@ -3830,12 +3838,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
4343
AddWebContentsDestructionObserver(new_contents_impl);
4444
}
4545

@@ -53,10 +53,10 @@ index b78bca867ef48fcc35f8057ca304abfda4f5a60b..e72c930a9498e270bf5358c4358d1417
5353
new_contents_impl, opener, params.target_url,
5454
params.referrer.To<Referrer>(), params.disposition,
5555
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
56-
index 3c10f5324b8df4be8042a3620e7f291773da5766..9e89cc88789dd0c8677de826cd6b3e2a6e1cb8a0 100644
56+
index a61f273506fecd8574ffd0bb04d507adef7859c8..3a4a6efca3a66b12409da15e4f360fb8e3a40e2c 100644
5757
--- a/content/common/frame.mojom
5858
+++ b/content/common/frame.mojom
59-
@@ -472,6 +472,10 @@ struct CreateNewWindowParams {
59+
@@ -519,6 +519,10 @@ struct CreateNewWindowParams {
6060
// The impression associated with the navigation in the new window, if
6161
// one is specified.
6262
Impression? impression;

‎patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ index c5c5a7b63b5b3b62a9517cbef3ae23ce57a3c89c..4f1b7e88d6d2ae89a60311c8aeb1fcee
264264
void AddNewContents(content::WebContents* source,
265265
std::unique_ptr<content::WebContents> new_contents,
266266
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
267-
index 3a34697962cf2c1a8ed642a025cdf021069a9f8a..d4fd305ca812c071521e5508e4f6d59549acf91a 100644
267+
index f9efbea691c72a2c34ae54ef7e40b7e995e37514..86136d3222d7d5f66fe797ba274ef3c5a7e49306 100644
268268
--- a/content/browser/web_contents/web_contents_impl.cc
269269
+++ b/content/browser/web_contents/web_contents_impl.cc
270-
@@ -3726,8 +3726,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
270+
@@ -3736,8 +3736,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
271271

272272
if (delegate_ && delegate_->IsWebContentsCreationOverridden(
273273
source_site_instance, params.window_container_type,

‎patches/chromium/chore_use_electron_resources_not_chrome_for_spellchecker.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ spellchecker uses a few IDS_ resources. We need to load these from
77
Electrons grit header instead of Chromes
88

99
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
10-
index f5b3b0e69cfad80ad518155ec53719f05dee8084..b1f4b2d531eb6b60fb47fc533ea550b0755acaae 100644
10+
index a8a8bb73214a6b81f899fd8a024c76e50bfea3ff..cb21679be696a3e657dcc81c5ac2c7e2ca492481 100644
1111
--- a/chrome/browser/BUILD.gn
1212
+++ b/chrome/browser/BUILD.gn
13-
@@ -6425,6 +6425,7 @@ static_library("browser") {
13+
@@ -6438,6 +6438,7 @@ static_library("browser") {
1414
deps += [
1515
"//components/spellcheck/browser",
1616
"//components/spellcheck/common",

‎patches/chromium/disable_color_correct_rendering.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ index d828f1dfe25326854b68f7f6957702a6b7ba5e36..2df7e9ea219997503f5574307dd721c3
241241
sandbox::policy::switches::kGpuSandboxAllowSysVShm,
242242
sandbox::policy::switches::kGpuSandboxFailuresFatal,
243243
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
244-
index 6e3fd9b9fc420dc55951b9e3405dacf97f350369..d0a973b468970e20150aa6d53da59aa67302c2bf 100644
244+
index 85e3dd76f528b3e60b86bef6a9231135ef2bc0f5..922e8e30a2918ef99dc53fc9124d56916d57ea5e 100644
245245
--- a/content/browser/renderer_host/render_process_host_impl.cc
246246
+++ b/content/browser/renderer_host/render_process_host_impl.cc
247247
@@ -216,6 +216,7 @@
@@ -252,7 +252,7 @@ index 6e3fd9b9fc420dc55951b9e3405dacf97f350369..d0a973b468970e20150aa6d53da59aa6
252252
#include "ui/gl/gl_switches.h"
253253
#include "ui/native_theme/native_theme_features.h"
254254
#include "url/origin.h"
255-
@@ -3372,6 +3373,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
255+
@@ -3376,6 +3377,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
256256
// Propagate the following switches to the renderer command line (along
257257
// with any associated values) if present in the browser command line.
258258
static const char* const kSwitchNames[] = {

0 commit comments

Comments
 (0)
X Tutup