<!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>[169814] trunk/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/169814">169814</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 11:36:07 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ROLLOUT: <a href="http://trac.webkit.org/projects/webkit/changeset/153510">r153510</a>: Broke Table borders on Wikipedia
https://bugs.webkit.org/show_bug.cgi?id=132802
<rdar://problem/16792562>
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::paintCollapsedBorders):
(WebCore::RenderTableCell::alignLeftRightBorderPaintRect): Deleted.
(WebCore::RenderTableCell::alignTopBottomBorderPaintRect): Deleted.
* rendering/RenderTableCell.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellh">trunk/Source/WebCore/rendering/RenderTableCell.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169813 => 169814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-11 18:06:14 UTC (rev 169813)
+++ trunk/Source/WebCore/ChangeLog 2014-06-11 18:36:07 UTC (rev 169814)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-11 Brent Fulgham <bfulgham@apple.com>
+
+ ROLLOUT: r153510: Broke Table borders on Wikipedia
+ https://bugs.webkit.org/show_bug.cgi?id=132802
+ <rdar://problem/16792562>
+
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::paintCollapsedBorders):
+ (WebCore::RenderTableCell::alignLeftRightBorderPaintRect): Deleted.
+ (WebCore::RenderTableCell::alignTopBottomBorderPaintRect): Deleted.
+ * rendering/RenderTableCell.h:
+
</ins><span class="cx"> 2014-06-11 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Curl] Empty headers in request response.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (169813 => 169814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2014-06-11 18:06:14 UTC (rev 169813)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2014-06-11 18:36:07 UTC (rev 169814)
</span><span class="lines">@@ -1136,31 +1136,6 @@
</span><span class="cx"> compareBorderValuesForQSort);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderTableCell::alignLeftRightBorderPaintRect(int& leftXOffset, int& rightXOffset)
-{
- const RenderStyle& styleForTopCell = styleForCellFlow();
- int left = cachedCollapsedLeftBorder(&styleForTopCell).width();
- int right = cachedCollapsedRightBorder(&styleForTopCell).width();
- leftXOffset = std::max<int>(leftXOffset, left);
- rightXOffset = std::max<int>(rightXOffset, right);
- if (colSpan() > 1)
- return false;
- return true;
-}
-
-bool RenderTableCell::alignTopBottomBorderPaintRect(int& topYOffset, int& bottomYOffset)
-{
- const RenderStyle& styleForBottomCell = styleForCellFlow();
- int top = cachedCollapsedTopBorder(&styleForBottomCell).width();
- int bottom = cachedCollapsedBottomBorder(&styleForBottomCell).width();
- topYOffset = std::max<int>(topYOffset, top);
- bottomYOffset = std::max<int>(bottomYOffset, bottom);
- if (rowSpan() > 1)
- return false;
- return true;
-}
-
-
</del><span class="cx"> void RenderTableCell::paintCollapsedBorders(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(paintInfo.phase == PaintPhaseCollapsedTableBorders);
</span><span class="lines">@@ -1194,36 +1169,6 @@
</span><span class="cx"> int leftWidth = leftVal.width();
</span><span class="cx"> int rightWidth = rightVal.width();
</span><span class="cx">
</span><del>- int leftXOffsetTop = leftWidth;
- int leftXOffsetBottom = leftWidth;
- int rightXOffsetTop = rightWidth;
- int rightXOffsetBottom = rightWidth;
- int topYOffsetLeft = topWidth;
- int topYOffsetRight = topWidth;
- int bottomYOffsetLeft = bottomWidth;
- int bottomYOffsetRight = bottomWidth;
-
- bool shouldDrawTopBorder = true;
- bool shouldDrawLeftBorder = true;
- bool shouldDrawRightBorder = true;
-
- if (RenderTableCell* top = cellAtTop(&styleForCellFlow)) {
- shouldDrawTopBorder = top->alignLeftRightBorderPaintRect(leftXOffsetTop, rightXOffsetTop);
- if (this->colSpan() > 1)
- shouldDrawTopBorder = false;
- }
-
- if (RenderTableCell* bottom = cellAtBottom(&styleForCellFlow))
- bottom->alignLeftRightBorderPaintRect(leftXOffsetBottom, rightXOffsetBottom);
-
- if (RenderTableCell* left = cellAtLeft(&styleForCellFlow))
- shouldDrawLeftBorder = left->alignTopBottomBorderPaintRect(topYOffsetLeft, bottomYOffsetLeft);
-
- if (RenderTableCell* right = cellAtRight(&styleForCellFlow))
- shouldDrawRightBorder = right->alignTopBottomBorderPaintRect(topYOffsetRight, bottomYOffsetRight);
-
- IntRect cellRect = pixelSnappedIntRect(paintRect.x(), paintRect.y(), paintRect.width(), paintRect.height());
-
</del><span class="cx"> IntRect borderRect = pixelSnappedIntRect(paintRect.x() - leftWidth / 2,
</span><span class="cx"> paintRect.y() - topWidth / 2,
</span><span class="cx"> paintRect.width() + leftWidth / 2 + (rightWidth + 1) / 2,
</span><span class="lines">@@ -1234,34 +1179,19 @@
</span><span class="cx"> EBorderStyle leftStyle = collapsedBorderStyle(leftVal.style());
</span><span class="cx"> EBorderStyle rightStyle = collapsedBorderStyle(rightVal.style());
</span><span class="cx">
</span><del>- bool renderTop = topStyle > BHIDDEN && !topVal.isTransparent() && shouldDrawTopBorder;
</del><ins>+ bool renderTop = topStyle > BHIDDEN && !topVal.isTransparent();
</ins><span class="cx"> bool renderBottom = bottomStyle > BHIDDEN && !bottomVal.isTransparent();
</span><del>- bool renderLeft = leftStyle > BHIDDEN && !leftVal.isTransparent() && shouldDrawLeftBorder;
- bool renderRight = rightStyle > BHIDDEN && !rightVal.isTransparent() && shouldDrawRightBorder;
</del><ins>+ bool renderLeft = leftStyle > BHIDDEN && !leftVal.isTransparent();
+ bool renderRight = rightStyle > BHIDDEN && !rightVal.isTransparent();
</ins><span class="cx">
</span><span class="cx"> // We never paint diagonals at the joins. We simply let the border with the highest
</span><span class="cx"> // precedence paint on top of borders with lower precedence.
</span><span class="cx"> CollapsedBorders borders;
</span><del>- if (topVal.style() == DOTTED)
- borders.addBorder(topVal, BSTop, renderTop, cellRect.x() - leftXOffsetTop / 2, cellRect.y() - topWidth / 2, cellRect.maxX() + rightXOffsetTop / 2, cellRect.y() + topWidth / 2 + topWidth % 2, topStyle);
- else
- borders.addBorder(topVal, BSTop, renderTop, borderRect.x(), borderRect.y(), borderRect.maxX(), borderRect.y() + topWidth, topStyle);
</del><ins>+ borders.addBorder(topVal, BSTop, renderTop, borderRect.x(), borderRect.y(), borderRect.maxX(), borderRect.y() + topWidth, topStyle);
+ borders.addBorder(bottomVal, BSBottom, renderBottom, borderRect.x(), borderRect.maxY() - bottomWidth, borderRect.maxX(), borderRect.maxY(), bottomStyle);
+ borders.addBorder(leftVal, BSLeft, renderLeft, borderRect.x(), borderRect.y(), borderRect.x() + leftWidth, borderRect.maxY(), leftStyle);
+ borders.addBorder(rightVal, BSRight, renderRight, borderRect.maxX() - rightWidth, borderRect.y(), borderRect.maxX(), borderRect.maxY(), rightStyle);
</ins><span class="cx">
</span><del>- if (bottomVal.style() == DOTTED)
- borders.addBorder(bottomVal, BSBottom, renderBottom, cellRect.x() - leftXOffsetBottom / 2, cellRect.maxY() - bottomWidth / 2, cellRect.maxX() + rightXOffsetBottom / 2, cellRect.maxY() + bottomWidth / 2 + bottomWidth % 2, bottomStyle);
- else
- borders.addBorder(bottomVal, BSBottom, renderBottom, borderRect.x(), borderRect.maxY() - bottomWidth, borderRect.maxX(), borderRect.maxY(), bottomStyle);
-
- if (leftVal.style() == DOTTED)
- borders.addBorder(leftVal, BSLeft, renderLeft, cellRect.x() - leftWidth / 2, cellRect.y() - topYOffsetLeft / 2, cellRect.x() + leftWidth / 2 + leftWidth % 2, cellRect.maxY() + bottomYOffsetLeft / 2 + bottomYOffsetLeft % 2, leftStyle);
- else
- borders.addBorder(leftVal, BSLeft, renderLeft, borderRect.x(), borderRect.y(), borderRect.x() + leftWidth, borderRect.maxY(), leftStyle);
-
- if (rightVal.style() == DOTTED)
- borders.addBorder(rightVal, BSRight, renderRight, cellRect.maxX() - rightWidth / 2, cellRect.y() - topYOffsetRight / 2, cellRect.maxX() + rightWidth / 2 + rightWidth % 2, cellRect.maxY() + bottomYOffsetRight / 2 + bottomYOffsetRight % 2, rightStyle);
- else
- borders.addBorder(rightVal, BSRight, renderRight, borderRect.maxX() - rightWidth, borderRect.y(), borderRect.maxX(), borderRect.maxY(), rightStyle);
-
</del><span class="cx"> bool antialias = shouldAntialiasLines(graphicsContext);
</span><span class="cx">
</span><span class="cx"> for (CollapsedBorder* border = borders.nextBorder(); border; border = borders.nextBorder()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (169813 => 169814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.h 2014-06-11 18:06:14 UTC (rev 169813)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h 2014-06-11 18:36:07 UTC (rev 169814)
</span><span class="lines">@@ -126,8 +126,6 @@
</span><span class="cx">
</span><span class="cx"> virtual void paint(PaintInfo&, const LayoutPoint&) override;
</span><span class="cx">
</span><del>- bool alignLeftRightBorderPaintRect(int& leftXOffset, int& rightXOffset);
- bool alignTopBottomBorderPaintRect(int& topYOffset, int& bottomYOffset);
</del><span class="cx"> void paintCollapsedBorders(PaintInfo&, const LayoutPoint&);
</span><span class="cx"> void paintBackgroundsBehindCell(PaintInfo&, const LayoutPoint&, RenderElement* backgroundObject);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>