Merge 111108

Source/WebCore/html/HTMLFrameElementBase.cpp

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>*)