Changeset 203705 in webkit

Timestamp:

Jul 25, 2016 7:15:56 PM (8 years ago)

Author:

Alan Bujtas

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (2 diffs)
• rendering/RenderTable.h (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (2 diffs)
• rendering/RenderTableCell.h (modified) (2 diffs)
• rendering/RenderTableRow.h (modified) (2 diffs)
• rendering/RenderTableSection.cpp (modified) (3 diffs)
• rendering/RenderTableSection.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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):
+
 2016-07-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -605 +605 @@
     }
 
-    bool hasSameDirectionAs(const RenderBox* object) const { return style().direction() == object->style().direction(); }
-
 #if ENABLE(CSS_SHAPES)
     ShapeOutsideInfo* shapeOutsideInfo() const

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -1566 +1566 @@
 {
     ASSERT(cell.isFirstOrLastCellInRow());
-    if (hasSameDirectionAs(cell.row()))
+    if (isDirectionSame(this, cell.row()))
         return style().borderStart();
 
@@ -1575 +1575 @@
 {
     ASSERT(cell.isFirstOrLastCellInRow());
-    if (hasSameDirectionAs(cell.row()))
+    if (isDirectionSame(this, cell.row()))
         return style().borderEnd();
 

trunk/Source/WebCore/rendering/RenderTable.h

@@ -379 +379 @@
 }
 
+inline bool isDirectionSame(const RenderBox* tableItem, const RenderBox* otherTableItem) { return tableItem && otherTableItem ? tableItem->style().direction() == otherTableItem->style().direction() : true; }
+
 } // namespace WebCore
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -507 +507 @@
     bool isStartColumn = !col();
     bool isEndColumn = table()->colToEffCol(col() + colSpan() - 1) == table()->numEffCols() - 1;
-    bool hasSameDirectionAsTable = hasSameDirectionAs(section());
+    bool hasSameDirectionAsTable = isDirectionSame(this, section());
 
     // The table direction determines the row direction. In mixed directionality, we cannot guarantee that
@@ -518 +518 @@
     bool isStartColumn = !col();
     bool isEndColumn = table()->colToEffCol(col() + colSpan() - 1) == table()->numEffCols() - 1;
-    bool hasSameDirectionAsTable = hasSameDirectionAs(section());
+    bool hasSameDirectionAsTable = isDirectionSame(this, section());
 
     // The table direction determines the row direction. In mixed directionality, we cannot guarantee that

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -302 +302 @@
 {
     ASSERT(isFirstOrLastCellInRow());
-    if (section()->hasSameDirectionAs(table()))
+    if (isDirectionSame(section(), table()))
         return style().borderStart();
 
@@ -311 +311 @@
 {
     ASSERT(isFirstOrLastCellInRow());
-    if (section()->hasSameDirectionAs(table()))
+    if (isDirectionSame(section(), table()))
         return style().borderEnd();
 

trunk/Source/WebCore/rendering/RenderTableRow.h

@@ -108 +108 @@
 inline const BorderValue& RenderTableRow::borderAdjoiningTableStart() const
 {
-    RenderTableSection* section = this->section();
-    if (section && section->hasSameDirectionAs(table()))
+    if (isDirectionSame(section(), table()))
         return style().borderStart();
     return style().borderEnd();
@@ -116 +115 @@
 inline const BorderValue& RenderTableRow::borderAdjoiningTableEnd() const
 {
-    RenderTableSection* section = this->section();
-    if (section && section->hasSameDirectionAs(table()))
+    if (isDirectionSame(section(), table()))
         return style().borderEnd();
     return style().borderStart();

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -1423 +1423 @@
 {
     ASSERT(cell.isFirstOrLastCellInRow());
-    return hasSameDirectionAs(&cell) ? style().borderStart() : style().borderEnd();
+    return isDirectionSame(this, &cell) ? style().borderStart() : style().borderEnd();
 }
 
@@ -1429 +1429 @@
 {
     ASSERT(cell.isFirstOrLastCellInRow());
-    return hasSameDirectionAs(&cell) ? style().borderEnd() : style().borderStart();
+    return isDirectionSame(this, &cell) ? style().borderEnd() : style().borderStart();
 }
 
 const RenderTableCell* RenderTableSection::firstRowCellAdjoiningTableStart() const
 {
-    unsigned adjoiningStartCellColumnIndex = hasSameDirectionAs(table()) ? 0 : table()->lastColumnIndex();
+    unsigned adjoiningStartCellColumnIndex = isDirectionSame(this, table()) ? 0 : table()->lastColumnIndex();
     return cellAt(0, adjoiningStartCellColumnIndex).primaryCell();
 }
@@ -1440 +1440 @@
 const RenderTableCell* RenderTableSection::firstRowCellAdjoiningTableEnd() const
 {
-    unsigned adjoiningEndCellColumnIndex = hasSameDirectionAs(table()) ? table()->lastColumnIndex() : 0;
+    unsigned adjoiningEndCellColumnIndex = isDirectionSame(this, table()) ? table()->lastColumnIndex() : 0;
     return cellAt(0, adjoiningEndCellColumnIndex).primaryCell();
 }

trunk/Source/WebCore/rendering/RenderTableSection.h

@@ -243 +243 @@
 inline const BorderValue& RenderTableSection::borderAdjoiningTableStart() const
 {
-    if (hasSameDirectionAs(table()))
+    if (isDirectionSame(this, table()))
         return style().borderStart();
     return style().borderEnd();
@@ -250 +250 @@
 inline const BorderValue& RenderTableSection::borderAdjoiningTableEnd() const
 {
-    if (hasSameDirectionAs(table()))
+    if (isDirectionSame(this, table()))
         return style().borderEnd();
     return style().borderStart();