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/html/parser/HTMLTokenizer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'WebCore/html/parser/HTMLTokenizer.cpp') diff --git a/WebCore/html/parser/HTMLTokenizer.cpp b/WebCore/html/parser/HTMLTokenizer.cpp index 5791842..f5405ff 100644 --- a/WebCore/html/parser/HTMLTokenizer.cpp +++ b/WebCore/html/parser/HTMLTokenizer.cpp @@ -293,7 +293,9 @@ bool HTMLTokenizer::nextToken(SegmentedString& source, HTMLToken& token) ADVANCE_TO(DataState); if (m_state == RCDATAState) ADVANCE_TO(RCDATAState); - ASSERT_NOT_REACHED(); + // When parsing text/plain documents, we run the tokenizer in the + // PLAINTEXTState and ignore m_skipLeadingNewLineForListing. + ASSERT(m_state == PLAINTEXTState); } } -- cgit v1.1