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

Unified Diff: Source/WebCore/html/HTMLFrameElementBase.cpp

Issue 9768010: Merge 111108 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/html/HTMLFrameElementBase.cpp
===================================================================
--- Source/WebCore/html/HTMLFrameElementBase.cpp (revision 111485)
+++ Source/WebCore/html/HTMLFrameElementBase.cpp (working copy)
@@ -194,7 +194,8 @@
if (m_remainsAliveOnRemovalFromTree) {
updateOnReparenting();
- setRemainsAliveOnRemovalFromTree(false);
+ m_remainsAliveOnRemovalFromTree = false;
+ m_checkInDocumentTimer.stop();
return;
}
// DocumentFragments don't kick of any loads.
@@ -294,8 +295,10 @@
// Start the async timer that is normally stopped by attach(). If it's not stopped and fires, it'll unload the frame.
if (value)
m_checkInDocumentTimer.startOneShot(0);
- else
+ else {
m_checkInDocumentTimer.stop();
+ willRemove();
+ }
}
void HTMLFrameElementBase::checkInDocumentTimerFired(Timer<HTMLFrameElementBase>*)
« 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