Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Unified Diff: sky/engine/core/dom/Document.cpp

Issue 722743002: Remove dynamic cast from DocumentPaser interface (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/DocumentParser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/core/dom/Document.cpp
diff --git a/sky/engine/core/dom/Document.cpp b/sky/engine/core/dom/Document.cpp
index c4e517d5acb6b8e3ee69cad37ec748bd02af0cdb..2e9b6f322635c1edf0879d003f5dd6cad842fe1d 100644
--- a/sky/engine/core/dom/Document.cpp
+++ b/sky/engine/core/dom/Document.cpp
@@ -1342,11 +1342,6 @@ void Document::removeAllEventListeners()
domWindow->removeAllEventListeners();
}
-HTMLDocumentParser* Document::scriptableDocumentParser() const
-{
- return m_parser ? m_parser->asHTMLDocumentParser() : 0;
-}
-
void Document::detachParser()
{
if (!m_parser)
@@ -1635,14 +1630,14 @@ void Document::executeScriptsWaitingForResourcesTimerFired(Timer<Document>*)
{
if (!isRenderingReady())
return;
- if (HTMLDocumentParser* parser = scriptableDocumentParser())
- parser->executeScriptsWaitingForResources();
+ if (m_parser)
+ m_parser->executeScriptsWaitingForResources();
}
TextPosition Document::textPosition() const
{
- if (HTMLDocumentParser* parser = scriptableDocumentParser())
- return parser->textPosition();
+ if (m_parser)
+ m_parser->textPosition();
return TextPosition::belowRangePosition();
}
@@ -2382,8 +2377,8 @@ WeakPtr<Document> Document::contextDocument()
void Document::finishedParsing()
{
- ASSERT(!scriptableDocumentParser() || !m_parser->isParsing());
- ASSERT(!scriptableDocumentParser() || m_readyState != Loading);
+ ASSERT(!m_parser || !m_parser->isParsing());
+ ASSERT(!m_parser || m_readyState != Loading);
setParsing(false);
dispatchEvent(Event::createBubble(EventTypeNames::DOMContentLoaded));
@@ -2479,10 +2474,9 @@ void Document::addMessage(PassRefPtr<ConsoleMessage> consoleMessage)
if (!consoleMessage->scriptState() && consoleMessage->url().isNull() && !consoleMessage->lineNumber()) {
consoleMessage->setURL(url().string());
- if (parsing() && scriptableDocumentParser()) {
- HTMLDocumentParser* parser = scriptableDocumentParser();
- if (!parser->isWaitingForScripts() && !parser->isExecutingScript())
- consoleMessage->setLineNumber(parser->lineNumber().oneBasedInt());
+ if (parsing() && m_parser) {
+ if (!m_parser->isWaitingForScripts() && !m_parser->isExecutingScript())
+ consoleMessage->setLineNumber(m_parser->textPosition().m_line.oneBasedInt());
}
}
m_frame->console().addMessage(consoleMessage);
@@ -2622,11 +2616,6 @@ void Document::adjustFloatRectForScroll(FloatRect& rect)
rect.move(-FloatSize(visibleContentRect.x().toFloat(), visibleContentRect.y().toFloat()));
}
-bool Document::hasActiveParser()
-{
- return m_activeParserCount || (m_parser && m_parser->processingData());
-}
-
void Document::decrementActiveParserCount()
{
--m_activeParserCount;
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/dom/DocumentParser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698