parent
dd3913fada
commit
61effac72a
16 changed files with 34 additions and 29 deletions
|
@ -14,10 +14,10 @@ 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 f5e5cfbd9f07c3c7140e43d1fd6804762aa6fe49..0c300bf86535de1091c757565e12b6e6e5168a77 100644
|
||||
index 24f40cc20d5a178d57828b733c10fcad5b3dcafe..99a7be58c6fde45aff4feafca51b3a63918850bb 100644
|
||||
--- a/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
+++ b/third_party/blink/renderer/core/frame/local_frame.cc
|
||||
@@ -413,10 +413,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
@@ -423,10 +423,6 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
}
|
||||
CHECK(!view_ || !view_->IsAttached());
|
||||
|
||||
|
@ -28,7 +28,7 @@ index f5e5cfbd9f07c3c7140e43d1fd6804762aa6fe49..0c300bf86535de1091c757565e12b6e6
|
|||
if (!Client())
|
||||
return;
|
||||
|
||||
@@ -434,6 +430,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
@@ -444,6 +440,10 @@ void LocalFrame::DetachImpl(FrameDetachType type) {
|
||||
// Notify ScriptController that the frame is closing, since its cleanup ends
|
||||
// up calling back to LocalFrameClient via WindowProxy.
|
||||
GetScriptController().ClearForClose();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue