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

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

Issue 1058403002: Revert of Refactor frame navigation/detach state cleanup to be more sane. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 9 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/FrameView.cpp ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalDOMWindow.cpp
diff --git a/Source/core/frame/LocalDOMWindow.cpp b/Source/core/frame/LocalDOMWindow.cpp
index 0c636c0bd315c613ab58748e3a472d3563458a3d..54881b1d527f87c67ca1461935e292a2decccbb5 100644
--- a/Source/core/frame/LocalDOMWindow.cpp
+++ b/Source/core/frame/LocalDOMWindow.cpp
@@ -311,7 +311,15 @@
if (!m_document)
return;
- ASSERT(!m_document->isActive());
+ if (m_document->isActive()) {
+ // FIXME: We don't call willRemove here. Why is that OK?
+ // This detach() call is also mostly redundant. Most of the calls to
+ // this function come via DocumentLoader::createWriterFor, which
+ // always detaches the previous Document first. Only XSLTProcessor
+ // depends on this detach() call, so it seems like there's some room
+ // for cleanup.
+ m_document->detach();
+ }
// FIXME: This should be part of ActiveDOMObject shutdown
clearEventQueue();
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/frame/LocalFrame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698