Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5
Patch Set: get-names-6: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h ('k') | third_party/WebKit/Source/core/html/shadow/SpinButtonElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
index 39b2b1f8f0723f2d052a0c4180afd1c672ef0e84..2ce0a69d690179cb0116ec49bc6a81b25a0b2f15 100644
--- a/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.cpp
@@ -983,7 +983,7 @@ HTMLStackItem* HTMLTreeBuilder::adjustedCurrentStackItem() const
// http://www.whatwg.org/specs/web-apps/current-work/multipage/tokenization.html#close-the-cell
void HTMLTreeBuilder::closeTheCell()
{
- ASSERT(insertionMode() == InCellMode);
+ ASSERT(getInsertionMode() == InCellMode);
if (m_tree.openElements()->inTableScope(tdTag)) {
ASSERT(!m_tree.openElements()->inTableScope(thTag));
processFakeEndTag(tdTag);
@@ -991,7 +991,7 @@ void HTMLTreeBuilder::closeTheCell()
}
ASSERT(m_tree.openElements()->inTableScope(thTag));
processFakeEndTag(thTag);
- ASSERT(insertionMode() == InRowMode);
+ ASSERT(getInsertionMode() == InRowMode);
}
void HTMLTreeBuilder::processStartTagForInTable(AtomicHTMLToken* token)
@@ -1025,7 +1025,7 @@ void HTMLTreeBuilder::processStartTagForInTable(AtomicHTMLToken* token)
if (isTableCellContextTag(token->name())
|| token->name() == trTag) {
processFakeStartTag(tbodyTag);
- ASSERT(insertionMode() == InTableBodyMode);
+ ASSERT(getInsertionMode() == InTableBodyMode);
processStartTag(token);
return;
}
@@ -1071,13 +1071,13 @@ void HTMLTreeBuilder::processStartTagForInTable(AtomicHTMLToken* token)
void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
{
ASSERT(token->type() == HTMLToken::StartTag);
- switch (insertionMode()) {
+ switch (getInsertionMode()) {
case InitialMode:
- ASSERT(insertionMode() == InitialMode);
+ ASSERT(getInsertionMode() == InitialMode);
defaultForInitial();
// Fall through.
case BeforeHTMLMode:
- ASSERT(insertionMode() == BeforeHTMLMode);
+ ASSERT(getInsertionMode() == BeforeHTMLMode);
if (token->name() == htmlTag) {
m_tree.insertHTMLHtmlStartTagBeforeHTML(token);
setInsertionMode(BeforeHeadMode);
@@ -1086,7 +1086,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
defaultForBeforeHTML();
// Fall through.
case BeforeHeadMode:
- ASSERT(insertionMode() == BeforeHeadMode);
+ ASSERT(getInsertionMode() == BeforeHeadMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1099,13 +1099,13 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
defaultForBeforeHead();
// Fall through.
case InHeadMode:
- ASSERT(insertionMode() == InHeadMode);
+ ASSERT(getInsertionMode() == InHeadMode);
if (processStartTagForInHead(token))
return;
defaultForInHead();
// Fall through.
case AfterHeadMode:
- ASSERT(insertionMode() == AfterHeadMode);
+ ASSERT(getInsertionMode() == AfterHeadMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1145,15 +1145,15 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
defaultForAfterHead();
// Fall through
case InBodyMode:
- ASSERT(insertionMode() == InBodyMode);
+ ASSERT(getInsertionMode() == InBodyMode);
processStartTagForInBody(token);
break;
case InTableMode:
- ASSERT(insertionMode() == InTableMode);
+ ASSERT(getInsertionMode() == InTableMode);
processStartTagForInTable(token);
break;
case InCaptionMode:
- ASSERT(insertionMode() == InCaptionMode);
+ ASSERT(getInsertionMode() == InCaptionMode);
if (isCaptionColOrColgroupTag(token->name())
|| isTableBodyContextTag(token->name())
|| isTableCellContextTag(token->name())
@@ -1169,7 +1169,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
processStartTagForInBody(token);
break;
case InColumnGroupMode:
- ASSERT(insertionMode() == InColumnGroupMode);
+ ASSERT(getInsertionMode() == InColumnGroupMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1189,7 +1189,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
processStartTag(token);
break;
case InTableBodyMode:
- ASSERT(insertionMode() == InTableBodyMode);
+ ASSERT(getInsertionMode() == InTableBodyMode);
if (token->name() == trTag) {
m_tree.openElements()->popUntilTableBodyScopeMarker(); // How is there ever anything to pop?
m_tree.insertHTMLElement(token);
@@ -1199,7 +1199,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
if (isTableCellContextTag(token->name())) {
parseError(token);
processFakeStartTag(trTag);
- ASSERT(insertionMode() == InRowMode);
+ ASSERT(getInsertionMode() == InRowMode);
processStartTag(token);
return;
}
@@ -1219,7 +1219,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
processStartTagForInTable(token);
break;
case InRowMode:
- ASSERT(insertionMode() == InRowMode);
+ ASSERT(getInsertionMode() == InRowMode);
if (isTableCellContextTag(token->name())) {
m_tree.openElements()->popUntilTableRowScopeMarker();
m_tree.insertHTMLElement(token);
@@ -1234,14 +1234,14 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
ASSERT(isParsingFragmentOrTemplateContents());
return;
}
- ASSERT(insertionMode() == InTableBodyMode);
+ ASSERT(getInsertionMode() == InTableBodyMode);
processStartTag(token);
return;
}
processStartTagForInTable(token);
break;
case InCellMode:
- ASSERT(insertionMode() == InCellMode);
+ ASSERT(getInsertionMode() == InCellMode);
if (isCaptionColOrColgroupTag(token->name())
|| isTableCellContextTag(token->name())
|| token->name() == trTag
@@ -1260,7 +1260,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
break;
case AfterBodyMode:
case AfterAfterBodyMode:
- ASSERT(insertionMode() == AfterBodyMode || insertionMode() == AfterAfterBodyMode);
+ ASSERT(getInsertionMode() == AfterBodyMode || getInsertionMode() == AfterAfterBodyMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1269,7 +1269,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
processStartTag(token);
break;
case InHeadNoscriptMode:
- ASSERT(insertionMode() == InHeadNoscriptMode);
+ ASSERT(getInsertionMode() == InHeadNoscriptMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1292,7 +1292,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
processToken(token);
break;
case InFramesetMode:
- ASSERT(insertionMode() == InFramesetMode);
+ ASSERT(getInsertionMode() == InFramesetMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1317,7 +1317,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
break;
case AfterFramesetMode:
case AfterAfterFramesetMode:
- ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
+ ASSERT(getInsertionMode() == AfterFramesetMode || getInsertionMode() == AfterAfterFramesetMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1329,7 +1329,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
parseError(token);
break;
case InSelectInTableMode:
- ASSERT(insertionMode() == InSelectInTableMode);
+ ASSERT(getInsertionMode() == InSelectInTableMode);
if (token->name() == captionTag
|| token->name() == tableTag
|| isTableBodyContextTag(token->name())
@@ -1343,7 +1343,7 @@ void HTMLTreeBuilder::processStartTag(AtomicHTMLToken* token)
}
// Fall through
case InSelectMode:
- ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode);
+ ASSERT(getInsertionMode() == InSelectMode || getInsertionMode() == InSelectInTableMode);
if (token->name() == htmlTag) {
processHtmlStartTagForInBody(token);
return;
@@ -1696,7 +1696,7 @@ void HTMLTreeBuilder::processEndTagForInRow(AtomicHTMLToken* token)
ASSERT(isParsingFragmentOrTemplateContents());
return;
}
- ASSERT(insertionMode() == InTableBodyMode);
+ ASSERT(getInsertionMode() == InTableBodyMode);
processEndTag(token);
return;
}
@@ -1706,7 +1706,7 @@ void HTMLTreeBuilder::processEndTagForInRow(AtomicHTMLToken* token)
return;
}
processFakeEndTag(trTag);
- ASSERT(insertionMode() == InTableBodyMode);
+ ASSERT(getInsertionMode() == InTableBodyMode);
processEndTag(token);
return;
}
@@ -1960,13 +1960,13 @@ void HTMLTreeBuilder::processEndTagForInTable(AtomicHTMLToken* token)
void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
{
ASSERT(token->type() == HTMLToken::EndTag);
- switch (insertionMode()) {
+ switch (getInsertionMode()) {
case InitialMode:
- ASSERT(insertionMode() == InitialMode);
+ ASSERT(getInsertionMode() == InitialMode);
defaultForInitial();
// Fall through.
case BeforeHTMLMode:
- ASSERT(insertionMode() == BeforeHTMLMode);
+ ASSERT(getInsertionMode() == BeforeHTMLMode);
if (token->name() != headTag && token->name() != bodyTag && token->name() != htmlTag && token->name() != brTag) {
parseError(token);
return;
@@ -1974,7 +1974,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
defaultForBeforeHTML();
// Fall through.
case BeforeHeadMode:
- ASSERT(insertionMode() == BeforeHeadMode);
+ ASSERT(getInsertionMode() == BeforeHeadMode);
if (token->name() != headTag && token->name() != bodyTag && token->name() != htmlTag && token->name() != brTag) {
parseError(token);
return;
@@ -1982,7 +1982,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
defaultForBeforeHead();
// Fall through.
case InHeadMode:
- ASSERT(insertionMode() == InHeadMode);
+ ASSERT(getInsertionMode() == InHeadMode);
// FIXME: This case should be broken out into processEndTagForInHead,
// because other end tag cases now refer to it ("process the token for using the rules of the "in head" insertion mode").
// but because the logic falls through to AfterHeadMode, that gets a little messy.
@@ -2002,7 +2002,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
defaultForInHead();
// Fall through.
case AfterHeadMode:
- ASSERT(insertionMode() == AfterHeadMode);
+ ASSERT(getInsertionMode() == AfterHeadMode);
if (token->name() != bodyTag && token->name() != htmlTag && token->name() != brTag) {
parseError(token);
return;
@@ -2010,15 +2010,15 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
defaultForAfterHead();
// Fall through
case InBodyMode:
- ASSERT(insertionMode() == InBodyMode);
+ ASSERT(getInsertionMode() == InBodyMode);
processEndTagForInBody(token);
break;
case InTableMode:
- ASSERT(insertionMode() == InTableMode);
+ ASSERT(getInsertionMode() == InTableMode);
processEndTagForInTable(token);
break;
case InCaptionMode:
- ASSERT(insertionMode() == InCaptionMode);
+ ASSERT(getInsertionMode() == InCaptionMode);
if (token->name() == captionTag) {
processCaptionEndTagForInCaption();
return;
@@ -2045,7 +2045,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
processEndTagForInBody(token);
break;
case InColumnGroupMode:
- ASSERT(insertionMode() == InColumnGroupMode);
+ ASSERT(getInsertionMode() == InColumnGroupMode);
if (token->name() == colgroupTag) {
processColgroupEndTagForInColumnGroup();
return;
@@ -2065,19 +2065,19 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
processEndTag(token);
break;
case InRowMode:
- ASSERT(insertionMode() == InRowMode);
+ ASSERT(getInsertionMode() == InRowMode);
processEndTagForInRow(token);
break;
case InCellMode:
- ASSERT(insertionMode() == InCellMode);
+ ASSERT(getInsertionMode() == InCellMode);
processEndTagForInCell(token);
break;
case InTableBodyMode:
- ASSERT(insertionMode() == InTableBodyMode);
+ ASSERT(getInsertionMode() == InTableBodyMode);
processEndTagForInTableBody(token);
break;
case AfterBodyMode:
- ASSERT(insertionMode() == AfterBodyMode);
+ ASSERT(getInsertionMode() == AfterBodyMode);
if (token->name() == htmlTag) {
if (isParsingFragment()) {
parseError(token);
@@ -2088,13 +2088,13 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
}
// Fall through.
case AfterAfterBodyMode:
- ASSERT(insertionMode() == AfterBodyMode || insertionMode() == AfterAfterBodyMode);
+ ASSERT(getInsertionMode() == AfterBodyMode || getInsertionMode() == AfterAfterBodyMode);
parseError(token);
setInsertionMode(InBodyMode);
processEndTag(token);
break;
case InHeadNoscriptMode:
- ASSERT(insertionMode() == InHeadNoscriptMode);
+ ASSERT(getInsertionMode() == InHeadNoscriptMode);
if (token->name() == noscriptTag) {
ASSERT(m_tree.currentStackItem()->hasTagName(noscriptTag));
m_tree.openElements()->pop();
@@ -2129,7 +2129,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
setInsertionMode(m_originalInsertionMode);
break;
case InFramesetMode:
- ASSERT(insertionMode() == InFramesetMode);
+ ASSERT(getInsertionMode() == InFramesetMode);
if (token->name() == framesetTag) {
bool ignoreFramesetForFragmentParsing = m_tree.currentIsRootNode();
ignoreFramesetForFragmentParsing = ignoreFramesetForFragmentParsing || m_tree.openElements()->hasTemplateInHTMLScope();
@@ -2149,18 +2149,18 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
}
break;
case AfterFramesetMode:
- ASSERT(insertionMode() == AfterFramesetMode);
+ ASSERT(getInsertionMode() == AfterFramesetMode);
if (token->name() == htmlTag) {
setInsertionMode(AfterAfterFramesetMode);
return;
}
// Fall through.
case AfterAfterFramesetMode:
- ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
+ ASSERT(getInsertionMode() == AfterFramesetMode || getInsertionMode() == AfterAfterFramesetMode);
parseError(token);
break;
case InSelectInTableMode:
- ASSERT(insertionMode() == InSelectInTableMode);
+ ASSERT(getInsertionMode() == InSelectInTableMode);
if (token->name() == captionTag
|| token->name() == tableTag
|| isTableBodyContextTag(token->name())
@@ -2176,7 +2176,7 @@ void HTMLTreeBuilder::processEndTag(AtomicHTMLToken* token)
}
// Fall through.
case InSelectMode:
- ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode);
+ ASSERT(getInsertionMode() == InSelectMode || getInsertionMode() == InSelectInTableMode);
if (token->name() == optgroupTag) {
if (m_tree.currentStackItem()->hasTagName(optionTag) && m_tree.oneBelowTop() && m_tree.oneBelowTop()->hasTagName(optgroupTag))
processFakeEndTag(optionTag);
@@ -2273,9 +2273,9 @@ ReprocessBuffer:
return;
}
- switch (insertionMode()) {
+ switch (getInsertionMode()) {
case InitialMode: {
- ASSERT(insertionMode() == InitialMode);
+ ASSERT(getInsertionMode() == InitialMode);
buffer.skipLeadingWhitespace();
if (buffer.isEmpty())
return;
@@ -2283,7 +2283,7 @@ ReprocessBuffer:
// Fall through.
}
case BeforeHTMLMode: {
- ASSERT(insertionMode() == BeforeHTMLMode);
+ ASSERT(getInsertionMode() == BeforeHTMLMode);
buffer.skipLeadingWhitespace();
if (buffer.isEmpty())
return;
@@ -2291,7 +2291,7 @@ ReprocessBuffer:
// Fall through.
}
case BeforeHeadMode: {
- ASSERT(insertionMode() == BeforeHeadMode);
+ ASSERT(getInsertionMode() == BeforeHeadMode);
buffer.skipLeadingWhitespace();
if (buffer.isEmpty())
return;
@@ -2299,7 +2299,7 @@ ReprocessBuffer:
// Fall through.
}
case InHeadMode: {
- ASSERT(insertionMode() == InHeadMode);
+ ASSERT(getInsertionMode() == InHeadMode);
String leadingWhitespace = buffer.takeLeadingWhitespace();
if (!leadingWhitespace.isEmpty())
m_tree.insertTextNode(leadingWhitespace, AllWhitespace);
@@ -2309,7 +2309,7 @@ ReprocessBuffer:
// Fall through.
}
case AfterHeadMode: {
- ASSERT(insertionMode() == AfterHeadMode);
+ ASSERT(getInsertionMode() == AfterHeadMode);
String leadingWhitespace = buffer.takeLeadingWhitespace();
if (!leadingWhitespace.isEmpty())
m_tree.insertTextNode(leadingWhitespace, AllWhitespace);
@@ -2322,14 +2322,14 @@ ReprocessBuffer:
case InCaptionMode:
case TemplateContentsMode:
case InCellMode: {
- ASSERT(insertionMode() == InBodyMode || insertionMode() == InCaptionMode || insertionMode() == InCellMode || insertionMode() == TemplateContentsMode);
+ ASSERT(getInsertionMode() == InBodyMode || getInsertionMode() == InCaptionMode || getInsertionMode() == InCellMode || getInsertionMode() == TemplateContentsMode);
processCharacterBufferForInBody(buffer);
break;
}
case InTableMode:
case InTableBodyMode:
case InRowMode: {
- ASSERT(insertionMode() == InTableMode || insertionMode() == InTableBodyMode || insertionMode() == InRowMode);
+ ASSERT(getInsertionMode() == InTableMode || getInsertionMode() == InTableBodyMode || getInsertionMode() == InRowMode);
ASSERT(m_pendingTableCharacters.isEmpty());
if (m_tree.currentStackItem()->isElementNode()
&& (m_tree.currentStackItem()->hasTagName(tableTag)
@@ -2352,7 +2352,7 @@ ReprocessBuffer:
break;
}
case InColumnGroupMode: {
- ASSERT(insertionMode() == InColumnGroupMode);
+ ASSERT(getInsertionMode() == InColumnGroupMode);
String leadingWhitespace = buffer.takeLeadingWhitespace();
if (!leadingWhitespace.isEmpty())
m_tree.insertTextNode(leadingWhitespace, AllWhitespace);
@@ -2369,18 +2369,18 @@ ReprocessBuffer:
}
case AfterBodyMode:
case AfterAfterBodyMode: {
- ASSERT(insertionMode() == AfterBodyMode || insertionMode() == AfterAfterBodyMode);
+ ASSERT(getInsertionMode() == AfterBodyMode || getInsertionMode() == AfterAfterBodyMode);
// FIXME: parse error
setInsertionMode(InBodyMode);
goto ReprocessBuffer;
}
case TextMode: {
- ASSERT(insertionMode() == TextMode);
+ ASSERT(getInsertionMode() == TextMode);
m_tree.insertTextNode(buffer.takeRemaining());
break;
}
case InHeadNoscriptMode: {
- ASSERT(insertionMode() == InHeadNoscriptMode);
+ ASSERT(getInsertionMode() == InHeadNoscriptMode);
String leadingWhitespace = buffer.takeLeadingWhitespace();
if (!leadingWhitespace.isEmpty())
m_tree.insertTextNode(leadingWhitespace, AllWhitespace);
@@ -2391,7 +2391,7 @@ ReprocessBuffer:
}
case InFramesetMode:
case AfterFramesetMode: {
- ASSERT(insertionMode() == InFramesetMode || insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
+ ASSERT(getInsertionMode() == InFramesetMode || getInsertionMode() == AfterFramesetMode || getInsertionMode() == AfterAfterFramesetMode);
String leadingWhitespace = buffer.takeRemainingWhitespace();
if (!leadingWhitespace.isEmpty())
m_tree.insertTextNode(leadingWhitespace, AllWhitespace);
@@ -2401,7 +2401,7 @@ ReprocessBuffer:
}
case InSelectInTableMode:
case InSelectMode: {
- ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode);
+ ASSERT(getInsertionMode() == InSelectMode || getInsertionMode() == InSelectInTableMode);
m_tree.insertTextNode(buffer.takeRemaining());
break;
}
@@ -2430,48 +2430,48 @@ void HTMLTreeBuilder::processCharacterBufferForInBody(CharacterTokenBuffer& buff
void HTMLTreeBuilder::processEndOfFile(AtomicHTMLToken* token)
{
ASSERT(token->type() == HTMLToken::EndOfFile);
- switch (insertionMode()) {
+ switch (getInsertionMode()) {
case InitialMode:
- ASSERT(insertionMode() == InitialMode);
+ ASSERT(getInsertionMode() == InitialMode);
defaultForInitial();
// Fall through.
case BeforeHTMLMode:
- ASSERT(insertionMode() == BeforeHTMLMode);
+ ASSERT(getInsertionMode() == BeforeHTMLMode);
defaultForBeforeHTML();
// Fall through.
case BeforeHeadMode:
- ASSERT(insertionMode() == BeforeHeadMode);
+ ASSERT(getInsertionMode() == BeforeHeadMode);
defaultForBeforeHead();
// Fall through.
case InHeadMode:
- ASSERT(insertionMode() == InHeadMode);
+ ASSERT(getInsertionMode() == InHeadMode);
defaultForInHead();
// Fall through.
case AfterHeadMode:
- ASSERT(insertionMode() == AfterHeadMode);
+ ASSERT(getInsertionMode() == AfterHeadMode);
defaultForAfterHead();
// Fall through
case InBodyMode:
case InCellMode:
case InCaptionMode:
case InRowMode:
- ASSERT(insertionMode() == InBodyMode || insertionMode() == InCellMode || insertionMode() == InCaptionMode || insertionMode() == InRowMode || insertionMode() == TemplateContentsMode);
+ ASSERT(getInsertionMode() == InBodyMode || getInsertionMode() == InCellMode || getInsertionMode() == InCaptionMode || getInsertionMode() == InRowMode || getInsertionMode() == TemplateContentsMode);
notImplemented(); // Emit parse error based on what elements are still open.
if (!m_templateInsertionModes.isEmpty() && processEndOfFileForInTemplateContents(token))
return;
break;
case AfterBodyMode:
case AfterAfterBodyMode:
- ASSERT(insertionMode() == AfterBodyMode || insertionMode() == AfterAfterBodyMode);
+ ASSERT(getInsertionMode() == AfterBodyMode || getInsertionMode() == AfterAfterBodyMode);
break;
case InHeadNoscriptMode:
- ASSERT(insertionMode() == InHeadNoscriptMode);
+ ASSERT(getInsertionMode() == InHeadNoscriptMode);
defaultForInHeadNoscript();
processEndOfFile(token);
return;
case AfterFramesetMode:
case AfterAfterFramesetMode:
- ASSERT(insertionMode() == AfterFramesetMode || insertionMode() == AfterAfterFramesetMode);
+ ASSERT(getInsertionMode() == AfterFramesetMode || getInsertionMode() == AfterAfterFramesetMode);
break;
case InColumnGroupMode:
if (m_tree.currentIsRootNode()) {
@@ -2486,7 +2486,7 @@ void HTMLTreeBuilder::processEndOfFile(AtomicHTMLToken* token)
case InTableBodyMode:
case InSelectInTableMode:
case InSelectMode:
- ASSERT(insertionMode() == InSelectMode || insertionMode() == InSelectInTableMode || insertionMode() == InTableMode || insertionMode() == InFramesetMode || insertionMode() == InTableBodyMode || insertionMode() == InColumnGroupMode);
+ ASSERT(getInsertionMode() == InSelectMode || getInsertionMode() == InSelectInTableMode || getInsertionMode() == InTableMode || getInsertionMode() == InFramesetMode || getInsertionMode() == InTableBodyMode || getInsertionMode() == InColumnGroupMode);
if (m_tree.currentNode() != m_tree.openElements()->rootNode())
parseError(token);
if (!m_templateInsertionModes.isEmpty() && processEndOfFileForInTemplateContents(token))
« no previous file with comments | « third_party/WebKit/Source/core/html/parser/HTMLTreeBuilder.h ('k') | third_party/WebKit/Source/core/html/shadow/SpinButtonElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698