Commit effe7f52 authored by sigbjornf@opera.com's avatar sigbjornf@opera.com

Oilpan: clear FrameLoader during LocalFrame detach.

Following r183834, the FrameOwner is disconnected during frame detach.
The clearing of the FrameLoader that needs to happen for Oilpan can
consequently be moved to a more natural place and be done as part
of the other LocalFrame detach operations (rather than being a
special action of FrameOwner disconnecting.)

R=haraken
BUG=425559

Review URL: https://codereview.chromium.org/678673002

git-svn-id: svn://svn.chromium.org/blink/trunk@184382 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 7b0fcfc2
......@@ -273,6 +273,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()
......@@ -286,12 +292,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);
loader().clear();
#endif
}
Frame::disconnectOwnerElement();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment