Title: [111479] branches/chromium/963/Source/WebCore/html/HTMLFrameElementBase.cpp
- Revision
- 111479
- Author
- [email protected]
- Date
- 2012-03-20 18:01:40 -0700 (Tue, 20 Mar 2012)
Log Message
Merge 111108
BUG=117550
Review URL: https://chromiumcodereview.appspot.com/9766014
Modified Paths
Diff
Modified: branches/chromium/963/Source/WebCore/html/HTMLFrameElementBase.cpp (111478 => 111479)
--- branches/chromium/963/Source/WebCore/html/HTMLFrameElementBase.cpp 2012-03-21 00:48:15 UTC (rev 111478)
+++ branches/chromium/963/Source/WebCore/html/HTMLFrameElementBase.cpp 2012-03-21 01:01:40 UTC (rev 111479)
@@ -194,7 +194,8 @@
if (m_remainsAliveOnRemovalFromTree) {
updateOnReparenting();
- setRemainsAliveOnRemovalFromTree(false);
+ m_remainsAliveOnRemovalFromTree = false;
+ m_checkInDocumentTimer.stop();
return;
}
// DocumentFragments don't kick of any loads.
@@ -296,8 +297,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>*)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
