Skip to content
Permalink
Browse files
REGRESSION(r143664, r143681): http/tests/security/feed-urls-from-remo…
…te.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):


Canonical link: https://commits.webkit.org/128888@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Feb 22, 2013
1 parent bee6e33 commit f59bb0d7293f02e1e3773410c632f824c56b80f9
Showing with 22 additions and 0 deletions.
  1. +12 −0 Source/WebCore/ChangeLog
  2. +5 −0 Source/WebCore/dom/Document.cpp
  3. +5 −0 Source/WebCore/loader/DocumentLoader.cpp
@@ -1,3 +1,15 @@
2013-02-22 Eric Seidel <eric@webkit.org>

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 <mrowe@apple.com>

Build fix after r143637.
@@ -5773,7 +5773,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();
}

@@ -280,8 +280,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 (m_frame && m_frame->document() && m_frame->document()->hasActiveParser())
return true;
#endif
return isLoadingMainResource() || !m_subresourceLoaders.isEmpty() || !m_plugInStreamLoaders.isEmpty();
}

0 comments on commit f59bb0d

Please sign in to comment.