Changeset 92453 in webkit

Timestamp:

Aug 5, 2011 12:00:47 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r92439.
​http://trac.webkit.org/changeset/92439
​https://bugs.webkit.org/show_bug.cgi?id=65753

Caused 9 tests to fail on Qt (Requested by abarth on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-08-05

Source/WebCore:

• dom/Document.cpp:

(WebCore::Document::implicitOpen):

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::transitionToCommitted):
(WebCore::FrameLoader::detachChildren):

LayoutTests:

• loader/document-destruction-within-unload-expected.txt: Removed.
• loader/document-destruction-within-unload.html: Removed.
• loader/resources/document-destruction-within-unload-iframe.html: Removed.
• loader/resources/document-destruction-within-unload.svg: Removed.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/loader/document-destruction-within-unload-expected.txt (deleted)
• LayoutTests/loader/document-destruction-within-unload.html (deleted)
• LayoutTests/loader/resources/document-destruction-within-unload-iframe.html (deleted)
• LayoutTests/loader/resources/document-destruction-within-unload.svg (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r92439.
+        http://trac.webkit.org/changeset/92439
+        https://bugs.webkit.org/show_bug.cgi?id=65753
+
+        Caused 9 tests to fail on Qt (Requested by abarth on #webkit).
+
+        * loader/document-destruction-within-unload-expected.txt: Removed.
+        * loader/document-destruction-within-unload.html: Removed.
+        * loader/resources/document-destruction-within-unload-iframe.html: Removed.
+        * loader/resources/document-destruction-within-unload.svg: Removed.
+
 2011-08-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-05  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r92439.
+        http://trac.webkit.org/changeset/92439
+        https://bugs.webkit.org/show_bug.cgi?id=65753
+
+        Caused 9 tests to fail on Qt (Requested by abarth on #webkit).
+
+        * dom/Document.cpp:
+        (WebCore::Document::implicitOpen):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::transitionToCommitted):
+        (WebCore::FrameLoader::detachChildren):
+
 2011-08-04  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1996 +1996 @@
     removeChildren();
 
-    // cancel again, as removeChildren can cause event triggers to be added
-    // again, which we don't want triggered on the old document.
-    cancelParsing();
-
     setCompatibilityMode(NoQuirksMode);
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -1835 +1835 @@
         m_documentLoader->stopLoadingPlugIns();
 
-    // State must be set before setting m_documentLoader to avoid
-    // m_provisionalDocumentLoader getting detached from the frame via a sub
-    // frame. See https://bugs.webkit.org/show_bug.cgi?id=64741 for more
-    // discussion.
-    setState(FrameStateCommittedPage);
     setDocumentLoader(m_provisionalDocumentLoader.get());
     setProvisionalDocumentLoader(0);
+    setState(FrameStateCommittedPage);
 
 #if ENABLE(TOUCH_EVENTS)
@@ -2337 +2333 @@
 void FrameLoader::detachChildren()
 {
-    typedef Vector<RefPtr<Frame> > FrameVector;
-    FrameVector protect;
-
     // FIXME: Is it really necessary to do this in reverse order?
-    for (Frame* child = m_frame->tree()->lastChild(); child; child = child->tree()->previousSibling())
-        protect.append(child);
-    for (FrameVector::iterator it = protect.begin(); it != protect.end(); ++it)
-        (*it)->loader()->detachFromParent();
+    Frame* previous;
+    for (Frame* child = m_frame->tree()->lastChild(); child; child = previous) {
+        previous = child->tree()->previousSibling();
+        child->loader()->detachFromParent();
+    }
 }