summaryrefslogtreecommitdiffstats
path: root/WebCore/html/HTMLDocumentParser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/html/HTMLDocumentParser.cpp')
-rw-r--r--WebCore/html/HTMLDocumentParser.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp
index 0c9f676..81a2974 100644
--- a/WebCore/html/HTMLDocumentParser.cpp
+++ b/WebCore/html/HTMLDocumentParser.cpp
@@ -217,21 +217,16 @@ void HTMLDocumentParser::didPumpLexer()
#endif
}
+bool HTMLDocumentParser::hasInsertionPoint()
+{
+ return m_input.hasInsertionPoint();
+}
+
void HTMLDocumentParser::insert(const SegmentedString& source)
{
if (m_parserStopped)
return;
- if (m_scriptRunner && !m_scriptRunner->inScriptExecution() && m_input.haveSeenEndOfFile()) {
- // document.write was called without a current insertion point.
- // According to the spec, we're supposed to implicitly open the
- // document. Unfortunately, that behavior isn't sufficiently compatible
- // with the web. The working group is mulling over what exactly to
- // do. In the meantime, we're going to try one of the potential
- // solutions, which is to ignore the write.
- // http://www.w3.org/Bugs/Public/show_bug.cgi?id=9767
- return;
- }
#ifdef ANDROID_INSTRUMENT
android::TimeCounter::start(android::TimeCounter::ParsingTimeCounter);
#endif
@@ -337,7 +332,7 @@ bool HTMLDocumentParser::inScriptExecution() const
{
if (!m_scriptRunner)
return false;
- return m_scriptRunner->inScriptExecution();
+ return m_scriptRunner->isExecutingScript();
}
int HTMLDocumentParser::lineNumber() const
@@ -415,7 +410,7 @@ void HTMLDocumentParser::executeScriptsWaitingForStylesheets()
// is a re-entrant call from encountering a </ style> tag.
if (!m_scriptRunner->hasScriptsWaitingForStylesheets())
return;
- ASSERT(!m_scriptRunner->inScriptExecution());
+ ASSERT(!m_scriptRunner->isExecutingScript());
ASSERT(m_treeBuilder->isPaused());
// Note: We only ever wait on one script at a time, so we always know this
// is the one we were waiting on and can un-pause the tree builder.