<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[62911] trunk/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/62911">62911</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2010-07-09 01:02:06 -0700 (Fri, 09 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>2010-07-09 Eric Seidel <eric@webkit.org>
Reviewed by Adam Barth.
Move more mode handling into functions for later re-use
https://bugs.webkit.org/show_bug.cgi?id=41939
No functional changes, thus no tests.
* html/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processEndTagForInTableBody):
(WebCore::HTMLTreeBuilder::processEndTagForInRow):
(WebCore::HTMLTreeBuilder::processEndTagForInCell):
(WebCore::HTMLTreeBuilder::processEndTag):
* html/HTMLTreeBuilder.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorehtmlHTMLTreeBuildercpp">trunk/WebCore/html/HTMLTreeBuilder.cpp</a></li>
<li><a href="#trunkWebCorehtmlHTMLTreeBuilderh">trunk/WebCore/html/HTMLTreeBuilder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (62910 => 62911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog 2010-07-09 07:51:16 UTC (rev 62910)
+++ trunk/WebCore/ChangeLog 2010-07-09 08:02:06 UTC (rev 62911)
</span><span class="lines">@@ -2,6 +2,22 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Adam Barth.
</span><span class="cx">
</span><ins>+ Move more mode handling into functions for later re-use
+ https://bugs.webkit.org/show_bug.cgi?id=41939
+
+ No functional changes, thus no tests.
+
+ * html/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::processEndTagForInTableBody):
+ (WebCore::HTMLTreeBuilder::processEndTagForInRow):
+ (WebCore::HTMLTreeBuilder::processEndTagForInCell):
+ (WebCore::HTMLTreeBuilder::processEndTag):
+ * html/HTMLTreeBuilder.h:
+
+2010-07-09 Eric Seidel <eric@webkit.org>
+
+ Reviewed by Adam Barth.
+
</ins><span class="cx"> Add new popUntilPopped functions to clean up code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=41936
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLTreeBuilder.cpp (62910 => 62911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLTreeBuilder.cpp 2010-07-09 07:51:16 UTC (rev 62910)
+++ trunk/WebCore/html/HTMLTreeBuilder.cpp 2010-07-09 08:02:06 UTC (rev 62911)
</span><span class="lines">@@ -1513,6 +1513,119 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void HTMLTreeBuilder::processEndTagForInTableBody(AtomicHTMLToken& token)
+{
+ ASSERT(token.type() == HTMLToken::EndTag);
+ if (isTableBodyContextTag(token.name())) {
+ if (!m_tree.openElements()->inTableScope(token.name())) {
+ parseError(token);
+ return;
+ }
+ m_tree.openElements()->popUntilTableBodyScopeMarker();
+ m_tree.openElements()->pop();
+ m_insertionMode = InTableMode;
+ return;
+ }
+ if (token.name() == tableTag) {
+ // FIXME: This is slow.
+ if (!m_tree.openElements()->inTableScope(tbodyTag.localName()) && !m_tree.openElements()->inTableScope(theadTag.localName()) && !m_tree.openElements()->inTableScope(tfootTag.localName())) {
+ ASSERT(m_isParsingFragment);
+ parseError(token);
+ return;
+ }
+ m_tree.openElements()->popUntilTableBodyScopeMarker();
+ ASSERT(isTableBodyContextTag(m_tree.currentElement()->localName()));
+ processFakeEndTag(m_tree.currentElement()->tagQName());
+ processEndTag(token);
+ return;
+ }
+ if (token.name() == bodyTag
+ || isCaptionColOrColgroupTag(token.name())
+ || token.name() == htmlTag
+ || isTableCellContextTag(token.name())
+ || token.name() == trTag) {
+ parseError(token);
+ return;
+ }
+ processEndTagForInTable(token);
+}
+
+void HTMLTreeBuilder::processEndTagForInRow(AtomicHTMLToken& token)
+{
+ ASSERT(token.type() == HTMLToken::EndTag);
+ if (token.name() == trTag) {
+ processTrEndTagForInRow();
+ return;
+ }
+ if (token.name() == tableTag) {
+ if (!processTrEndTagForInRow()) {
+ ASSERT(m_isParsingFragment);
+ return;
+ }
+ ASSERT(insertionMode() == InTableBodyMode);
+ processEndTag(token);
+ return;
+ }
+ if (isTableBodyContextTag(token.name())) {
+ if (!m_tree.openElements()->inTableScope(token.name())) {
+ parseError(token);
+ return;
+ }
+ processFakeEndTag(trTag);
+ ASSERT(insertionMode() == InTableBodyMode);
+ processEndTag(token);
+ return;
+ }
+ if (token.name() == bodyTag
+ || isCaptionColOrColgroupTag(token.name())
+ || token.name() == htmlTag
+ || isTableCellContextTag(token.name())) {
+ parseError(token);
+ return;
+ }
+ processEndTagForInTable(token);
+}
+
+void HTMLTreeBuilder::processEndTagForInCell(AtomicHTMLToken& token)
+{
+ ASSERT(token.type() == HTMLToken::EndTag);
+ if (isTableCellContextTag(token.name())) {
+ if (!m_tree.openElements()->inTableScope(token.name())) {
+ parseError(token);
+ return;
+ }
+ m_tree.generateImpliedEndTags();
+ if (!m_tree.currentElement()->hasLocalName(token.name()))
+ parseError(token);
+ m_tree.openElements()->popUntilPopped(token.name());
+ m_tree.activeFormattingElements()->clearToLastMarker();
+ m_insertionMode = InRowMode;
+ ASSERT(m_tree.currentElement()->hasTagName(trTag));
+ return;
+ }
+ if (token.name() == bodyTag
+ || isCaptionColOrColgroupTag(token.name())
+ || token.name() == htmlTag) {
+ parseError(token);
+ return;
+ }
+ if (token.name() == tableTag
+ || token.name() == trTag
+ || isTableBodyContextTag(token.name())) {
+ if (!m_tree.openElements()->inTableScope(token.name())) {
+ ASSERT(m_isParsingFragment);
+ // FIXME: It is unclear what the exact ASSERT should be.
+ // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10098
+ parseError(token);
+ return;
+ }
+ closeTheCell();
+ processEndTag(token);
+ return;
+ }
+ processEndTagForInBody(token);
+}
+
</ins><span class="cx"> void HTMLTreeBuilder::processEndTagForInBody(AtomicHTMLToken& token)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(token.type() == HTMLToken::EndTag);
</span><span class="lines">@@ -1807,110 +1920,15 @@
</span><span class="cx"> break;
</span><span class="cx"> case InRowMode:
</span><span class="cx"> ASSERT(insertionMode() == InRowMode);
</span><del>- if (token.name() == trTag) {
- processTrEndTagForInRow();
- return;
- }
- if (token.name() == tableTag) {
- if (!processTrEndTagForInRow()) {
- ASSERT(m_isParsingFragment);
- return;
- }
- ASSERT(insertionMode() == InTableBodyMode);
- processEndTag(token);
- return;
- }
- if (isTableBodyContextTag(token.name())) {
- if (!m_tree.openElements()->inTableScope(token.name())) {
- parseError(token);
- return;
- }
- processFakeEndTag(trTag);
- ASSERT(insertionMode() == InTableBodyMode);
- processEndTag(token);
- return;
- }
- if (token.name() == bodyTag
- || isCaptionColOrColgroupTag(token.name())
- || token.name() == htmlTag
- || isTableCellContextTag(token.name())) {
- parseError(token);
- return;
- }
- processEndTagForInTable(token);
</del><ins>+ processEndTagForInRow(token);
</ins><span class="cx"> break;
</span><span class="cx"> case InCellMode:
</span><span class="cx"> ASSERT(insertionMode() == InCellMode);
</span><del>- if (isTableCellContextTag(token.name())) {
- if (!m_tree.openElements()->inTableScope(token.name())) {
- parseError(token);
- return;
- }
- m_tree.generateImpliedEndTags();
- if (!m_tree.currentElement()->hasLocalName(token.name()))
- parseError(token);
- m_tree.openElements()->popUntilPopped(token.name());
- m_tree.activeFormattingElements()->clearToLastMarker();
- m_insertionMode = InRowMode;
- ASSERT(m_tree.currentElement()->hasTagName(trTag));
- return;
- }
- if (token.name() == bodyTag
- || isCaptionColOrColgroupTag(token.name())
- || token.name() == htmlTag) {
- parseError(token);
- return;
- }
- if (token.name() == tableTag
- || token.name() == trTag
- || isTableBodyContextTag(token.name())) {
- if (!m_tree.openElements()->inTableScope(token.name())) {
- ASSERT(m_isParsingFragment);
- // FIXME: It is unclear what the exact ASSERT should be.
- // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10098
- parseError(token);
- return;
- }
- closeTheCell();
- processEndTag(token);
- return;
- }
- processEndTagForInBody(token);
</del><ins>+ processEndTagForInCell(token);
</ins><span class="cx"> break;
</span><span class="cx"> case InTableBodyMode:
</span><span class="cx"> ASSERT(insertionMode() == InTableBodyMode);
</span><del>- if (isTableBodyContextTag(token.name())) {
- if (!m_tree.openElements()->inTableScope(token.name())) {
- parseError(token);
- return;
- }
- m_tree.openElements()->popUntilTableBodyScopeMarker();
- m_tree.openElements()->pop();
- m_insertionMode = InTableMode;
- return;
- }
- if (token.name() == tableTag) {
- // FIXME: This is slow.
- if (!m_tree.openElements()->inTableScope(tbodyTag.localName()) && !m_tree.openElements()->inTableScope(theadTag.localName()) && !m_tree.openElements()->inTableScope(tfootTag.localName())) {
- ASSERT(m_isParsingFragment);
- parseError(token);
- return;
- }
- m_tree.openElements()->popUntilTableBodyScopeMarker();
- ASSERT(isTableBodyContextTag(m_tree.currentElement()->localName()));
- processFakeEndTag(m_tree.currentElement()->tagQName());
- processEndTag(token);
- return;
- }
- if (token.name() == bodyTag
- || isCaptionColOrColgroupTag(token.name())
- || token.name() == htmlTag
- || isTableCellContextTag(token.name())
- || token.name() == trTag) {
- parseError(token);
- return;
- }
- processEndTagForInTable(token);
</del><ins>+ processEndTagForInTableBody(token);
</ins><span class="cx"> break;
</span><span class="cx"> case AfterBodyMode:
</span><span class="cx"> ASSERT(insertionMode() == AfterBodyMode);
</span></span></pre></div>
<a id="trunkWebCorehtmlHTMLTreeBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/html/HTMLTreeBuilder.h (62910 => 62911)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/html/HTMLTreeBuilder.h 2010-07-09 07:51:16 UTC (rev 62910)
+++ trunk/WebCore/html/HTMLTreeBuilder.h 2010-07-09 08:02:06 UTC (rev 62911)
</span><span class="lines">@@ -119,6 +119,9 @@
</span><span class="cx"> void processStartTagForInTable(AtomicHTMLToken&);
</span><span class="cx"> void processEndTagForInBody(AtomicHTMLToken&);
</span><span class="cx"> void processEndTagForInTable(AtomicHTMLToken&);
</span><ins>+ void processEndTagForInTableBody(AtomicHTMLToken&);
+ void processEndTagForInRow(AtomicHTMLToken&);
+ void processEndTagForInCell(AtomicHTMLToken&);
</ins><span class="cx">
</span><span class="cx"> void processIsindexStartTagForInBody(AtomicHTMLToken&);
</span><span class="cx"> bool processBodyEndTagForInBody(AtomicHTMLToken&);
</span></span></pre>
</div>
</div>
</body>
</html>