diff options
| author | Steve Block <steveblock@google.com> | 2010-07-08 12:51:48 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
| commit | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (patch) | |
| tree | bb45155550ec013adc0ad10f4d7d354c6469b022 /WebCore/html/HTMLToken.h | |
| parent | d4b24d9a829ed7de70381c8b99fb75a07ab40466 (diff) | |
| download | external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.zip external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.gz external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.bz2 | |
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Diffstat (limited to 'WebCore/html/HTMLToken.h')
| -rw-r--r-- | WebCore/html/HTMLToken.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/WebCore/html/HTMLToken.h b/WebCore/html/HTMLToken.h index 321b103..741f5cd 100644 --- a/WebCore/html/HTMLToken.h +++ b/WebCore/html/HTMLToken.h @@ -60,8 +60,15 @@ public: m_type = Uninitialized; } + void makeEndOfFile() + { + ASSERT(m_type == Uninitialized); + m_type = EndOfFile; + } + void beginStartTag(UChar character) { + ASSERT(character); ASSERT(m_type == Uninitialized); m_type = StartTag; m_data.clear(); @@ -87,6 +94,7 @@ public: void beginCharacter(UChar character) { + ASSERT(character); ASSERT(m_type == Uninitialized); m_type = Character; m_data.clear(); @@ -110,12 +118,14 @@ public: void beginDOCTYPE(UChar character) { + ASSERT(character); beginDOCTYPE(); m_data.append(character); } void appendToName(UChar character) { + ASSERT(character); ASSERT(m_type == StartTag || m_type == EndTag || m_type == DOCTYPE); m_data.append(character); } @@ -129,6 +139,7 @@ public: void appendToComment(UChar character) { + ASSERT(character); ASSERT(m_type == Comment); m_data.append(character); } @@ -142,12 +153,14 @@ public: void appendToAttributeName(UChar character) { + ASSERT(character); ASSERT(m_type == StartTag || m_type == EndTag); m_currentAttribute->m_name.append(character); } void appendToAttributeValue(UChar character) { + ASSERT(character); ASSERT(m_type == StartTag || m_type == EndTag); m_currentAttribute->m_value.append(character); } @@ -226,6 +239,7 @@ public: void appendToPublicIdentifier(UChar character) { + ASSERT(character); ASSERT(m_type == DOCTYPE); ASSERT(m_doctypeData->m_hasPublicIdentifier); m_doctypeData->m_publicIdentifier.append(character); @@ -233,6 +247,7 @@ public: void appendToSystemIdentifier(UChar character) { + ASSERT(character); ASSERT(m_type == DOCTYPE); ASSERT(m_doctypeData->m_hasSystemIdentifier); m_doctypeData->m_systemIdentifier.append(character); @@ -336,6 +351,12 @@ public: return m_name; } + void setName(const AtomicString& name) + { + ASSERT(m_type == HTMLToken::StartTag || m_type == HTMLToken::EndTag || m_type == HTMLToken::DOCTYPE); + m_name = name; + } + bool selfClosing() const { ASSERT(m_type == HTMLToken::StartTag || m_type == HTMLToken::EndTag); @@ -361,14 +382,14 @@ public: } // FIXME: Distinguish between a missing public identifer and an empty one. - const WTF::Vector<UChar>& publicIdentifier() const + WTF::Vector<UChar>& publicIdentifier() const { ASSERT(m_type == HTMLToken::DOCTYPE); return m_doctypeData->m_publicIdentifier; } // FIXME: Distinguish between a missing system identifer and an empty one. - const WTF::Vector<UChar>& systemIdentifier() const + WTF::Vector<UChar>& systemIdentifier() const { ASSERT(m_type == HTMLToken::DOCTYPE); return m_doctypeData->m_systemIdentifier; |