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

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

Issue 1177333002: Revert of Detach old frame on WebFrame::swap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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 | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RemoteFrame.h » ('j') | 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 0f3fad44f8817e90ccccd9c72ca8c5547ba0855c..fae19d435e8f8e24232c3c16219d196c5fd06dcb 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -273,7 +273,7 @@
}
}
-void LocalFrame::detach(FrameDetachType type)
+void LocalFrame::detach()
{
PluginScriptForbiddenScope forbidPluginDestructorScripting;
// A lot of the following steps can result in the current frame being
@@ -300,18 +300,13 @@
setView(nullptr);
willDetachFrameHost();
InspectorInstrumentation::frameDetachedFromParent(this);
- Frame::detach(type);
+ Frame::detach();
// Signal frame destruction here rather than in the destructor.
// Main motivation is to avoid being dependent on its exact timing (Oilpan.)
LocalFrameLifecycleNotifier::notifyContextDestroyed();
m_supplements.clear();
WeakIdentifierMap<LocalFrame>::notifyObjectDestroyed(this);
-}
-
-bool LocalFrame::prepareForCommit()
-{
- return loader().prepareForCommit();
}
SecurityContext* LocalFrame::securityContext() const
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RemoteFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698