<!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>[203705] 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/203705">203705</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-25 19:15:56 -0700 (Mon, 25 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderBox::haveSameDirection is used only by table items.
https://bugs.webkit.org/show_bug.cgi?id=160141
Reviewed by Simon Fraser.
Remove RenderBox::haveSameDirection() since it's used only by RenderTable*
classes. The new stand alone function (with 2 arguments) now checks if both of
the objects are valid.
No change in functionality.
* rendering/RenderBox.h:
(WebCore::RenderBox::hasSameDirectionAs): Deleted.
* rendering/RenderTable.cpp:
(WebCore::RenderTable::tableStartBorderAdjoiningCell):
(WebCore::RenderTable::tableEndBorderAdjoiningCell):
* rendering/RenderTable.h:
(WebCore::haveSameDirection):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::hasStartBorderAdjoiningTable):
(WebCore::RenderTableCell::hasEndBorderAdjoiningTable):
* rendering/RenderTableCell.h:
(WebCore::RenderTableCell::borderAdjoiningTableStart):
(WebCore::RenderTableCell::borderAdjoiningTableEnd):
* rendering/RenderTableRow.h:
(WebCore::RenderTableRow::borderAdjoiningTableStart):
(WebCore::RenderTableRow::borderAdjoiningTableEnd):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::borderAdjoiningStartCell):
(WebCore::RenderTableSection::borderAdjoiningEndCell):
(WebCore::RenderTableSection::firstRowCellAdjoiningTableStart):
(WebCore::RenderTableSection::firstRowCellAdjoiningTableEnd):
* rendering/RenderTableSection.h:
(WebCore::RenderTableSection::borderAdjoiningTableStart):
(WebCore::RenderTableSection::borderAdjoiningTableEnd):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableh">trunk/Source/WebCore/rendering/RenderTable.h</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>
<li><a href="#trunkSourceWebCorerenderingRenderTableRowh">trunk/Source/WebCore/rendering/RenderTableRow.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectionh">trunk/Source/WebCore/rendering/RenderTableSection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/ChangeLog 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2016-07-25 Zalan Bujtas <zalan@apple.com>
+
+ RenderBox::haveSameDirection is used only by table items.
+ https://bugs.webkit.org/show_bug.cgi?id=160141
+
+ Reviewed by Simon Fraser.
+
+ Remove RenderBox::haveSameDirection() since it's used only by RenderTable*
+ classes. The new stand alone function (with 2 arguments) now checks if both of
+ the objects are valid.
+
+ No change in functionality.
+
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::hasSameDirectionAs): Deleted.
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::tableStartBorderAdjoiningCell):
+ (WebCore::RenderTable::tableEndBorderAdjoiningCell):
+ * rendering/RenderTable.h:
+ (WebCore::haveSameDirection):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::hasStartBorderAdjoiningTable):
+ (WebCore::RenderTableCell::hasEndBorderAdjoiningTable):
+ * rendering/RenderTableCell.h:
+ (WebCore::RenderTableCell::borderAdjoiningTableStart):
+ (WebCore::RenderTableCell::borderAdjoiningTableEnd):
+ * rendering/RenderTableRow.h:
+ (WebCore::RenderTableRow::borderAdjoiningTableStart):
+ (WebCore::RenderTableRow::borderAdjoiningTableEnd):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::borderAdjoiningStartCell):
+ (WebCore::RenderTableSection::borderAdjoiningEndCell):
+ (WebCore::RenderTableSection::firstRowCellAdjoiningTableStart):
+ (WebCore::RenderTableSection::firstRowCellAdjoiningTableEnd):
+ * rendering/RenderTableSection.h:
+ (WebCore::RenderTableSection::borderAdjoiningTableStart):
+ (WebCore::RenderTableSection::borderAdjoiningTableEnd):
+
</ins><span class="cx"> 2016-07-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> ClientRect properties should be on the prototype
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -604,8 +604,6 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool hasSameDirectionAs(const RenderBox* object) const { return style().direction() == object->style().direction(); }
-
</del><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> ShapeOutsideInfo* shapeOutsideInfo() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -1565,7 +1565,7 @@
</span><span class="cx"> const BorderValue& RenderTable::tableStartBorderAdjoiningCell(const RenderTableCell& cell) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell.isFirstOrLastCellInRow());
</span><del>- if (hasSameDirectionAs(cell.row()))
</del><ins>+ if (isDirectionSame(this, cell.row()))
</ins><span class="cx"> return style().borderStart();
</span><span class="cx">
</span><span class="cx"> return style().borderEnd();
</span><span class="lines">@@ -1574,7 +1574,7 @@
</span><span class="cx"> const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCell& cell) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell.isFirstOrLastCellInRow());
</span><del>- if (hasSameDirectionAs(cell.row()))
</del><ins>+ if (isDirectionSame(this, cell.row()))
</ins><span class="cx"> return style().borderEnd();
</span><span class="cx">
</span><span class="cx"> return style().borderStart();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.h (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.h 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTable.h 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -378,6 +378,8 @@
</span><span class="cx"> return m_foot;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool isDirectionSame(const RenderBox* tableItem, const RenderBox* otherTableItem) { return tableItem && otherTableItem ? tableItem->style().direction() == otherTableItem->style().direction() : true; }
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderTable, isTable())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -506,7 +506,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool isStartColumn = !col();
</span><span class="cx"> bool isEndColumn = table()->colToEffCol(col() + colSpan() - 1) == table()->numEffCols() - 1;
</span><del>- bool hasSameDirectionAsTable = hasSameDirectionAs(section());
</del><ins>+ bool hasSameDirectionAsTable = isDirectionSame(this, section());
</ins><span class="cx">
</span><span class="cx"> // The table direction determines the row direction. In mixed directionality, we cannot guarantee that
</span><span class="cx"> // we have a common border with the table (think a ltr table with rtl start cell).
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool isStartColumn = !col();
</span><span class="cx"> bool isEndColumn = table()->colToEffCol(col() + colSpan() - 1) == table()->numEffCols() - 1;
</span><del>- bool hasSameDirectionAsTable = hasSameDirectionAs(section());
</del><ins>+ bool hasSameDirectionAsTable = isDirectionSame(this, section());
</ins><span class="cx">
</span><span class="cx"> // The table direction determines the row direction. In mixed directionality, we cannot guarantee that
</span><span class="cx"> // we have a common border with the table (think a ltr table with ltr end cell).
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.h 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> inline const BorderValue& RenderTableCell::borderAdjoiningTableStart() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isFirstOrLastCellInRow());
</span><del>- if (section()->hasSameDirectionAs(table()))
</del><ins>+ if (isDirectionSame(section(), table()))
</ins><span class="cx"> return style().borderStart();
</span><span class="cx">
</span><span class="cx"> return style().borderEnd();
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> inline const BorderValue& RenderTableCell::borderAdjoiningTableEnd() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isFirstOrLastCellInRow());
</span><del>- if (section()->hasSameDirectionAs(table()))
</del><ins>+ if (isDirectionSame(section(), table()))
</ins><span class="cx"> return style().borderEnd();
</span><span class="cx">
</span><span class="cx"> return style().borderStart();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableRowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableRow.h (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableRow.h 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTableRow.h 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -107,8 +107,7 @@
</span><span class="cx">
</span><span class="cx"> inline const BorderValue& RenderTableRow::borderAdjoiningTableStart() const
</span><span class="cx"> {
</span><del>- RenderTableSection* section = this->section();
- if (section && section->hasSameDirectionAs(table()))
</del><ins>+ if (isDirectionSame(section(), table()))
</ins><span class="cx"> return style().borderStart();
</span><span class="cx"> return style().borderEnd();
</span><span class="cx"> }
</span><span class="lines">@@ -115,8 +114,7 @@
</span><span class="cx">
</span><span class="cx"> inline const BorderValue& RenderTableRow::borderAdjoiningTableEnd() const
</span><span class="cx"> {
</span><del>- RenderTableSection* section = this->section();
- if (section && section->hasSameDirectionAs(table()))
</del><ins>+ if (isDirectionSame(section(), table()))
</ins><span class="cx"> return style().borderEnd();
</span><span class="cx"> return style().borderStart();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -1422,24 +1422,24 @@
</span><span class="cx"> const BorderValue& RenderTableSection::borderAdjoiningStartCell(const RenderTableCell& cell) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell.isFirstOrLastCellInRow());
</span><del>- return hasSameDirectionAs(&cell) ? style().borderStart() : style().borderEnd();
</del><ins>+ return isDirectionSame(this, &cell) ? style().borderStart() : style().borderEnd();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const BorderValue& RenderTableSection::borderAdjoiningEndCell(const RenderTableCell& cell) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell.isFirstOrLastCellInRow());
</span><del>- return hasSameDirectionAs(&cell) ? style().borderEnd() : style().borderStart();
</del><ins>+ return isDirectionSame(this, &cell) ? style().borderEnd() : style().borderStart();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const RenderTableCell* RenderTableSection::firstRowCellAdjoiningTableStart() const
</span><span class="cx"> {
</span><del>- unsigned adjoiningStartCellColumnIndex = hasSameDirectionAs(table()) ? 0 : table()->lastColumnIndex();
</del><ins>+ unsigned adjoiningStartCellColumnIndex = isDirectionSame(this, table()) ? 0 : table()->lastColumnIndex();
</ins><span class="cx"> return cellAt(0, adjoiningStartCellColumnIndex).primaryCell();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const RenderTableCell* RenderTableSection::firstRowCellAdjoiningTableEnd() const
</span><span class="cx"> {
</span><del>- unsigned adjoiningEndCellColumnIndex = hasSameDirectionAs(table()) ? table()->lastColumnIndex() : 0;
</del><ins>+ unsigned adjoiningEndCellColumnIndex = isDirectionSame(this, table()) ? table()->lastColumnIndex() : 0;
</ins><span class="cx"> return cellAt(0, adjoiningEndCellColumnIndex).primaryCell();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.h (203704 => 203705)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.h 2016-07-26 01:05:43 UTC (rev 203704)
+++ trunk/Source/WebCore/rendering/RenderTableSection.h 2016-07-26 02:15:56 UTC (rev 203705)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">
</span><span class="cx"> inline const BorderValue& RenderTableSection::borderAdjoiningTableStart() const
</span><span class="cx"> {
</span><del>- if (hasSameDirectionAs(table()))
</del><ins>+ if (isDirectionSame(this, table()))
</ins><span class="cx"> return style().borderStart();
</span><span class="cx"> return style().borderEnd();
</span><span class="cx"> }
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx">
</span><span class="cx"> inline const BorderValue& RenderTableSection::borderAdjoiningTableEnd() const
</span><span class="cx"> {
</span><del>- if (hasSameDirectionAs(table()))
</del><ins>+ if (isDirectionSame(this, table()))
</ins><span class="cx"> return style().borderEnd();
</span><span class="cx"> return style().borderStart();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>