X Tutup
Skip to content

Commit 8532e12

Browse files
electron-roller[bot]codebyterepatchup[bot]MarshallOfSound
authored
chore: bump chromium to 93.0.4530.0 (master) (electron#29256)
* chore: bump chromium in DEPS to 92.0.4512.6 * 2887336: [CaptureHandle][adamlaska#2] Propagate CaptureHandleConfig in browser process https://chromium-review.googlesource.com/c/chromium/src/+/2887336 * refactor: base::Optional -> absl::optional * chore: fixup patch indices * chore: bump chromium in DEPS to 92.0.4514.0 * 2899417: Make build work when enable_pdf is set to false. https://chromium-review.googlesource.com/c/chromium/src/+/2899417 * 2904731: use BrowserContext instead of Profile in PreconnectManager https://chromium-review.googlesource.com/c/chromium/src/+/2904731 * 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true https://chromium-review.googlesource.com/c/chromium/src/+/2295749 * 2893803: Add a GetWebView to RenderFrame. https://chromium-review.googlesource.com/c/chromium/src/+/2893803 * 2892345: Implement WebContents::ForEachRenderFrameHost https://chromium-review.googlesource.com/c/chromium/src/+/2892345 * chore: fixup patch indices * 2892048: Real instance methods for BrowserContext: remaining 5 methods. https://chromium-review.googlesource.com/c/chromium/src/+/2892048 * 2902821: [mojo] Don't require full header includes for referenced interfaces https://chromium-review.googlesource.com/c/chromium/src/+/2902821 * 2496500: Remove last deprecated extension Event ctor. https://chromium-review.googlesource.com/c/chromium/src/+/2496500 * chore: fixup malformed pepper support patch * chore: bump chromium in DEPS to 92.0.4515.0 * 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc. https://chromium-review.googlesource.com/c/chromium/src/+/2908461 * 2880838: viz: add optional HDRMetadata to TransferableResource https://chromium-review.googlesource.com/c/chromium/src/+/2880838 * chore: fixup patch indices * chore: bump chromium in DEPS to 92.0.4515.5 * chore: update patches * chore: bump chromium in DEPS to 92.0.4515.7 * chore: bump chromium in DEPS to 92.0.4515.9 * chore: bump chromium in DEPS to 93.0.4522.0 * chore: bump chromium in DEPS to 93.0.4523.0 * chore: bump chromium in DEPS to 93.0.4524.0 * chore: update patches * chore: enable_pak_file_integrity_checks was reverted * chore: update patches * refactor: base/optional was replaced with absl::optional Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202 * refactor: replace all usages of base::nullopt with absl::nullopt Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202 * chore: add missing base::Contains include Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202 * refactor: replace all usages of base::make_optional with absl::make_optional Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202 * refactor: replace WorldScriptContext() with GetScriptContextFromWorldId Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893213 * chore: clean up left over opening namespace Refs: electron@95bfe6d * chore: add missing base::Contains include Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2910202 * refactor: replace GetCurrentDisplayIterator with the hard checker GetCurrentDisplay This code looks suspicious but if the iterator was invalid before it will also be invalid now. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2893191 * refactor: headers are now passed directly in extensions client Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2918906 * refactor: base::DictionaryValue::empty() has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2912424 * chore: add missing includes for network URLLoaderFactory Refs: unknown, probably a side effect of header changes * refactor: make convenience wrapper around AppendArg There is no converter FromV8 for base::StringPiece (apparently its not possible). So we now take in an std::string and use the construct for StringPiece to do implicit conversion. Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2905544 * chore: add patch * chore: bump chromium in DEPS to 93.0.4525.0 * chore: update patches * refactor: CanResize has been de-virtualized Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2485774 * chore: update resource integrity patch * chore: add character encoding idl patch * chore: bump chromium in DEPS to 93.0.4526.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4527.0 * chore: bump chromium in DEPS to 93.0.4528.0 * chore: update patches * chore: update idl encoding patch * chore: bump chromium in DEPS to 93.0.4529.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4530.0 * chore: update patches * fix: only SetCanResize after the widget has been initialized * chore: add patch for vr on windows gn gen * spec: fix focus related tests on linux due to delay in focus swap * chore: remove new usages of base::Optional from main Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
1 parent 8d0ed05 commit 8532e12

File tree

165 files changed

+720
-1048
lines changed

Some content is hidden

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

165 files changed

+720
-1048
lines changed

‎DEPS‎

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

1515
vars = {
1616
'chromium_version':
17-
'92.0.4511.0',
17+
'93.0.4530.0',
1818
'node_version':
1919
'v14.17.0',
2020
'nan_version':

‎build/args/all.gn‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,5 @@ enable_pseudolocales = false
2929

3030
is_cfi = false
3131

32-
enable_pak_file_integrity_checks = false
33-
3432
# Make application name configurable at runtime for cookie crypto
3533
allow_runtime_configurable_key_storage = true

‎patches/chromium/.patches‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ dcheck.patch
33
accelerator.patch
44
blink_file_path.patch
55
blink_local_frame.patch
6-
blink_world_context.patch
76
can_create_window.patch
87
disable_hidden.patch
98
dom_storage_limits.patch
@@ -49,7 +48,6 @@ build_add_electron_tracing_category.patch
4948
worker_context_will_destroy.patch
5049
frame_host_manager.patch
5150
crashpad_pid_check.patch
52-
preconnect_feature.patch
5351
network_service_allow_remote_certificate_verification_logic.patch
5452
put_back_deleted_colors_for_autofill.patch
5553
disable_color_correct_rendering.patch
@@ -83,7 +81,6 @@ crash_allow_disabling_compression_on_linux.patch
8381
allow_setting_secondary_label_via_simplemenumodel.patch
8482
feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
8583
fix_patch_out_profile_refs_in_accessibility_ui.patch
86-
fix_check_issecureeventinputenabled_in_constructor_before_setting.patch
8784
skip_atk_toolchain_check.patch
8885
worker_feat_add_hook_to_notify_script_ready.patch
8986
chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -99,7 +96,8 @@ fix_add_check_for_sandbox_then_result.patch
9996
extend_apply_webpreferences.patch
10097
fix_expose_decrementcapturercount_in_web_contents_impl.patch
10198
add_setter_for_browsermainloop_result_code.patch
102-
chore_allow_overriding_of_enable_pak_file_integrity_checks.patch
10399
make_include_of_stack_trace_h_unconditional.patch
104100
build_libc_as_static_library.patch
105-
support_runtime_configurable_key_storage_on_linux_os_crypto.patch
101+
build_do_not_depend_on_packed_resource_integrity.patch
102+
build_read_idl_files_as_utf8_to_fix_python3_character_encodding.patch
103+
build_do_not_include_vr_directx_helpers_when_enable_vr.patch

‎patches/chromium/accelerator.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,22 @@ index d6913b15149f773cad28b5e2278b0f80df3d2896..25342f62acdc28806a0e6ae0bd129c59
6363

6464
if (IsCmdDown()) {
6565
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
66-
index 780a45f9ca2dd60e0deac27cc6e8f69e72cd8435..b740fbbfb14b5737b18b84c07c8e9f79cfc645c0 100644
66+
index 780a45f9ca2dd60e0deac27cc6e8f69e72cd8435..b1b46f18e9c600820fdd2d26631eac38da672811 100644
6767
--- a/ui/base/accelerators/accelerator.h
6868
+++ b/ui/base/accelerators/accelerator.h
6969
@@ -16,6 +16,7 @@
7070
#include <utility>
7171

7272
#include "base/component_export.h"
73-
+#include "base/optional.h"
73+
+#include "third_party/abseil-cpp/absl/types/optional.h"
7474
#include "base/time/time.h"
7575
#include "build/build_config.h"
7676
#include "ui/events/event_constants.h"
7777
@@ -129,6 +130,8 @@ class COMPONENT_EXPORT(UI_BASE) Accelerator {
7878
return interrupted_by_mouse_event_;
7979
}
8080

81-
+ base::Optional<char16_t> shifted_char;
81+
+ absl::optional<char16_t> shifted_char;
8282
+
8383
private:
8484
std::u16string ApplyLongFormModifiers(const std::u16string& shortcut) const;

‎patches/chromium/add_didinstallconditionalfeatures.patch‎

Lines changed: 11 additions & 11 deletions
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 107c22e38babc4860d53d4fb539f322e6dec1df0..366382caddffc3beb363fe96eab63ea7474f81d1 100644
13+
index 3d985164eee3d7d8ef9e7ff2215ec9a17ec157a5..9c1c4fd8528fbb088f1836c8503c5875727f5d62 100644
1414
--- a/content/public/renderer/render_frame_observer.h
1515
+++ b/content/public/renderer/render_frame_observer.h
1616
@@ -127,6 +127,8 @@ class CONTENT_EXPORT RenderFrameObserver : public IPC::Listener,
@@ -23,10 +23,10 @@ index 107c22e38babc4860d53d4fb539f322e6dec1df0..366382caddffc3beb363fe96eab63ea7
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 e0c8e8c19450b067757a8e8289f46f32b7d443eb..0f13101c719e6f43cfc5d281d0f6f345d475744d 100644
26+
index 08d697c611363155d3b6230b3e994ac456fb843b..cfc895ca8ce72655df5862d917a3954009930c4c 100644
2727
--- a/content/renderer/render_frame_impl.cc
2828
+++ b/content/renderer/render_frame_impl.cc
29-
@@ -4135,6 +4135,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
29+
@@ -4259,6 +4259,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
3030
observer.DidCreateScriptContext(context, world_id);
3131
}
3232

@@ -40,10 +40,10 @@ index e0c8e8c19450b067757a8e8289f46f32b7d443eb..0f13101c719e6f43cfc5d281d0f6f345
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 77aaa3c08c1268c246f698a02df3e8a1aa4ef294..ffc6a5d1cd16ee2aecee027e9a321f1e435f5410 100644
43+
index 9636a1b59f05353b0777a0c304238703d17e1a01..0b5e6e726ebe7f4467b26725c477dc46dea579a5 100644
4444
--- a/content/renderer/render_frame_impl.h
4545
+++ b/content/renderer/render_frame_impl.h
46-
@@ -576,6 +576,8 @@ class CONTENT_EXPORT RenderFrameImpl
46+
@@ -582,6 +582,8 @@ class CONTENT_EXPORT RenderFrameImpl
4747
blink::WebLocalFrameClient::LazyLoadBehavior lazy_load_behavior) override;
4848
void DidCreateScriptContext(v8::Local<v8::Context> context,
4949
int world_id) override;
@@ -53,10 +53,10 @@ index 77aaa3c08c1268c246f698a02df3e8a1aa4ef294..ffc6a5d1cd16ee2aecee027e9a321f1e
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 4b3b9b1c4034656fdf5f9862d3fffa66f51e72fe..55e69bb644e2c47ac15fe8b2e255d660b8a51b4f 100644
56+
index 7bbe3754fec723c490c61cf52b875930dfa3543f..6035143b0d47fd0222fe7bc5c44328b043073335 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-
@@ -577,6 +577,9 @@ class BLINK_EXPORT WebLocalFrameClient {
59+
@@ -580,6 +580,9 @@ class BLINK_EXPORT WebLocalFrameClient {
6060
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
6161
int32_t world_id) {}
6262

@@ -79,10 +79,10 @@ index 83b81f4c1fd4232ee5c2b7b1b7b85424164f3acc..bdd4a0031af6f9c2b701979dd469867c
7979
if (World().IsMainWorld()) {
8080
GetFrame()->Loader().DispatchDidClearWindowObjectInMainWorld();
8181
diff --git a/third_party/blink/renderer/core/frame/local_frame_client.h b/third_party/blink/renderer/core/frame/local_frame_client.h
82-
index d8ac4cd5b0847b03ed30663dea24654c6e29d2f0..8c46855d4a5f888425ea4b6d4f69c74ac649933e 100644
82+
index 549a8f00a631bc860dde7a2362a0234420a1167a..14c3151f86a4d268352865c78c4889df6e9cf325 100644
8383
--- a/third_party/blink/renderer/core/frame/local_frame_client.h
8484
+++ b/third_party/blink/renderer/core/frame/local_frame_client.h
85-
@@ -291,6 +291,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
85+
@@ -297,6 +297,8 @@ class CORE_EXPORT LocalFrameClient : public FrameClient {
8686

8787
virtual void DidCreateScriptContext(v8::Local<v8::Context>,
8888
int32_t world_id) = 0;
@@ -92,7 +92,7 @@ index d8ac4cd5b0847b03ed30663dea24654c6e29d2f0..8c46855d4a5f888425ea4b6d4f69c74a
9292
int32_t world_id) = 0;
9393
virtual bool AllowScriptExtensions() = 0;
9494
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
95-
index 3538350785762dc742f862ff0e9ba8f43c92199a..0c980c66d861af11760faf1f1f78070d9f487367 100644
95+
index 077a726d6f2c0899fac1bccfe8ecc05b3bbd76b3..ed6dfe4598d2396c4cc48b6fd3cfecf0076726d4 100644
9696
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9797
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.cc
9898
@@ -272,6 +272,13 @@ void LocalFrameClientImpl::DidCreateScriptContext(
@@ -110,7 +110,7 @@ index 3538350785762dc742f862ff0e9ba8f43c92199a..0c980c66d861af11760faf1f1f78070d
110110
v8::Local<v8::Context> context,
111111
int32_t world_id) {
112112
diff --git a/third_party/blink/renderer/core/frame/local_frame_client_impl.h b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
113-
index aab6643b89899a2b7f5bd74d4501bbf74562a663..8a3dddf797106e3d5da6a75d458ddea97cdf5edc 100644
113+
index dd342c654a29a18fad347abe8d94131f78ce0f3e..51276dfa934ebb9d2695a068f89e4d5b07c190a2 100644
114114
--- a/third_party/blink/renderer/core/frame/local_frame_client_impl.h
115115
+++ b/third_party/blink/renderer/core/frame/local_frame_client_impl.h
116116
@@ -77,6 +77,8 @@ class CORE_EXPORT LocalFrameClientImpl final : public LocalFrameClient {

‎patches/chromium/add_setter_for_browsermainloop_result_code.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ valid use cases for setting custom exit codes of the main loop. This
1010
exposes a simple setter that embedders can call.
1111

1212
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
13-
index 30d6d6f54e453c5b9690bc028005d4169f7d71c4..76228c72b87368d5372ed812693b81e7d4d370d0 100644
13+
index 090ca9c6e8785c6e9f1b9245771645ea19805795..fdf587055a71103c21f27fd79e5714baa24ea5c4 100644
1414
--- a/content/browser/browser_main_loop.h
1515
+++ b/content/browser/browser_main_loop.h
16-
@@ -164,6 +164,10 @@ class CONTENT_EXPORT BrowserMainLoop {
16+
@@ -161,6 +161,10 @@ class CONTENT_EXPORT BrowserMainLoop {
1717

1818
int GetResultCode() const { return result_code_; }
1919

‎patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Subject: allow disabling blink scheduler throttling per RenderView
66
This allows us to disable throttling for hidden windows.
77

88
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
9-
index e38a3a04c260d66b0f116d101c197824e3aaae93..bb3c79f407ab638fcd3180f6b16af98ec6ece5f8 100644
9+
index 5f4b4d0a6b7df869fef93129b6a3ce4c217a74c5..f00052e3335c5c2dbd00812be61ccae048e3e5b1 100644
1010
--- a/content/browser/renderer_host/render_view_host_impl.cc
1111
+++ b/content/browser/renderer_host/render_view_host_impl.cc
12-
@@ -611,6 +611,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
12+
@@ -615,6 +615,11 @@ void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {
1313
GetWidget()->GetAssociatedFrameWidget()->SetBackgroundOpaque(opaque);
1414
}
1515

@@ -22,7 +22,7 @@ index e38a3a04c260d66b0f116d101c197824e3aaae93..bb3c79f407ab638fcd3180f6b16af98e
2222
return is_active();
2323
}
2424
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h
25-
index 8926801ad5fdc5a560cb8a1eb40675eb5416f5cc..691abfe3802c207f402aef54eae481aaedafc364 100644
25+
index 37f3a9cae4ce9652943bbe7e71541ce182f52c1e..608b54785a1d8b34df41b030f65253c14b8285a1 100644
2626
--- a/content/browser/renderer_host/render_view_host_impl.h
2727
+++ b/content/browser/renderer_host/render_view_host_impl.h
2828
@@ -135,6 +135,7 @@ class CONTENT_EXPORT RenderViewHostImpl
@@ -48,18 +48,18 @@ index 9f1acca2bdb697b79a01362a9a5d8dd098eca925..c57c03b838a773d41614002afee27520
4848
// This interface should only be implemented inside content.
4949
friend class RenderViewHostImpl;
5050
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
51-
index dfaf88a323e6b1e63cc2b7abd1d7a1dcc26b1b8c..9cbc5fcf90d54173c84b5e91c620d175166ed9b3 100644
51+
index 59f8c47769c5fa325bb9464912561da1f0ba6c8b..822c94e3a3439b1c97ef25baf3eac97a017fa472 100644
5252
--- a/content/renderer/render_view_impl.h
5353
+++ b/content/renderer/render_view_impl.h
54-
@@ -183,6 +183,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
54+
@@ -155,6 +155,8 @@ class CONTENT_EXPORT RenderViewImpl : public blink::WebViewClient,
5555
static WindowOpenDisposition NavigationPolicyToDisposition(
5656
blink::WebNavigationPolicy policy);
5757

5858
+ void OnSetSchedulerThrottling(bool allowed);
5959
+
60-
// Misc private functions ----------------------------------------------------
61-
62-
// In OOPIF-enabled modes, this tells each RenderFrame with a pending state
60+
// ---------------------------------------------------------------------------
61+
// ADDING NEW FUNCTIONS? Please keep private functions alphabetized and put
62+
// it in the same order in the .cc file as it was in the header.
6363
diff --git a/third_party/blink/public/mojom/page/page.mojom b/third_party/blink/public/mojom/page/page.mojom
6464
index e122d4ffb857023841dabcb6fed352d7586d8344..3c7cd1cb8b204024a0835150302ee8896e01ee45 100644
6565
--- a/third_party/blink/public/mojom/page/page.mojom
@@ -73,10 +73,10 @@ index e122d4ffb857023841dabcb6fed352d7586d8344..3c7cd1cb8b204024a0835150302ee889
7373
+ SetSchedulerThrottling(bool allowed);
7474
};
7575
diff --git a/third_party/blink/public/web/web_view.h b/third_party/blink/public/web/web_view.h
76-
index 26aafb1350fe3e5df35800d858794b60aa309f21..e686722564b5d85ee77acc09ccba93d8605b1a0a 100644
76+
index 7acd3f2bf496172490e8bf3ea033ee213fcfdb02..ebc73fa9fbaf689f50deb547ac778f0a74c376fb 100644
7777
--- a/third_party/blink/public/web/web_view.h
7878
+++ b/third_party/blink/public/web/web_view.h
79-
@@ -357,6 +357,7 @@ class WebView {
79+
@@ -364,6 +364,7 @@ class WebView {
8080
// Scheduling -----------------------------------------------------------
8181

8282
virtual PageScheduler* Scheduler() const = 0;
@@ -85,10 +85,10 @@ index 26aafb1350fe3e5df35800d858794b60aa309f21..e686722564b5d85ee77acc09ccba93d8
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 e5d12060da4fd6366313a28f4a99ac52ce119803..ff5dda58a3db3efeea952f0ae75cf85575e1a12c 100644
88+
index f2fbcc760726822b86a9ca7ae37ef07d209a0984..ac730780c3f643b7131b742bd8fb6fd34aae0d9b 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-
@@ -3559,6 +3559,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
91+
@@ -3573,6 +3573,13 @@ PageScheduler* WebViewImpl::Scheduler() const {
9292
return GetPage()->GetPageScheduler();
9393
}
9494

@@ -102,7 +102,7 @@ index e5d12060da4fd6366313a28f4a99ac52ce119803..ff5dda58a3db3efeea952f0ae75cf855
102102
void WebViewImpl::SetVisibilityState(
103103
mojom::blink::PageVisibilityState visibility_state,
104104
bool is_initial_state) {
105-
@@ -3570,7 +3577,8 @@ void WebViewImpl::SetVisibilityState(
105+
@@ -3584,7 +3591,8 @@ void WebViewImpl::SetVisibilityState(
106106
}
107107
GetPage()->SetVisibilityState(visibility_state, is_initial_state);
108108
GetPage()->GetPageScheduler()->SetPageVisible(
@@ -113,18 +113,18 @@ index e5d12060da4fd6366313a28f4a99ac52ce119803..ff5dda58a3db3efeea952f0ae75cf855
113113

114114
mojom::blink::PageVisibilityState WebViewImpl::GetVisibilityState() {
115115
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
116-
index e536aeacc79dcc5cf45674fbc4d288a8265a7548..c06214e3c714c96acd104208c7495397e924bc12 100644
116+
index c2e704e745d3859790e73e515c3c1cbcd11ce529..5b3233f4d1f108492f370fc0f6450633dbe713f0 100644
117117
--- a/third_party/blink/renderer/core/exported/web_view_impl.h
118118
+++ b/third_party/blink/renderer/core/exported/web_view_impl.h
119-
@@ -403,6 +403,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
119+
@@ -408,6 +408,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
120120
LocalDOMWindow* PagePopupWindow() const;
121121

122122
PageScheduler* Scheduler() const override;
123123
+ void SetSchedulerThrottling(bool allowed) override;
124124
void SetVisibilityState(mojom::blink::PageVisibilityState visibility_state,
125125
bool is_initial_state) override;
126126
mojom::blink::PageVisibilityState GetVisibilityState() override;
127-
@@ -828,6 +829,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
127+
@@ -833,6 +834,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
128128
// If true, we send IPC messages when |preferred_size_| changes.
129129
bool send_preferred_size_changes_ = false;
130130

‎patches/chromium/blink_file_path.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ This is used by editors to obtain the filesystem path from a dragged file. See
77
documentation at https://electronjs.org/docs/api/file-object
88

99
diff --git a/third_party/blink/renderer/core/fileapi/file.h b/third_party/blink/renderer/core/fileapi/file.h
10-
index 7c21e6bc889c5bead5aa25a3a7582918d2f6d953..fe255a5d6afca61852adead82beaac275ebe9c54 100644
10+
index d70a95cc9b28674dd4ac925e9f1aca481e60c34b..fa9d21a20e77867a7d596e0df4ec143edb871f27 100644
1111
--- a/third_party/blink/renderer/core/fileapi/file.h
1212
+++ b/third_party/blink/renderer/core/fileapi/file.h
13-
@@ -200,6 +200,9 @@ class CORE_EXPORT File final : public Blob {
13+
@@ -191,6 +191,9 @@ class CORE_EXPORT File final : public Blob {
1414
}
1515
const String& name() const { return name_; }
1616

‎patches/chromium/blink_local_frame.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Refs changes in:
1515
This patch reverts the changes to fix associated crashes in Electron.
1616

1717
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
18-
index a190fd8233e295555d4b5e93cb3a8edd59d7df59..37f199f6e6471d97105ffad9dd7d4450cb02331f 100644
18+
index 8bf6b4bc077cc41da5e0e6b13302bc343537c68f..01bddc0bcb7476408023c4cfc042a0883c16430c 100644
1919
--- a/third_party/blink/renderer/core/frame/frame.cc
2020
+++ b/third_party/blink/renderer/core/frame/frame.cc
2121
@@ -120,14 +120,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,10 +49,10 @@ index a190fd8233e295555d4b5e93cb3a8edd59d7df59..37f199f6e6471d97105ffad9dd7d4450
4949
// its owning reference back to our owning LocalFrame.
5050
client_->Detached(type);
5151
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
52-
index fab2d2cbc446cc283939830f5e8fe9bb5b500b73..7530888913597ac9afd32d634d461c74f1da69ed 100644
52+
index 932b271a34fe295b2f0dd807f67b22682addfbf9..ea8336ff1f6c8bf26465e5ff6ed01cae0899f258 100644
5353
--- a/third_party/blink/renderer/core/frame/local_frame.cc
5454
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
55-
@@ -785,10 +785,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
55+
@@ -784,10 +784,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
5656
}
5757
DCHECK(!view_ || !view_->IsAttached());
5858

@@ -63,7 +63,7 @@ index fab2d2cbc446cc283939830f5e8fe9bb5b500b73..7530888913597ac9afd32d634d461c74
6363
if (!Client())
6464
return false;
6565

66-
@@ -834,6 +830,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
66+
@@ -833,6 +829,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
6767
DCHECK(!view_->IsAttached());
6868
Client()->WillBeDetached();
6969

0 commit comments

Comments
 (0)
X Tutup