cad2d8b4aa
* chore: bump chromium in DEPS to c04c17506a1b5941370b91dfa44eda7ec31e9793 * update patches * chore: bump chromium in DEPS to 8a4687263763f306659d04cef8f0a12a9e504d57 * chore: bump chromium in DEPS to 3a75ada69d1ac06d6903a2c981ab90a8162f1ba0 * update patches * chore: sync StartRemoteDebuggingPipeHandler usage CL: https://chromium-review.googlesource.com/c/chromium/src/+/2536354 Added 'on_disconnect' OnceClosure arg to StartRemoteDebuggingPipeHandler * chore: add WebSocketHandshakeClient::OnFailurea CL: https://chromium-review.googlesource.com/c/chromium/src/+/2527889 Add an empty stub to satisfy parent class' pure virtual method OnFailure(). NB: Use of empty impl comes from WebRequestProxyingWebSocket. Co-authored-by: Charles Kerr <charles@charleskerr.com>
41 lines
1.8 KiB
Diff
41 lines
1.8 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.
|
|
|
|
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.
|
|
|
|
diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
|
|
index 7492c0b791bff1f9bd2a2abf005446303b2a7860..eda9c201b970ac83eda30808d9361e4fdac732ff 100644
|
|
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
|
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
|
@@ -635,10 +635,6 @@ void 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;
|
|
|
|
@@ -655,6 +651,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
|
// Notify WindowProxyManager that the frame is closing, since its cleanup ends
|
|
// up calling back to LocalFrameClient via WindowProxy.
|
|
GetWindowProxyManager()->ClearForClose();
|
|
+ // 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());
|