Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1105)

Unified Diff: Source/core/frame/LocalFrame.cpp

Issue 678673002: Oilpan: clear FrameLoader during LocalFrame detach. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index ff443ff96ca1c4c2c1369ea64adf988ef5127043..13876a85aca9cba18a9a9c7eb252709c4769ec99 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -269,6 +269,12 @@ void LocalFrame::detach()
script().clearForClose();
InspectorInstrumentation::frameDetachedFromParent(this);
Frame::detach();
+#if ENABLE(OILPAN)
+ // Clear the FrameLoader right here rather than during
+ // finalization. Too late to access various heap objects at that
+ // stage.
+ loader().clear();
+#endif
}
void LocalFrame::disconnectOwnerElement()
@@ -282,12 +288,6 @@ void LocalFrame::disconnectOwnerElement()
for (const auto& pluginElement : m_pluginElements)
pluginElement->disconnectContentFrame();
m_pluginElements.clear();
-
- // Clear the FrameView and FrameLoader right here rather than
- // during finalization. Too late to access various heap objects
- // at that stage.
- setView(nullptr);
dcheng 2014/10/24 20:03:51 One quick question--is this getting handled elsewh
sof 2014/10/24 20:05:41 Yes, 5 lines up in LocalFrame::detach().
- loader().clear();
#endif
}
Frame::disconnectOwnerElement();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698