mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
6442e87276
* chore: bump chromium in DEPS to 102.0.4973.0
* chore: bump chromium to 102.0.4971.0 (main) (#33454)
* chore: bump chromium in DEPS to 102.0.4965.0
* chore: 3-way merge of chromium/printing.patch
* chore: update patch shear in chromium/picture-in-picture.patch
* chore: update patches
* 3101519: Window Placement: Prototype fullscreen companion window support
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3101519
build: add popup_preventer.cc, .h to our library. It's needed because
FullscreenController, we were already using, started aggregating a
PopupPreventer in 3101519.
* chore: bump chromium in DEPS to 102.0.4967.0
* Revert "3101519: Window Placement: Prototype fullscreen companion window support"
This reverts commit fc215cb99c464e939882ed3f5cf8e9874a8e3311.
Adding popup_preventer might not be the right solution; there are
cascading dependencies.
* 3551449: Add service-based usage for system print settings
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3551449
chore: fix code shear in patches/chromium/printing.patch
* chore: update patches
* chore: bump chromium in DEPS to 102.0.4969.0
* chore: update patches
* chore: bump chromium in DEPS to 102.0.4971.0
* chore: update fix_patch_out_permissions_checks_in_exclusive_access.patch
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3101519
PopupunderPreventer is not useful in //electron since the window
attributes are controlled by the user via setWindowOpenHandler.
* chore: update patches
* Add FirstPartySetsHandler as a interface class in content API.
https://chromium-review.googlesource.com/c/chromium/src/+/3503410
* Create a new MediaStreamRequestType for GetOpenDevice
https://chromium-review.googlesource.com/c/chromium/src/+/3541939
* Support site isolation for <webview> tags in WebViewRendererState.
https://chromium-review.googlesource.com/c/chromium/src/+/3537735
* ci: update xcode version
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3544199
https://developer.apple.com/documentation/screencapturekit/capturing_screen_content_in_macos
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
(cherry picked from commit b711860d21)
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
42 lines
2.2 KiB
Diff
42 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Mon, 5 Oct 2020 13:43:59 -0700
|
|
Subject: chore: expose v8 initialization isolate callbacks
|
|
|
|
This commit is necessary in order to ensure consistent behavior from
|
|
v8 Isolate callbacks in contexts which Node.js does not control. If
|
|
we're running with contextIsolation enabled, we should be falling back
|
|
to Blink's logic. This will be upstreamed in some form.
|
|
|
|
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
index 66dddc124ca48024cb9539529b787f6e9aa1fd5c..fd6dc712df185724ae88a40e643a26126e54d712 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
@@ -446,8 +446,9 @@ CodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
|
|
return {true, std::move(stringified_source)};
|
|
}
|
|
|
|
-bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(v8::Local<v8::Context> context,
|
|
- v8::Local<v8::String> source) {
|
|
+bool V8Initializer::WasmCodeGenerationCheckCallbackInMainThread(
|
|
+ v8::Local<v8::Context> context,
|
|
+ v8::Local<v8::String> source) {
|
|
if (ExecutionContext* execution_context = ToExecutionContext(context)) {
|
|
if (ContentSecurityPolicy* policy =
|
|
execution_context->GetContentSecurityPolicy()) {
|
|
diff --git a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
|
|
index 932c6aad3df51dd6790e55bf708703767843dc5e..6865fd33e62f766c5a162ded8627c332bf2ed173 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.h
|
|
@@ -69,8 +69,8 @@ class CORE_EXPORT V8Initializer {
|
|
static void MessageHandlerInWorker(v8::Local<v8::Message>,
|
|
v8::Local<v8::Value>);
|
|
static bool WasmCodeGenerationCheckCallbackInMainThread(
|
|
- v8::Local<v8::Context> context,
|
|
- v8::Local<v8::String> source);
|
|
+ v8::Local<v8::Context> context,
|
|
+ v8::Local<v8::String> source);
|
|
};
|
|
|
|
} // namespace blink
|