Title: [143753] trunk/Source/WebCore
- Revision
- 143753
- Author
- [email protected]
- Date
- 2013-02-22 10:50:39 -0800 (Fri, 22 Feb 2013)
Log Message
REGRESSION(r143664, r143681): http/tests/security/feed-urls-from-remote.html fails
https://bugs.webkit.org/show_bug.cgi?id=110554
Reviewed by Adam Barth.
Will fix http/tests/security/feed-urls-from-remote.html for Mac WK1.
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoading):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (143752 => 143753)
--- trunk/Source/WebCore/ChangeLog 2013-02-22 18:45:07 UTC (rev 143752)
+++ trunk/Source/WebCore/ChangeLog 2013-02-22 18:50:39 UTC (rev 143753)
@@ -1,3 +1,15 @@
+2013-02-22 Eric Seidel <[email protected]>
+
+ REGRESSION(r143664, r143681): http/tests/security/feed-urls-from-remote.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=110554
+
+ Reviewed by Adam Barth.
+
+ Will fix http/tests/security/feed-urls-from-remote.html for Mac WK1.
+
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::isLoading):
+
2013-02-22 Mark Rowe <[email protected]>
Build fix after r143637.
Modified: trunk/Source/WebCore/dom/Document.cpp (143752 => 143753)
--- trunk/Source/WebCore/dom/Document.cpp 2013-02-22 18:45:07 UTC (rev 143752)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-02-22 18:50:39 UTC (rev 143753)
@@ -5773,7 +5773,12 @@
--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();
}
Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (143752 => 143753)
--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-02-22 18:45:07 UTC (rev 143752)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2013-02-22 18:50:39 UTC (rev 143753)
@@ -280,8 +280,13 @@
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 (m_frame && m_frame->document() && m_frame->document()->hasActiveParser())
return true;
+#endif
return isLoadingMainResource() || !m_subresourceLoaders.isEmpty() || !m_plugInStreamLoaders.isEmpty();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
