Changeset 203657 in webkit


Ignore:
Timestamp:
Jul 23, 2016, 6:39:13 PM (9 years ago)
Author:
Alan Bujtas
Message:

table*BorderAdjoiningCell and borderAdjoiningCell* should take reference instead of RenderTableCell*.
​https://bugs.webkit.org/show_bug.cgi?id=160123

Reviewed by Simon Fraser.

No change in functionality.

  • rendering/RenderTable.cpp:

(WebCore::RenderTable::tableStartBorderAdjoiningCell):
(WebCore::RenderTable::tableEndBorderAdjoiningCell):

  • rendering/RenderTable.h:
  • rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::computeCollapsedStartBorder):
(WebCore::RenderTableCell::computeCollapsedEndBorder):

  • rendering/RenderTableCell.h:

(WebCore::RenderTableCell::borderAdjoiningCellBefore):
(WebCore::RenderTableCell::borderAdjoiningCellAfter):

  • rendering/RenderTableCol.cpp:

(WebCore::RenderTableCol::borderAdjoiningCellStartBorder):
(WebCore::RenderTableCol::borderAdjoiningCellEndBorder):
(WebCore::RenderTableCol::borderAdjoiningCellBefore):
(WebCore::RenderTableCol::borderAdjoiningCellAfter):

  • rendering/RenderTableCol.h:
  • rendering/RenderTableRow.cpp:

(WebCore::RenderTableRow::borderAdjoiningStartCell):
(WebCore::RenderTableRow::borderAdjoiningEndCell):

  • rendering/RenderTableRow.h:
  • rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::borderAdjoiningStartCell):
(WebCore::RenderTableSection::borderAdjoiningEndCell):

  • rendering/RenderTableSection.h:
Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r203656 r203657  
     12016-07-23  Zalan Bujtas  <zalan@apple.com>
     2
     3        table*BorderAdjoiningCell and borderAdjoiningCell* should take reference instead of RenderTableCell*.
     4        https://bugs.webkit.org/show_bug.cgi?id=160123
     5
     6        Reviewed by Simon Fraser.
     7
     8        No change in functionality.
     9
     10        * rendering/RenderTable.cpp:
     11        (WebCore::RenderTable::tableStartBorderAdjoiningCell):
     12        (WebCore::RenderTable::tableEndBorderAdjoiningCell):
     13        * rendering/RenderTable.h:
     14        * rendering/RenderTableCell.cpp:
     15        (WebCore::RenderTableCell::computeCollapsedStartBorder):
     16        (WebCore::RenderTableCell::computeCollapsedEndBorder):
     17        * rendering/RenderTableCell.h:
     18        (WebCore::RenderTableCell::borderAdjoiningCellBefore):
     19        (WebCore::RenderTableCell::borderAdjoiningCellAfter):
     20        * rendering/RenderTableCol.cpp:
     21        (WebCore::RenderTableCol::borderAdjoiningCellStartBorder):
     22        (WebCore::RenderTableCol::borderAdjoiningCellEndBorder):
     23        (WebCore::RenderTableCol::borderAdjoiningCellBefore):
     24        (WebCore::RenderTableCol::borderAdjoiningCellAfter):
     25        * rendering/RenderTableCol.h:
     26        * rendering/RenderTableRow.cpp:
     27        (WebCore::RenderTableRow::borderAdjoiningStartCell):
     28        (WebCore::RenderTableRow::borderAdjoiningEndCell):
     29        * rendering/RenderTableRow.h:
     30        * rendering/RenderTableSection.cpp:
     31        (WebCore::RenderTableSection::borderAdjoiningStartCell):
     32        (WebCore::RenderTableSection::borderAdjoiningEndCell):
     33        * rendering/RenderTableSection.h:
     34
    1352016-07-23  Zalan Bujtas  <zalan@apple.com>
    236

  • trunk/Source/WebCore/rendering/RenderTable.cpp

    r201346 r203657  
    15631563}
    15641564
    1565 const BorderValue& RenderTable::tableStartBorderAdjoiningCell(const RenderTableCell* cell) const
    1566 {
    1567     ASSERT(cell->isFirstOrLastCellInRow());
    1568     if (hasSameDirectionAs(cell->row()))
     1565const BorderValue& RenderTable::tableStartBorderAdjoiningCell(const RenderTableCell& cell) const
     1566{
     1567    ASSERT(cell.isFirstOrLastCellInRow());
     1568    if (hasSameDirectionAs(cell.row()))
    15691569        return style().borderStart();
    15701570
    … …  
    15721572}
    15731573
    1574 const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCell* cell) const
    1575 {
    1576     ASSERT(cell->isFirstOrLastCellInRow());
    1577     if (hasSameDirectionAs(cell->row()))
     1574const BorderValue& RenderTable::tableEndBorderAdjoiningCell(const RenderTableCell& cell) const
     1575{
     1576    ASSERT(cell.isFirstOrLastCellInRow());
     1577    if (hasSameDirectionAs(cell.row()))
    15781578        return style().borderEnd();
    15791579

  • trunk/Source/WebCore/rendering/RenderTable.h

    r200041 r203657  
    258258    }
    259259
    260     const BorderValue& tableStartBorderAdjoiningCell(const RenderTableCell*) const;
    261     const BorderValue& tableEndBorderAdjoiningCell(const RenderTableCell*) const;
     260    const BorderValue& tableStartBorderAdjoiningCell(const RenderTableCell&) const;
     261    const BorderValue& tableEndBorderAdjoiningCell(const RenderTableCell&) const;
    262262
    263263    void addCaption(const RenderTableCaption*);

  • trunk/Source/WebCore/rendering/RenderTableCell.cpp

    r203337 r203657  
    562562    RenderTableCell* cellBefore = table->cellBefore(this);
    563563    if (cellBefore) {
    564         CollapsedBorderValue cellBeforeAdjoiningBorder = CollapsedBorderValue(cellBefore->borderAdjoiningCellAfter(this), includeColor ? cellBefore->style().visitedDependentColor(endColorProperty) : Color(), BCELL);
     564        CollapsedBorderValue cellBeforeAdjoiningBorder = CollapsedBorderValue(cellBefore->borderAdjoiningCellAfter(*this), includeColor ? cellBefore->style().visitedDependentColor(endColorProperty) : Color(), BCELL);
    565565        // |result| should be the 2nd argument as |cellBefore| should win in case of equality per CSS 2.1 (Border conflict resolution, point 4).
    566566        result = chooseBorder(cellBeforeAdjoiningBorder, result);
    … …  
    572572    if (startBorderAdjoinsTable) {
    573573        // (3) Our row's start border.
    574         result = chooseBorder(result, CollapsedBorderValue(row()->borderAdjoiningStartCell(this), includeColor ? parent()->style().visitedDependentColor(startColorProperty) : Color(), BROW));
     574        result = chooseBorder(result, CollapsedBorderValue(row()->borderAdjoiningStartCell(*this), includeColor ? parent()->style().visitedDependentColor(startColorProperty) : Color(), BROW));
    575575        if (!result.exists())
    576576            return result;
    577577
    578578        // (4) Our row group's start border.
    579         result = chooseBorder(result, CollapsedBorderValue(section()->borderAdjoiningStartCell(this), includeColor ? section()->style().visitedDependentColor(startColorProperty) : Color(), BROWGROUP));
     579        result = chooseBorder(result, CollapsedBorderValue(section()->borderAdjoiningStartCell(*this), includeColor ? section()->style().visitedDependentColor(startColorProperty) : Color(), BROWGROUP));
    580580        if (!result.exists())
    581581            return result;
    … …  
    588588        if (colElt->isTableColumnGroup() && startColEdge) {
    589589            // The |colElt| is a column group and is also the first colgroup (in case of spanned colgroups).
    590             result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellStartBorder(this), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
     590            result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellStartBorder(), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
    591591            if (!result.exists())
    592592                return result;
    … …  
    595595            // its start border. This is as per HTML5 which states that: "For the purposes of the CSS table model,
    596596            // the col element is expected to be treated as if it was present as many times as its span attribute specifies".
    597             result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellStartBorder(this), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOL));
     597            result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellStartBorder(), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOL));
    598598            if (!result.exists())
    599599                return result;
    600600            // Next, apply the start border of the enclosing colgroup but only if it is adjacent to the cell's edge.
    601601            if (RenderTableCol* enclosingColumnGroup = colElt->enclosingColumnGroupIfAdjacentBefore()) {
    602                 result = chooseBorder(result, CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellStartBorder(this), includeColor ? enclosingColumnGroup->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
     602                result = chooseBorder(result, CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellStartBorder(), includeColor ? enclosingColumnGroup->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
    603603                if (!result.exists())
    604604                    return result;
    … …  
    612612            if (colElt->isTableColumnGroup() && endColEdge) {
    613613                // The element is a colgroup and is also the last colgroup (in case of spanned colgroups).
    614                 result = chooseBorder(CollapsedBorderValue(colElt->borderAdjoiningCellAfter(this), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP), result);
     614                result = chooseBorder(CollapsedBorderValue(colElt->borderAdjoiningCellAfter(*this), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP), result);
    615615                if (!result.exists())
    616616                    return result;
    617617            } else if (colElt->isTableColumn()) {
    618618                // Resolve the collapsing border against the col's border ignoring any 'span' as per HTML5.
    619                 result = chooseBorder(CollapsedBorderValue(colElt->borderAdjoiningCellAfter(this), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOL), result);
     619                result = chooseBorder(CollapsedBorderValue(colElt->borderAdjoiningCellAfter(*this), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOL), result);
    620620                if (!result.exists())
    621621                    return result;
    … …  
    623623                // but only if it is adjacent to the cell's edge.
    624624                if (RenderTableCol* enclosingColumnGroup = colElt->enclosingColumnGroupIfAdjacentAfter()) {
    625                     result = chooseBorder(CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellEndBorder(this), includeColor ? enclosingColumnGroup->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP), result);
     625                    result = chooseBorder(CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellEndBorder(), includeColor ? enclosingColumnGroup->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP), result);
    626626                    if (!result.exists())
    627627                        return result;
    … …  
    633633    if (startBorderAdjoinsTable) {
    634634        // (7) The table's start border.
    635         result = chooseBorder(result, CollapsedBorderValue(table->tableStartBorderAdjoiningCell(this), includeColor ? table->style().visitedDependentColor(startColorProperty) : Color(), BTABLE));
     635        result = chooseBorder(result, CollapsedBorderValue(table->tableStartBorderAdjoiningCell(*this), includeColor ? table->style().visitedDependentColor(startColorProperty) : Color(), BTABLE));
    636636        if (!result.exists())
    637637            return result;
    … …  
    676676    if (!isEndColumn) {
    677677        if (RenderTableCell* cellAfter = table->cellAfter(this)) {
    678             CollapsedBorderValue cellAfterAdjoiningBorder = CollapsedBorderValue(cellAfter->borderAdjoiningCellBefore(this), includeColor ? cellAfter->style().visitedDependentColor(startColorProperty) : Color(), BCELL);
     678            CollapsedBorderValue cellAfterAdjoiningBorder = CollapsedBorderValue(cellAfter->borderAdjoiningCellBefore(*this), includeColor ? cellAfter->style().visitedDependentColor(startColorProperty) : Color(), BCELL);
    679679            result = chooseBorder(result, cellAfterAdjoiningBorder);
    680680            if (!result.exists())
    … …  
    686686    if (endBorderAdjoinsTable) {
    687687        // (3) Our row's end border.
    688         result = chooseBorder(result, CollapsedBorderValue(row()->borderAdjoiningEndCell(this), includeColor ? parent()->style().visitedDependentColor(endColorProperty) : Color(), BROW));
     688        result = chooseBorder(result, CollapsedBorderValue(row()->borderAdjoiningEndCell(*this), includeColor ? parent()->style().visitedDependentColor(endColorProperty) : Color(), BROW));
    689689        if (!result.exists())
    690690            return result;
    691691       
    692692        // (4) Our row group's end border.
    693         result = chooseBorder(result, CollapsedBorderValue(section()->borderAdjoiningEndCell(this), includeColor ? section()->style().visitedDependentColor(endColorProperty) : Color(), BROWGROUP));
     693        result = chooseBorder(result, CollapsedBorderValue(section()->borderAdjoiningEndCell(*this), includeColor ? section()->style().visitedDependentColor(endColorProperty) : Color(), BROWGROUP));
    694694        if (!result.exists())
    695695            return result;
    … …  
    702702        if (colElt->isTableColumnGroup() && endColEdge) {
    703703            // The element is a colgroup and is also the last colgroup (in case of spanned colgroups).
    704             result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellEndBorder(this), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP));
     704            result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellEndBorder(), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP));
    705705            if (!result.exists())
    706706                return result;
    … …  
    709709            // HTML5 which states that: "For the purposes of the CSS table model, the col element is expected to be
    710710            // treated as if it was present as many times as its span attribute specifies".
    711             result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellEndBorder(this), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOL));
     711            result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellEndBorder(), includeColor ? colElt->style().visitedDependentColor(endColorProperty) : Color(), BCOL));
    712712            if (!result.exists())
    713713                return result;
    714714            // Next, if it has a parent colgroup then we apply its end border but only if it is adjacent to the cell.
    715715            if (RenderTableCol* enclosingColumnGroup = colElt->enclosingColumnGroupIfAdjacentAfter()) {
    716                 result = chooseBorder(result, CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellEndBorder(this), includeColor ? enclosingColumnGroup->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP));
     716                result = chooseBorder(result, CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellEndBorder(), includeColor ? enclosingColumnGroup->style().visitedDependentColor(endColorProperty) : Color(), BCOLGROUP));
    717717                if (!result.exists())
    718718                    return result;
    … …  
    726726            if (colElt->isTableColumnGroup() && startColEdge) {
    727727                // This case is a colgroup without any col, we only compute it if it is adjacent to the cell's edge.
    728                 result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellBefore(this), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
     728                result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellBefore(*this), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
    729729                if (!result.exists())
    730730                    return result;
    731731            } else if (colElt->isTableColumn()) {
    732732                // Resolve the collapsing border against the col's border ignoring any 'span' as per HTML5.
    733                 result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellBefore(this), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOL));
     733                result = chooseBorder(result, CollapsedBorderValue(colElt->borderAdjoiningCellBefore(*this), includeColor ? colElt->style().visitedDependentColor(startColorProperty) : Color(), BCOL));
    734734                if (!result.exists())
    735735                    return result;
    736736                // If we have a parent colgroup, resolve the border only if it is adjacent to the cell.
    737737                if (RenderTableCol* enclosingColumnGroup = colElt->enclosingColumnGroupIfAdjacentBefore()) {
    738                     result = chooseBorder(result, CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellStartBorder(this), includeColor ? enclosingColumnGroup->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
     738                    result = chooseBorder(result, CollapsedBorderValue(enclosingColumnGroup->borderAdjoiningCellStartBorder(), includeColor ? enclosingColumnGroup->style().visitedDependentColor(startColorProperty) : Color(), BCOLGROUP));
    739739                    if (!result.exists())
    740740                        return result;
    … …  
    746746    if (endBorderAdjoinsTable) {
    747747        // (7) The table's end border.
    748         result = chooseBorder(result, CollapsedBorderValue(table->tableEndBorderAdjoiningCell(this), includeColor ? table->style().visitedDependentColor(endColorProperty) : Color(), BTABLE));
     748        result = chooseBorder(result, CollapsedBorderValue(table->tableEndBorderAdjoiningCell(*this), includeColor ? table->style().visitedDependentColor(endColorProperty) : Color(), BTABLE));
    749749        if (!result.exists())
    750750            return result;

  • trunk/Source/WebCore/rendering/RenderTableCell.h

    r201704 r203657  
    122122    const BorderValue& borderAdjoiningTableStart() const;
    123123    const BorderValue& borderAdjoiningTableEnd() const;
    124     const BorderValue& borderAdjoiningCellBefore(const RenderTableCell*);
    125     const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*);
     124    const BorderValue& borderAdjoiningCellBefore(const RenderTableCell&);
     125    const BorderValue& borderAdjoiningCellAfter(const RenderTableCell&);
    126126
    127127    using RenderBlockFlow::nodeAtPoint;
    … …  
    317317}
    318318
    319 inline const BorderValue& RenderTableCell::borderAdjoiningCellBefore(const RenderTableCell* cell)
    320 {
    321     ASSERT_UNUSED(cell, table()->cellAfter(cell) == this);
     319inline const BorderValue& RenderTableCell::borderAdjoiningCellBefore(const RenderTableCell& cell)
     320{
     321    ASSERT_UNUSED(cell, table()->cellAfter(&cell) == this);
    322322    // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality at the cell level.
    323323    return style().borderStart();
    324324}
    325325
    326 inline const BorderValue& RenderTableCell::borderAdjoiningCellAfter(const RenderTableCell* cell)
    327 {
    328     ASSERT_UNUSED(cell, table()->cellBefore(cell) == this);
     326inline const BorderValue& RenderTableCell::borderAdjoiningCellAfter(const RenderTableCell& cell)
     327{
     328    ASSERT_UNUSED(cell, table()->cellBefore(&cell) == this);
    329329    // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality at the cell level.
    330330    return style().borderEnd();

  • trunk/Source/WebCore/rendering/RenderTableCol.cpp

    r201052 r203657  
    180180}
    181181
    182 const BorderValue& RenderTableCol::borderAdjoiningCellStartBorder(const RenderTableCell*) const
     182const BorderValue& RenderTableCol::borderAdjoiningCellStartBorder() const
    183183{
    184184    return style().borderStart();
    185185}
    186186
    187 const BorderValue& RenderTableCol::borderAdjoiningCellEndBorder(const RenderTableCell*) const
     187const BorderValue& RenderTableCol::borderAdjoiningCellEndBorder() const
    188188{
    189189    return style().borderEnd();
    190190}
    191191
    192 const BorderValue& RenderTableCol::borderAdjoiningCellBefore(const RenderTableCell* cell) const
    193 {
    194     ASSERT_UNUSED(cell, table()->colElement(cell->col() + cell->colSpan()) == this);
     192const BorderValue& RenderTableCol::borderAdjoiningCellBefore(const RenderTableCell& cell) const
     193{
     194    ASSERT_UNUSED(cell, table()->colElement(cell.col() + cell.colSpan()) == this);
    195195    return style().borderStart();
    196196}
    197197
    198 const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCell* cell) const
    199 {
    200     ASSERT_UNUSED(cell, table()->colElement(cell->col() - 1) == this);
     198const BorderValue& RenderTableCol::borderAdjoiningCellAfter(const RenderTableCell& cell) const
     199{
     200    ASSERT_UNUSED(cell, table()->colElement(cell.col() - 1) == this);
    201201    return style().borderEnd();
    202202}

  • trunk/Source/WebCore/rendering/RenderTableCol.h

    r200041 r203657  
    5555    RenderTableCol* nextColumn() const;
    5656
    57     const BorderValue& borderAdjoiningCellStartBorder(const RenderTableCell*) const;
    58     const BorderValue& borderAdjoiningCellEndBorder(const RenderTableCell*) const;
    59     const BorderValue& borderAdjoiningCellBefore(const RenderTableCell*) const;
    60     const BorderValue& borderAdjoiningCellAfter(const RenderTableCell*) const;
     57    const BorderValue& borderAdjoiningCellStartBorder() const;
     58    const BorderValue& borderAdjoiningCellEndBorder() const;
     59    const BorderValue& borderAdjoiningCellBefore(const RenderTableCell&) const;
     60    const BorderValue& borderAdjoiningCellAfter(const RenderTableCell&) const;
    6161
    6262    LayoutUnit offsetLeft() const override;

  • trunk/Source/WebCore/rendering/RenderTableRow.cpp

    r200041 r203657  
    9393}
    9494
    95 const BorderValue& RenderTableRow::borderAdjoiningStartCell(const RenderTableCell* cell) const
    96 {
    97     ASSERT_UNUSED(cell, cell->isFirstOrLastCellInRow());
     95const BorderValue& RenderTableRow::borderAdjoiningStartCell(const RenderTableCell& cell) const
     96{
     97    ASSERT_UNUSED(cell, cell.isFirstOrLastCellInRow());
    9898    // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality at the cell level.
    9999    return style().borderStart();
    100100}
    101101
    102 const BorderValue& RenderTableRow::borderAdjoiningEndCell(const RenderTableCell* cell) const
    103 {
    104     ASSERT_UNUSED(cell, cell->isFirstOrLastCellInRow());
     102const BorderValue& RenderTableRow::borderAdjoiningEndCell(const RenderTableCell& cell) const
     103{
     104    ASSERT_UNUSED(cell, cell.isFirstOrLastCellInRow());
    105105    // FIXME: https://webkit.org/b/79272 - Add support for mixed directionality at the cell level.
    106106    return style().borderEnd();

  • trunk/Source/WebCore/rendering/RenderTableRow.h

    r200041 r203657  
    5757    const BorderValue& borderAdjoiningTableStart() const;
    5858    const BorderValue& borderAdjoiningTableEnd() const;
    59     const BorderValue& borderAdjoiningStartCell(const RenderTableCell*) const;
    60     const BorderValue& borderAdjoiningEndCell(const RenderTableCell*) const;
     59    const BorderValue& borderAdjoiningStartCell(const RenderTableCell&) const;
     60    const BorderValue& borderAdjoiningEndCell(const RenderTableCell&) const;
    6161
    6262    void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;

  • trunk/Source/WebCore/rendering/RenderTableSection.cpp

    r201052 r203657  
    14201420}
    14211421
    1422 const BorderValue& RenderTableSection::borderAdjoiningStartCell(const RenderTableCell* cell) const
    1423 {
    1424     ASSERT(cell->isFirstOrLastCellInRow());
    1425     return hasSameDirectionAs(cell) ? style().borderStart() : style().borderEnd();
    1426 }
    1427 
    1428 const BorderValue& RenderTableSection::borderAdjoiningEndCell(const RenderTableCell* cell) const
    1429 {
    1430     ASSERT(cell->isFirstOrLastCellInRow());
    1431     return hasSameDirectionAs(cell) ? style().borderEnd() : style().borderStart();
     1422const BorderValue& RenderTableSection::borderAdjoiningStartCell(const RenderTableCell& cell) const
     1423{
     1424    ASSERT(cell.isFirstOrLastCellInRow());
     1425    return hasSameDirectionAs(&cell) ? style().borderStart() : style().borderEnd();
     1426}
     1427
     1428const BorderValue& RenderTableSection::borderAdjoiningEndCell(const RenderTableCell& cell) const
     1429{
     1430    ASSERT(cell.isFirstOrLastCellInRow());
     1431    return hasSameDirectionAs(&cell) ? style().borderEnd() : style().borderStart();
    14321432}
    14331433

  • trunk/Source/WebCore/rendering/RenderTableSection.h

    r200041 r203657  
    9494    const BorderValue& borderAdjoiningTableStart() const;
    9595    const BorderValue& borderAdjoiningTableEnd() const;
    96     const BorderValue& borderAdjoiningStartCell(const RenderTableCell*) const;
    97     const BorderValue& borderAdjoiningEndCell(const RenderTableCell*) const;
     96    const BorderValue& borderAdjoiningStartCell(const RenderTableCell&) const;
     97    const BorderValue& borderAdjoiningEndCell(const RenderTableCell&) const;
    9898
    9999    const RenderTableCell* firstRowCellAdjoiningTableStart() const;
Note: See TracChangeset for help on using the changeset viewer.