mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
b0ab8e49a9
* chore: bump chromium in DEPS to 102.0.5005.3
* chore: bump chromium in DEPS to 102.0.5005.2
* chore: bump chromium in DEPS to 102.0.5005.12
* chore: bump chromium to 102.0.4999.0 (main) (#33731)
* chore: bump chromium in DEPS to 102.0.4999.0
* 3576640: Set OOM handler during V8 initialization
https://chromium-review.googlesource.com/c/chromium/src/+/3576640
* 3574964: Remove deprecated base::Value usage in print_settings_conversion code.
https://chromium-review.googlesource.com/c/chromium/src/+/3574964
* 3570062: Replicate Active state to render process for all RenderViews.
https://chromium-review.googlesource.com/c/chromium/src/+/3570062
* chore: fixup patch indices
* 3380402: Remove legacy SwiftShader
https://chromium-review.googlesource.com/c/chromium/src/+/3380402
* 3570254: [Local Fonts] Rename permission name from FONT_ACCESS to LOCAL_FONTS.
https://chromium-review.googlesource.com/c/chromium/src/+/3570254
* 3572172: Rename or remove several parameters involved in creation of MimeHandler streams
https://chromium-review.googlesource.com/c/chromium/src/+/3572172
* fix: add missing base/bits include
* chore: fix lint
* chore: remove ia32 Linux support
* chore: patch out swift-format cipd dep on macOS
* build: apply patch better
* build: reset all caches
* build: update zip manifests to remove swiftshared libraries
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/3380402
* Revert "build: update zip manifests to remove swiftshared libraries"
This reverts commit 6aeec01ef1a79425a7b7d8c1cfb131a26b91c494.
* Revert "3380402: Remove legacy SwiftShader"
This reverts commit 4c7eebbbf2d0a459cc192959e17ae20f970c2da2.
* build: remove unused swiftshader egl libraries
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: Samuel Attard <sattard@salesforce.com>
(cherry picked from commit f3e0517b6e)
* chore: update patch after cherry-pick from main roller pr
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
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 90d3a635eec331130b738d0839cc9fdfa60ce451..9eb900ff4449f277f8c5ab3ccc29b0aa725be356 100644
|
|
--- a/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
+++ b/third_party/blink/renderer/bindings/core/v8/v8_initializer.cc
|
|
@@ -448,8 +448,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
|