<!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>[173829] releases/WebKitGTK/webkit-2.6/Source/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/173829">173829</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-22 03:34:43 -0700 (Mon, 22 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173800">r173800</a> - Fix post-mortem nits for <a href="http://trac.webkit.org/projects/webkit/changeset/173724">r173724</a>
https://bugs.webkit.org/show_bug.cgi?id=136986
Reviewed by Darin Adler.
Fix post-mortem nits for <a href="http://trac.webkit.org/projects/webkit/changeset/173724">r173724</a>.
No new tests, no behavior change.
* editing/EditingStyle.cpp:
(WebCore::HTMLAttributeEquivalent::attributeValueAsCSSValue):
(WebCore::HTMLFontSizeEquivalent::attributeValueAsCSSValue):
Use nullptr instead of 0.
* editing/SplitElementCommand.cpp:
(WebCore::SplitElementCommand::doUnapply):
Use getIdAttribute() / setIdAttribute().
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::computePreferredLogicalWidths):
Use fastHasAttribute() for nowrap and do an early return to avoid
calling styleOrColLogicalWidth() if the nowrap attribute is missing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreeditingEditingStylecpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreeditingSplitElementCommandcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/SplitElementCommand.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderTableCellcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (173828 => 173829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-22 10:32:19 UTC (rev 173828)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-22 10:34:43 UTC (rev 173829)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-09-21 Christophe Dumez <cdumez@apple.com>
+
+ Fix post-mortem nits for r173724
+ https://bugs.webkit.org/show_bug.cgi?id=136986
+
+ Reviewed by Darin Adler.
+
+ Fix post-mortem nits for r173724.
+
+ No new tests, no behavior change.
+
+ * editing/EditingStyle.cpp:
+ (WebCore::HTMLAttributeEquivalent::attributeValueAsCSSValue):
+ (WebCore::HTMLFontSizeEquivalent::attributeValueAsCSSValue):
+ Use nullptr instead of 0.
+
+ * editing/SplitElementCommand.cpp:
+ (WebCore::SplitElementCommand::doUnapply):
+ Use getIdAttribute() / setIdAttribute().
+
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::computePreferredLogicalWidths):
+ Use fastHasAttribute() for nowrap and do an early return to avoid
+ calling styleOrColLogicalWidth() if the nowrap attribute is missing.
+
</ins><span class="cx"> 2014-09-19 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r173464): It broke the !ENABLE(PICTURE_SIZES) build
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/EditingStyle.cpp (173828 => 173829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/EditingStyle.cpp 2014-09-22 10:32:19 UTC (rev 173828)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/EditingStyle.cpp 2014-09-22 10:34:43 UTC (rev 173829)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> ASSERT(element);
</span><span class="cx"> const AtomicString& value = element->getAttribute(m_attrName);
</span><span class="cx"> if (value.isNull())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> RefPtr<MutableStyleProperties> dummyStyle;
</span><span class="cx"> dummyStyle = MutableStyleProperties::create();
</span><span class="lines">@@ -304,10 +304,10 @@
</span><span class="cx"> ASSERT(element);
</span><span class="cx"> const AtomicString& value = element->getAttribute(m_attrName);
</span><span class="cx"> if (value.isNull())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> CSSValueID size;
</span><span class="cx"> if (!HTMLFontElement::cssValueFromFontSizeNumber(value, size))
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> return CSSPrimitiveValue::createIdentifier(size);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreeditingSplitElementCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/SplitElementCommand.cpp (173828 => 173829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/SplitElementCommand.cpp 2014-09-22 10:32:19 UTC (rev 173828)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/editing/SplitElementCommand.cpp 2014-09-22 10:34:43 UTC (rev 173829)
</span><span class="lines">@@ -91,9 +91,9 @@
</span><span class="cx"> m_element2->insertBefore(children[i].get(), refChild.get(), IGNORE_EXCEPTION);
</span><span class="cx">
</span><span class="cx"> // Recover the id attribute of the original element.
</span><del>- const AtomicString& id = m_element1->fastGetAttribute(HTMLNames::idAttr);
</del><ins>+ const AtomicString& id = m_element1->getIdAttribute();
</ins><span class="cx"> if (!id.isNull())
</span><del>- m_element2->setAttribute(HTMLNames::idAttr, id);
</del><ins>+ m_element2->setIdAttribute(id);
</ins><span class="cx">
</span><span class="cx"> m_element1->remove(IGNORE_EXCEPTION);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderTableCell.cpp (173828 => 173829)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderTableCell.cpp 2014-09-22 10:32:19 UTC (rev 173828)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderTableCell.cpp 2014-09-22 10:34:43 UTC (rev 173829)
</span><span class="lines">@@ -175,17 +175,17 @@
</span><span class="cx"> table()->recalcSectionsIfNeeded();
</span><span class="cx">
</span><span class="cx"> RenderBlockFlow::computePreferredLogicalWidths();
</span><del>- if (element() && style().autoWrap()) {
- // See if nowrap was set.
- Length w = styleOrColLogicalWidth();
- const AtomicString& nowrap = element()->fastGetAttribute(nowrapAttr);
- if (!nowrap.isNull() && w.isFixed())
- // Nowrap is set, but we didn't actually use it because of the
- // fixed width set on the cell. Even so, it is a WinIE/Moz trait
- // to make the minwidth of the cell into the fixed width. They do this
- // even in strict mode, so do not make this a quirk. Affected the top
- // of hiptop.com.
- m_minPreferredLogicalWidth = std::max<LayoutUnit>(w.value(), m_minPreferredLogicalWidth);
</del><ins>+ if (!element() || !style().autoWrap() || !element()->fastHasAttribute(nowrapAttr))
+ return;
+
+ Length w = styleOrColLogicalWidth();
+ if (w.isFixed()) {
+ // Nowrap is set, but we didn't actually use it because of the
+ // fixed width set on the cell. Even so, it is a WinIE/Moz trait
+ // to make the minwidth of the cell into the fixed width. They do this
+ // even in strict mode, so do not make this a quirk. Affected the top
+ // of hiptop.com.
+ m_minPreferredLogicalWidth = std::max<LayoutUnit>(w.value(), m_minPreferredLogicalWidth);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>