diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 16:35:48 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:42 +0100 |
| commit | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (patch) | |
| tree | ddce1aa5e3b6967a69691892e500897558ff8ab6 /WebCore/dom/XMLDocumentParser.cpp | |
| parent | 12bec63ec71e46baba27f0bd9bd9d8067683690a (diff) | |
| download | external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.zip external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.gz external_webkit-5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306.tar.bz2 | |
Merge WebKit at r67178 : Initial merge by git.
Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
Diffstat (limited to 'WebCore/dom/XMLDocumentParser.cpp')
| -rw-r--r-- | WebCore/dom/XMLDocumentParser.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/WebCore/dom/XMLDocumentParser.cpp b/WebCore/dom/XMLDocumentParser.cpp index 4b76472..4ae18a1 100644 --- a/WebCore/dom/XMLDocumentParser.cpp +++ b/WebCore/dom/XMLDocumentParser.cpp @@ -29,7 +29,7 @@ #include "CDATASection.h" #include "CachedScript.h" #include "Comment.h" -#include "DocLoader.h" +#include "CachedResourceLoader.h" #include "Document.h" #include "DocumentFragment.h" #include "DocumentType.h" @@ -132,7 +132,7 @@ void XMLDocumentParser::append(const SegmentedString& s) if (m_sawXSLTransform || !m_sawFirstElement) m_originalSourceForTransform += parseString; - if (isDetached() || m_parserStopped || m_sawXSLTransform) + if (isStopped() || m_sawXSLTransform) return; if (m_parserPaused) { @@ -190,7 +190,7 @@ static inline String toString(const xmlChar* str, unsigned len) void XMLDocumentParser::exitText() { - if (m_parserStopped) + if (isStopped()) return; if (!m_currentNode || !m_currentNode->isTextNode()) @@ -234,6 +234,9 @@ void XMLDocumentParser::end() document()->styleSelectorChanged(RecalcStyleImmediately); } + if (isParsing()) + prepareToStopParsing(); + document()->setReadyState(Document::Interactive); clearCurrentNodeStack(); document()->finishedParsing(); } |