Changeset 37219 in webkit


Ignore:
Timestamp:
Oct 2, 2008 5:41:29 PM (16 years ago)
Author:
Simon Fraser
Message:

2008-10-01 Simon Fraser <Simon Fraser>

Reviewed by Dave Hyatt

Clean up code that changes the RenderStyle passed in to
table renderer setStyle() methods.

​https://bugs.webkit.org/show_bug.cgi?id=21287

Tests: fast/table/floating-th.html

fast/table/table-display-types-strict.html
fast/table/table-display-types.html

  • css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::adjustRenderStyle):
  • rendering/RenderTableCell.cpp: (WebCore::RenderTableCell::setStyle):
  • rendering/RenderTableRow.cpp: (WebCore::RenderTableRow::setStyle):
  • rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::setStyle):
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r37217 r37219  
     12008-10-01  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Reviewed by Dave Hyatt
     4
     5        New tests for display types and float on table elements.
     6       
     7        https://bugs.webkit.org/show_bug.cgi?id=21287
     8       
     9        * fast/table/floating-th.html: Added.
     10        * fast/table/table-display-types-strict.html: Added.
     11        * fast/table/table-display-types.html: Added.
     12        * platform/mac/fast/table/floating-th-expected.txt: Added.
     13        * platform/mac/fast/table/table-display-types-expected.txt: Added.
     14        * platform/mac/fast/table/table-display-types-strict-expected.txt: Added.
     15
    1162008-10-02  Adele Peterson  <adele@apple.com>
    217

  • trunk/WebCore/ChangeLog

    r37218 r37219  
     12008-10-01  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Reviewed by Dave Hyatt
     4
     5        Clean up code that changes the RenderStyle passed in to
     6        table renderer setStyle() methods.
     7       
     8        https://bugs.webkit.org/show_bug.cgi?id=21287
     9       
     10        Tests: fast/table/floating-th.html
     11               fast/table/table-display-types-strict.html
     12               fast/table/table-display-types.html
     13
     14        * css/CSSStyleSelector.cpp:
     15        (WebCore::CSSStyleSelector::adjustRenderStyle):
     16        * rendering/RenderTableCell.cpp:
     17        (WebCore::RenderTableCell::setStyle):
     18        * rendering/RenderTableRow.cpp:
     19        (WebCore::RenderTableRow::setStyle):
     20        * rendering/RenderTableSection.cpp:
     21        (WebCore::RenderTableSection::setStyle):
     22
    1232008-10-02  Darin Adler  <darin@apple.com>
    224

  • trunk/WebCore/css/CSSStyleSelector.cpp

    r37217 r37219  
    13591359            else if (e->hasTagName(tableTag))
    13601360                style->setDisplay(style->isDisplayInlineType() ? INLINE_TABLE : TABLE);
     1361        }
     1362
     1363        if (e && (e->hasTagName(tdTag) || e->hasTagName(thTag))) {
     1364            if (style->whiteSpace() == KHTML_NOWRAP) {
     1365                // Figure out if we are really nowrapping or if we should just
     1366                // use normal instead.  If the width of the cell is fixed, then
     1367                // we don't actually use NOWRAP.
     1368                if (style->width().isFixed())
     1369                    style->setWhiteSpace(NORMAL);
     1370                else
     1371                    style->setWhiteSpace(NOWRAP);
     1372            }
    13611373        }
    13621374

  • trunk/WebCore/rendering/RenderTableCell.cpp

    r35899 r37219  
    226226        section()->setNeedsCellRecalc();
    227227
    228     newStyle->setDisplay(TABLE_CELL);
    229 
    230     if (newStyle->whiteSpace() == KHTML_NOWRAP) {
    231         // Figure out if we are really nowrapping or if we should just
    232         // use normal instead.  If the width of the cell is fixed, then
    233         // we don't actually use NOWRAP.
    234         if (newStyle->width().isFixed())
    235             newStyle->setWhiteSpace(NORMAL);
    236         else
    237             newStyle->setWhiteSpace(NOWRAP);
    238     }
     228    ASSERT(newStyle->display() == TABLE_CELL);
    239229
    240230    RenderBlock::setStyle(newStyle);

  • trunk/WebCore/rendering/RenderTableRow.cpp

    r31981 r37219  
    6060        section()->setNeedsCellRecalc();
    6161
    62     newStyle->setDisplay(TABLE_ROW);
     62    ASSERT(newStyle->display() == TABLE_ROW);
    6363
    6464    RenderContainer::setStyle(newStyle);

  • trunk/WebCore/rendering/RenderTableSection.cpp

    r36683 r37219  
    7878    if (recalcTable)
    7979        recalcTable->setNeedsSectionRecalc();
    80 }
    81 
    82 void RenderTableSection::setStyle(RenderStyle* newStyle)
    83 {
    84     // we don't allow changing this one
    85     if (style())
    86         newStyle->setDisplay(style()->display());
    87     else if (newStyle->display() != TABLE_FOOTER_GROUP && newStyle->display() != TABLE_HEADER_GROUP)
    88         newStyle->setDisplay(TABLE_ROW_GROUP);
    89 
    90     RenderContainer::setStyle(newStyle);
    9180}
    9281

  • trunk/WebCore/rendering/RenderTableSection.h

    r35899 r37219  
    4545
    4646    virtual void destroy();
    47 
    48     virtual void setStyle(RenderStyle*);
    4947
    5048    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
Note: See TracChangeset for help on using the changeset viewer.