Unreviewed, rolling out r144370.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Mar 2013 05:03:34 +0000 (05:03 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 1 Mar 2013 05:03:34 +0000 (05:03 +0000)
http://trac.webkit.org/changeset/144370
https://bugs.webkit.org/show_bug.cgi?id=111136

Caused 21 assertion failure at DocumentLoader.cpp(436)
(Requested by toyoshim on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-28

Source/WebCore:

* dom/Document.cpp:
(WebCore::Document::decrementActiveParserCount):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoading):
(WebCore::DocumentLoader::checkLoadComplete):

LayoutTests:

* platform/mac/TestExpectations:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@144413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/mac/TestExpectations
Source/WebCore/ChangeLog
Source/WebCore/dom/Document.cpp
Source/WebCore/loader/DocumentLoader.cpp

index b8260c4..6ac0d9f 100644 (file)
@@ -1,3 +1,14 @@
+2013-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144370.
+        http://trac.webkit.org/changeset/144370
+        https://bugs.webkit.org/show_bug.cgi?id=111136
+
+        Caused 21 assertion failure at DocumentLoader.cpp(436)
+        (Requested by toyoshim on #webkit).
+
+        * platform/mac/TestExpectations:
+
 2013-02-28  Takashi Toyoshima  <toyoshim@chromium.org>
 
         Unreviewed, chromium gardening; update expected image for Snow Leopard
index 8a6d7cb..b41c77a 100644 (file)
@@ -1439,6 +1439,7 @@ webkit.org/b/110173 media/video-controls-captions-trackmenu.html [ Crash Pass ]
 
 webkit.org/b/110186 inspector-protocol/page/javascriptDialogEvents.html [ Skip ]
 
+webkit.org/b/110554 http/tests/security/feed-urls-from-remote.html [ Failure ]
 webkit.org/b/110555 fast/canvas/canvas-currentPath.html [ Failure ]
 webkit.org/b/110555 fast/canvas/canvas-path-constructors.html [ Failure ]
 
index 9417b02..7e99c1e 100644 (file)
@@ -1,3 +1,18 @@
+2013-02-28  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r144370.
+        http://trac.webkit.org/changeset/144370
+        https://bugs.webkit.org/show_bug.cgi?id=111136
+
+        Caused 21 assertion failure at DocumentLoader.cpp(436)
+        (Requested by toyoshim on #webkit).
+
+        * dom/Document.cpp:
+        (WebCore::Document::decrementActiveParserCount):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::isLoading):
+        (WebCore::DocumentLoader::checkLoadComplete):
+
 2013-02-28  Li Yin  <li.yin@intel.com>
 
         [chromium] Events can't be triggered on MediaStreamTrack
index 5d03a79..2c5df67 100644 (file)
@@ -5808,7 +5808,12 @@ void Document::decrementActiveParserCount()
     --m_activeParserCount;
     if (!frame())
         return;
+    // FIXME: This should always be enabled, but it seems to cause
+    // http/tests/security/feed-urls-from-remote.html to timeout on Mac WK1
+    // see http://webkit.org/b/110554 and http://webkit.org/b/110401
+#if ENABLE(THREADED_HTML_PARSER)
     loader()->checkLoadComplete();
+#endif
     frame()->loader()->checkLoadComplete();
 }
 
index 0a5df65..44a291e 100644 (file)
@@ -287,8 +287,13 @@ void DocumentLoader::commitIfReady()
 
 bool DocumentLoader::isLoading() const
 {
+    // FIXME: This should always be enabled, but it seems to cause
+    // http/tests/security/feed-urls-from-remote.html to timeout on Mac WK1
+    // see http://webkit.org/b/110554 and http://webkit.org/b/110401
+#if ENABLE(THREADED_HTML_PARSER)
     if (document() && document()->hasActiveParser())
         return true;
+#endif
     return isLoadingMainResource() || !m_subresourceLoaders.isEmpty() || !m_plugInStreamLoaders.isEmpty();
 }
 
@@ -433,7 +438,11 @@ void DocumentLoader::checkLoadComplete()
 {
     if (!m_frame || isLoading())
         return;
+#if !ENABLE(THREADED_HTML_PARSER)
+    // This ASSERT triggers with the threaded HTML parser.
+    // See https://bugs.webkit.org/show_bug.cgi?id=110937
     ASSERT(this == frameLoader()->activeDocumentLoader());
+#endif
     m_frame->document()->domWindow()->finishedLoading();
 }