Merge 111108

Source/WebCore/html/HTMLFrameElementBase.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann (hausmann@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 176 matching lines @@
     if (Frame* frame = contentFrame())
         frame->transferChildFrameToNewDocument();
 }
 
 void HTMLFrameElementBase::insertedIntoDocument()
 {
     HTMLFrameOwnerElement::insertedIntoDocument();
 
     if (m_remainsAliveOnRemovalFromTree) {
         updateOnReparenting();
-        setRemainsAliveOnRemovalFromTree(false);
+        m_remainsAliveOnRemovalFromTree = false;
+        m_checkInDocumentTimer.stop();
         return;
     }
     // DocumentFragments don't kick of any loads.
     if (!document()->frame())
         return;
 
     // JavaScript in src=javascript: and beforeonload can access the renderer
     // during attribute parsing *before* the normal parser machinery would
     // attach the element. To support this, we lazyAttach here, but only
     // if we don't already have a renderer (if we're inserted
@@ skipping 79 matching lines @@
 
 void HTMLFrameElementBase::setRemainsAliveOnRemovalFromTree(bool value)
 {
     ASSERT(!value || canRemainAliveOnRemovalFromTree());
     m_remainsAliveOnRemovalFromTree = value;
 
     // There is a possibility that JS will do document.adoptNode() on this element but will not insert it into the tree.
     // 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>*)
 {
     ASSERT(!attached());
     ASSERT(m_remainsAliveOnRemovalFromTree);
 
     m_remainsAliveOnRemovalFromTree = false;
     willRemove();
 }
 
 void HTMLFrameElementBase::willRemove()
 {
     if (m_remainsAliveOnRemovalFromTree)
         return;
 
     HTMLFrameOwnerElement::willRemove();
 }
 
 #if ENABLE(FULLSCREEN_API)
 bool HTMLFrameElementBase::allowFullScreen() const
 {
     return hasAttribute(webkitallowfullscreenAttr);
 }
 #endif
 
 } // namespace WebCore