Skip to content
Permalink
Browse files
LayoutTests/fast/encoding/parser-tests-*.html timeout with threaded H…
…TML parser

https://bugs.webkit.org/show_bug.cgi?id=109995

Unreviewed speculative fix for Mac WK1.

It appears that m_frame can be null for Mac WK1.

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoading):

Canonical link: https://commits.webkit.org/128823@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@143681 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Feb 22, 2013
1 parent b12951d commit ff663e3516381f993f73da8c53b1ddfcd5ab22a6
Showing with 13 additions and 1 deletion.
  1. +12 −0 Source/WebCore/ChangeLog
  2. +1 −1 Source/WebCore/loader/DocumentLoader.cpp
@@ -1,3 +1,15 @@
2013-02-21 Eric Seidel <eric@webkit.org>

LayoutTests/fast/encoding/parser-tests-*.html timeout with threaded HTML parser
https://bugs.webkit.org/show_bug.cgi?id=109995

Unreviewed speculative fix for Mac WK1.

It appears that m_frame can be null for Mac WK1.

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::isLoading):

2013-02-21 Dean Jackson <dino@apple.com>

Better sizing model for Snapshotted plugins
@@ -280,7 +280,7 @@ void DocumentLoader::commitIfReady()

bool DocumentLoader::isLoading() const
{
if (m_frame->document() && m_frame->document()->hasActiveParser())
if (m_frame && m_frame->document() && m_frame->document()->hasActiveParser())
return true;
return isLoadingMainResource() || !m_subresourceLoaders.isEmpty() || !m_plugInStreamLoaders.isEmpty();
}

0 comments on commit ff663e3

Please sign in to comment.