mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
b847299f19
* chore: bump chromium in DEPS to 146.0.7650.0 * 7496671: WaaP: Control hung delay for Initial WebUI Refs https://chromium-review.googlesource.com/c/chromium/src/+/7496671 * 7494302: [//media] Rename renderable_gpu_memory_buffer_video_frame_pool* Refs https://chromium-review.googlesource.com/c/chromium/src/+/7494302 * chore: update patches * 7502996: [DevTools] Add ability to toggle Chromium feature flags from DevTools Refs https://chromium-review.googlesource.com/c/chromium/src/+/7502996 * 7456200: Vectorize StringImpl::CopyChars and EqualIgnoringASCIICase using Highway. Refs https://chromium-review.googlesource.com/c/chromium/src/+/7456200 * 7236627: spellcheck: supply full spelling marker info, incld. marker type Refs https://chromium-review.googlesource.com/c/chromium/src/+/7236627 * chore: rm dependency on wtf::string from blink public headers Refs https://chromium-review.googlesource.com/c/chromium/src/+/7456200 added a public dependency on //third_party/highway for //third_party/blink/renderer/platform/wtf:wtf which will not be inherited by //content/renderer since wtf is internal dependency of blink leading to the following compilation error ``` In file included from ../../content/public/renderer/window_features_converter.cc:5: In file included from ../../content/public/renderer/window_features_converter.h:10: In file included from ../../third_party/blink/public/web/web_window_features.h:38: In file included from ../../third_party/blink/renderer/platform/wtf/text/wtf_string.h:40: ../../third_party/blink/renderer/platform/wtf/text/string_impl.h:27:10: fatal error: 'hwy/highway.h' file not found 27 | #include <hwy/highway.h> | ^~~~~~~~~~~~~~~ 1 error generated. ``` Use `gn desc out/Testing content/renderer:renderer_sources --blame` to verify the inherited config and dependency list. * 7493995: Restore directive part of wasm-eval error message Refs https://chromium-review.googlesource.com/c/chromium/src/+/7493995 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
78 lines
3.5 KiB
Diff
78 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 20 Sep 2018 17:45:03 -0700
|
|
Subject: blink_local_frame.patch
|
|
|
|
According to electron/electron#3699, it is unreliable to use |unload|
|
|
event for process.exit('exit'), so we have to do that in
|
|
willReleaseScriptContext.
|
|
|
|
Refs changes in:
|
|
* https://codereview.chromium.org/1657583002
|
|
* https://chromium-review.googlesource.com/c/chromium/src/+/2596880
|
|
* https://chromium-review.googlesource.com/c/chromium/src/+/2597169
|
|
|
|
This patch reverts the changes to fix associated crashes in Electron.
|
|
|
|
diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
|
|
index ac5d88520a785e12b66ebd96c92c46319a08311c..5c582e4f249c28a5739da2da4e600ee2ed7e19ea 100644
|
|
--- a/third_party/blink/renderer/core/frame/frame.cc
|
|
+++ b/third_party/blink/renderer/core/frame/frame.cc
|
|
@@ -135,14 +135,6 @@ bool Frame::Detach(FrameDetachType type) {
|
|
|
|
DCHECK(!IsDetached());
|
|
|
|
- // TODO(dcheng): FocusController::FrameDetached() *should* fire JS events,
|
|
- // hence the above check for `client_` being null. However, when this was
|
|
- // previously placed before the `FrameDetached()` call, nothing crashes, which
|
|
- // is suspicious. Investigate if we really don't need to fire JS events--and
|
|
- // if we don't, move `forbid_scripts` up to be instantiated sooner and
|
|
- // simplify this code.
|
|
- ScriptForbiddenScope forbid_scripts;
|
|
-
|
|
if (type == FrameDetachType::kRemove) {
|
|
if (provisional_frame_) {
|
|
provisional_frame_->Detach(FrameDetachType::kRemove);
|
|
@@ -167,6 +159,14 @@ bool Frame::Detach(FrameDetachType type) {
|
|
GetWindowProxyManager()->ClearForSwap();
|
|
}
|
|
|
|
+ // TODO(dcheng): FocusController::FrameDetached() *should* fire JS events,
|
|
+ // hence the above check for `client_` being null. However, when this was
|
|
+ // previously placed before the `FrameDetached()` call, nothing crashes, which
|
|
+ // is suspicious. Investigate if we really don't need to fire JS events--and
|
|
+ // if we don't, move `forbid_scripts` up to be instantiated sooner and
|
|
+ // simplify this code.
|
|
+ ScriptForbiddenScope forbid_scripts;
|
|
+
|
|
// After this, we must no longer talk to the client since this clears
|
|
// its owning reference back to our owning LocalFrame.
|
|
client_->Detached(type);
|
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
|
index 85bb570db1d2d4fafa8d5ac449122225965b425a..d39312542b93c4c5eaf4580c2a8d20290cf82a89 100644
|
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
|
@@ -768,10 +768,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
|
}
|
|
DCHECK(!view_ || !view_->IsAttached());
|
|
|
|
- // This is the earliest that scripting can be disabled:
|
|
- // - FrameLoader::Detach() can fire XHR abort events
|
|
- // - Document::Shutdown() can dispose plugins which can run script.
|
|
- ScriptForbiddenScope forbid_script;
|
|
if (!Client())
|
|
return false;
|
|
|
|
@@ -828,6 +824,11 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
|
|
DCHECK(!view_->IsAttached());
|
|
Client()->WillBeDetached();
|
|
|
|
+ // This is the earliest that scripting can be disabled:
|
|
+ // - FrameLoader::Detach() can fire XHR abort events
|
|
+ // - Document::Shutdown() can dispose plugins which can run script.
|
|
+ ScriptForbiddenScope forbid_script;
|
|
+
|
|
// TODO(crbug.com/729196): Trace why LocalFrameView::DetachFromLayout crashes.
|
|
CHECK(!view_->IsAttached());
|
|
SetView(nullptr);
|