From 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 13 Sep 2010 16:35:48 +0100 Subject: Merge WebKit at r67178 : Initial merge by git. Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18 --- WebCore/dom/XMLDocumentParserQt.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'WebCore/dom/XMLDocumentParserQt.cpp') diff --git a/WebCore/dom/XMLDocumentParserQt.cpp b/WebCore/dom/XMLDocumentParserQt.cpp index dfd6fb1..75a20be 100644 --- a/WebCore/dom/XMLDocumentParserQt.cpp +++ b/WebCore/dom/XMLDocumentParserQt.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" @@ -199,7 +199,7 @@ void XMLDocumentParser::doWrite(const String& parseString) void XMLDocumentParser::initializeParserContext(const char*) { - m_parserStopped = false; + DocumentParser::startParsing(); m_sawError = false; m_sawXSLTransform = false; m_sawFirstElement = false; @@ -213,7 +213,7 @@ void XMLDocumentParser::doEnd() document()->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets. document()->styleSelectorChanged(RecalcStyleImmediately); document()->setParsing(true); - m_parserStopped = true; + DocumentParser::stopParsing(); } #endif @@ -350,7 +350,7 @@ static inline void handleElementAttributes(Element* newElement, const QXmlStream void XMLDocumentParser::parse() { - while (!m_parserStopped && !m_parserPaused && !m_stream.atEnd()) { + while (!isStopped() && !m_parserPaused && !m_stream.atEnd()) { m_stream.readNext(); switch (m_stream.tokenType()) { case QXmlStreamReader::StartDocument: { @@ -578,7 +578,7 @@ void XMLDocumentParser::parseEndElement() // we have a src attribute String scriptCharset = scriptElement->scriptCharset(); if (element->dispatchBeforeLoadEvent(scriptHref) && - (m_pendingScript = document()->docLoader()->requestScript(scriptHref, scriptCharset))) { + (m_pendingScript = document()->cachedResourceLoader()->requestScript(scriptHref, scriptCharset))) { m_scriptElement = element; m_pendingScript->addClient(this); -- cgit v1.1