diff options
| author | Leon Clarke <leonclarke@google.com> | 2010-07-15 12:03:35 +0100 |
|---|---|---|
| committer | Leon Clarke <leonclarke@google.com> | 2010-07-20 16:57:23 +0100 |
| commit | e458d70a0d18538346f41b503114c9ebe6b2ce12 (patch) | |
| tree | 86f1637deca2c524432a822e5fcedd4bef221091 /WebCore/html/HTMLTokenizer.cpp | |
| parent | f43eabc081f7ce6af24b9df4953498a3cd6ca24d (diff) | |
| download | external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.zip external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.gz external_webkit-e458d70a0d18538346f41b503114c9ebe6b2ce12.tar.bz2 | |
Merge WebKit at r63173 : Initial merge by git.
Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
Diffstat (limited to 'WebCore/html/HTMLTokenizer.cpp')
| -rw-r--r-- | WebCore/html/HTMLTokenizer.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/WebCore/html/HTMLTokenizer.cpp b/WebCore/html/HTMLTokenizer.cpp index 54e604a..55fd1ca 100644 --- a/WebCore/html/HTMLTokenizer.cpp +++ b/WebCore/html/HTMLTokenizer.cpp @@ -274,8 +274,13 @@ bool HTMLTokenizer::nextToken(SegmentedString& source, HTMLToken& token) // without getting an extra newline at the start of their <pre> element. if (m_skipLeadingNewLineForListing) { m_skipLeadingNewLineForListing = false; - if (m_state == DataState && cc == '\n') - ADVANCE_TO(DataState); + if (cc == '\n') { + if (m_state == DataState) + ADVANCE_TO(DataState); + if (m_state == RCDATAState) + ADVANCE_TO(RCDATAState); + ASSERT_NOT_REACHED(); + } } // Source: http://www.whatwg.org/specs/web-apps/current-work/#tokenisation0 @@ -1045,7 +1050,7 @@ bool HTMLTokenizer::nextToken(SegmentedString& source, HTMLToken& token) BEGIN_STATE(SelfClosingStartTagState) { if (cc == '>') { - notImplemented(); + m_token->setSelfClosing(); return emitAndResumeIn(source, DataState); } else if (cc == InputStreamPreprocessor::endOfFileMarker) { parseError(); |