diff options
| author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
| commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
| tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebCore/html/parser/HTMLDocumentParser.cpp | |
| parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
| download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 | |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebCore/html/parser/HTMLDocumentParser.cpp')
| -rw-r--r-- | WebCore/html/parser/HTMLDocumentParser.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/WebCore/html/parser/HTMLDocumentParser.cpp b/WebCore/html/parser/HTMLDocumentParser.cpp index 46530d5..68b59a4 100644 --- a/WebCore/html/parser/HTMLDocumentParser.cpp +++ b/WebCore/html/parser/HTMLDocumentParser.cpp @@ -195,12 +195,12 @@ bool HTMLDocumentParser::runScriptsForPausedTreeBuilder() { ASSERT(m_treeBuilder->isPaused()); - int scriptStartLine = 0; - RefPtr<Element> scriptElement = m_treeBuilder->takeScriptToProcess(scriptStartLine); + TextPosition1 scriptStartPosition = TextPosition1::belowRangePosition(); + RefPtr<Element> scriptElement = m_treeBuilder->takeScriptToProcess(scriptStartPosition); // We will not have a scriptRunner when parsing a DocumentFragment. if (!m_scriptRunner) return true; - return m_scriptRunner->execute(scriptElement.release(), scriptStartLine); + return m_scriptRunner->execute(scriptElement.release(), scriptStartPosition); } void HTMLDocumentParser::pumpTokenizer(SynchronousMode mode) @@ -410,9 +410,13 @@ int HTMLDocumentParser::lineNumber() const return m_tokenizer->lineNumber(); } -int HTMLDocumentParser::columnNumber() const +TextPosition0 HTMLDocumentParser::textPosition() const { - return m_tokenizer->columnNumber(); + int lineZeroBased = m_tokenizer->lineNumber(); + int columnOneBased = m_tokenizer->columnNumber(); + + return TextPosition0(WTF::ZeroBasedNumber::fromZeroBasedInt(lineZeroBased), + WTF::OneBasedNumber::fromOneBasedInt(columnOneBased).convertToZeroBased()); } bool HTMLDocumentParser::isWaitingForScripts() const |