2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
However Chromium then disallowed scripting in willReleaseScriptContext
|
|
|
|
|
in https://codereview.chromium.org/1657583002, and crash will happen
|
|
|
|
|
when there is code doing that.
|
|
|
|
|
|
|
|
|
|
This patch reverts the change to fix the crash in Electron.
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
index fff54c3a1aa1518a3ef447ac064025a6ecd042e1..c43372723bdbbd047c7c389c2969fe4ea14c9561 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
|
|
|
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -584,10 +584,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
2020-09-21 08:00:36 +00:00
|
|
|
DCHECK(!view_ || !view_->IsAttached());
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
- // 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;
|
|
|
|
|
|
2020-10-16 01:30:41 +00:00
|
|
|
@@ -604,6 +600,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
|
|
|
|
// Notify WindowProxyManager that the frame is closing, since its cleanup ends
|
2018-09-14 05:02:16 +00:00
|
|
|
// up calling back to LocalFrameClient via WindowProxy.
|
2020-10-16 01:30:41 +00:00
|
|
|
GetWindowProxyManager()->ClearForClose();
|
2018-09-14 05:02:16 +00:00
|
|
|
+ // 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());
|
