Changeset 83698 in webkit


Ignore:
Timestamp:
Apr 12, 2011 9:49:52 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-04-12 Mike Lawther <​mikelawther@chromium.org>

Reviewed by James Robinson.

Update boolean operators in RenderStyle to be compatible with check-webkit-style
​https://bugs.webkit.org/show_bug.cgi?id=58409

No new functionality, so no new tests.

  • rendering/style/RenderStyle.cpp: (WebCore::RenderStyle::operator==): (WebCore::RenderStyle::inheritedNotEqual): (WebCore::positionedObjectMoved): (WebCore::RenderStyle::diff): (WebCore::RenderStyle::applyTransform):
  • rendering/style/RenderStyle.h: (WebCore::InheritedFlags::isOriginalDisplayInlineType):
Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r83695 r83698  
     12011-04-12  Mike Lawther  <mikelawther@chromium.org>
     2
     3        Reviewed by James Robinson.
     4
     5        Update boolean operators in RenderStyle to be compatible with check-webkit-style
     6        https://bugs.webkit.org/show_bug.cgi?id=58409
     7
     8        No new functionality, so no new tests.
     9
     10        * rendering/style/RenderStyle.cpp:
     11        (WebCore::RenderStyle::operator==):
     12        (WebCore::RenderStyle::inheritedNotEqual):
     13        (WebCore::positionedObjectMoved):
     14        (WebCore::RenderStyle::diff):
     15        (WebCore::RenderStyle::applyTransform):
     16        * rendering/style/RenderStyle.h:
     17        (WebCore::InheritedFlags::isOriginalDisplayInlineType):
     18
    1192011-04-12  Luiz Agostini  <luiz.agostini@openbossa.org>
    220

  • trunk/Source/WebCore/rendering/style/RenderStyle.cpp

    r83087 r83698  
    177177{
    178178    // compare everything except the pseudoStyle pointer
    179     return inherited_flags == o.inherited_flags &&
    180             noninherited_flags == o.noninherited_flags &&
    181             m_box == o.m_box &&
    182             visual == o.visual &&
    183             m_background == o.m_background &&
    184             surround == o.surround &&
    185             rareNonInheritedData == o.rareNonInheritedData &&
    186             rareInheritedData == o.rareInheritedData &&
    187             inherited == o.inherited
     179    return inherited_flags == o.inherited_flags
     180        && noninherited_flags == o.noninherited_flags
     181        && m_box == o.m_box
     182        && visual == o.visual
     183        && m_background == o.m_background
     184        && surround == o.surround
     185        && rareNonInheritedData == o.rareNonInheritedData
     186        && rareInheritedData == o.rareInheritedData
     187        && inherited == o.inherited
    188188#if ENABLE(SVG)
    189             && m_svgStyle == o.m_svgStyle
     189        && m_svgStyle == o.m_svgStyle
    190190#endif
    191191            ;
    … …  
    273273bool RenderStyle::inheritedNotEqual(const RenderStyle* other) const
    274274{
    275     return inherited_flags != other->inherited_flags ||
    276            inherited != other->inherited ||
     275    return inherited_flags != other->inherited_flags
     276           || inherited != other->inherited
    277277#if ENABLE(SVG)
    278            m_svgStyle->inheritedNotEqual(other->m_svgStyle.get()) ||
     278           || m_svgStyle->inheritedNotEqual(other->m_svgStyle.get())
    279279#endif
    280            rareInheritedData != other->rareInheritedData;
     280           || rareInheritedData != other->rareInheritedData;
    281281}
    282282
    … …  
    285285    // If any unit types are different, then we can't guarantee
    286286    // that this was just a movement.
    287     if (a.left().type() != b.left().type() ||
    288         a.right().type() != b.right().type() ||
    289         a.top().type() != b.top().type() ||
    290         a.bottom().type() != b.bottom().type())
     287    if (a.left().type() != b.left().type()
     288        || a.right().type() != b.right().type()
     289        || a.top().type() != b.top().type()
     290        || a.bottom().type() != b.bottom().type())
    291291        return false;
    292292
    … …  
    317317#endif
    318318
    319     if (m_box->width() != other->m_box->width() ||
    320         m_box->minWidth() != other->m_box->minWidth() ||
    321         m_box->maxWidth() != other->m_box->maxWidth() ||
    322         m_box->height() != other->m_box->height() ||
    323         m_box->minHeight() != other->m_box->minHeight() ||
    324         m_box->maxHeight() != other->m_box->maxHeight())
     319    if (m_box->width() != other->m_box->width()
     320        || m_box->minWidth() != other->m_box->minWidth()
     321        || m_box->maxWidth() != other->m_box->maxWidth()
     322        || m_box->height() != other->m_box->height()
     323        || m_box->minHeight() != other->m_box->minHeight()
     324        || m_box->maxHeight() != other->m_box->maxHeight())
    325325        return StyleDifferenceLayout;
    326326
    … …  
    338338
    339339    if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
    340         if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m_appearance ||
    341             rareNonInheritedData->marginBeforeCollapse != other->rareNonInheritedData->marginBeforeCollapse ||
    342             rareNonInheritedData->marginAfterCollapse != other->rareNonInheritedData->marginAfterCollapse ||
    343             rareNonInheritedData->lineClamp != other->rareNonInheritedData->lineClamp ||
    344             rareNonInheritedData->textOverflow != other->rareNonInheritedData->textOverflow)
     340        if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m_appearance
     341            || rareNonInheritedData->marginBeforeCollapse != other->rareNonInheritedData->marginBeforeCollapse
     342            || rareNonInheritedData->marginAfterCollapse != other->rareNonInheritedData->marginAfterCollapse
     343            || rareNonInheritedData->lineClamp != other->rareNonInheritedData->lineClamp
     344            || rareNonInheritedData->textOverflow != other->rareNonInheritedData->textOverflow)
    345345            return StyleDifferenceLayout;
    346346
    347         if (rareNonInheritedData->flexibleBox.get() != other->rareNonInheritedData->flexibleBox.get() &&
    348             *rareNonInheritedData->flexibleBox.get() != *other->rareNonInheritedData->flexibleBox.get())
     347        if (rareNonInheritedData->flexibleBox.get() != other->rareNonInheritedData->flexibleBox.get()
     348            && *rareNonInheritedData->flexibleBox.get() != *other->rareNonInheritedData->flexibleBox.get())
    349349            return StyleDifferenceLayout;
    350350
    … …  
    356356            return StyleDifferenceLayout;
    357357
    358         if (rareNonInheritedData->m_multiCol.get() != other->rareNonInheritedData->m_multiCol.get() &&
    359             *rareNonInheritedData->m_multiCol.get() != *other->rareNonInheritedData->m_multiCol.get())
     358        if (rareNonInheritedData->m_multiCol.get() != other->rareNonInheritedData->m_multiCol.get()
     359            && *rareNonInheritedData->m_multiCol.get() != *other->rareNonInheritedData->m_multiCol.get())
    360360            return StyleDifferenceLayout;
    361361
    362         if (rareNonInheritedData->m_transform.get() != other->rareNonInheritedData->m_transform.get() &&
    363             *rareNonInheritedData->m_transform.get() != *other->rareNonInheritedData->m_transform.get()) {
     362        if (rareNonInheritedData->m_transform.get() != other->rareNonInheritedData->m_transform.get()
     363            && *rareNonInheritedData->m_transform.get() != *other->rareNonInheritedData->m_transform.get()) {
    364364#if USE(ACCELERATED_COMPOSITING)
    365365            changedContextSensitiveProperties |= ContextSensitivePropertyTransform;
    … …  
    372372#if !USE(ACCELERATED_COMPOSITING)
    373373        if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
    374             if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheritedData->m_transformStyle3D ||
    375                 rareNonInheritedData->m_backfaceVisibility != other->rareNonInheritedData->m_backfaceVisibility ||
    376                 rareNonInheritedData->m_perspective != other->rareNonInheritedData->m_perspective ||
    377                 rareNonInheritedData->m_perspectiveOriginX != other->rareNonInheritedData->m_perspectiveOriginX ||
    378                 rareNonInheritedData->m_perspectiveOriginY != other->rareNonInheritedData->m_perspectiveOriginY)
     374            if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheritedData->m_transformStyle3D
     375                || rareNonInheritedData->m_backfaceVisibility != other->rareNonInheritedData->m_backfaceVisibility
     376                || rareNonInheritedData->m_perspective != other->rareNonInheritedData->m_perspective
     377                || rareNonInheritedData->m_perspectiveOriginX != other->rareNonInheritedData->m_perspectiveOriginX
     378                || rareNonInheritedData->m_perspectiveOriginY != other->rareNonInheritedData->m_perspectiveOriginY)
    379379                return StyleDifferenceLayout;
    380380        }
    … …  
    389389
    390390    if (rareInheritedData.get() != other->rareInheritedData.get()) {
    391         if (rareInheritedData->highlight != other->rareInheritedData->highlight ||
    392             rareInheritedData->indent != other->rareInheritedData->indent ||
    393             rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom ||
    394             rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust ||
    395             rareInheritedData->wordBreak != other->rareInheritedData->wordBreak ||
    396             rareInheritedData->wordWrap != other->rareInheritedData->wordWrap ||
    397             rareInheritedData->nbspMode != other->rareInheritedData->nbspMode ||
    398             rareInheritedData->khtmlLineBreak != other->rareInheritedData->khtmlLineBreak ||
    399             rareInheritedData->textSecurity != other->rareInheritedData->textSecurity ||
    400             rareInheritedData->hyphens != other->rareInheritedData->hyphens ||
    401             rareInheritedData->hyphenationLimitBefore != other->rareInheritedData->hyphenationLimitBefore ||
    402             rareInheritedData->hyphenationLimitAfter != other->rareInheritedData->hyphenationLimitAfter ||
    403             rareInheritedData->hyphenationString != other->rareInheritedData->hyphenationString ||
    404             rareInheritedData->locale != other->rareInheritedData->locale ||
    405             rareInheritedData->textEmphasisMark != other->rareInheritedData->textEmphasisMark ||
    406             rareInheritedData->textEmphasisPosition != other->rareInheritedData->textEmphasisPosition ||
    407             rareInheritedData->textEmphasisCustomMark != other->rareInheritedData->textEmphasisCustomMark ||
    408             rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain)
     391        if (rareInheritedData->highlight != other->rareInheritedData->highlight
     392            || rareInheritedData->indent != other->rareInheritedData->indent
     393            || rareInheritedData->m_effectiveZoom != other->rareInheritedData->m_effectiveZoom
     394            || rareInheritedData->textSizeAdjust != other->rareInheritedData->textSizeAdjust
     395            || rareInheritedData->wordBreak != other->rareInheritedData->wordBreak
     396            || rareInheritedData->wordWrap != other->rareInheritedData->wordWrap
     397            || rareInheritedData->nbspMode != other->rareInheritedData->nbspMode
     398            || rareInheritedData->khtmlLineBreak != other->rareInheritedData->khtmlLineBreak
     399            || rareInheritedData->textSecurity != other->rareInheritedData->textSecurity
     400            || rareInheritedData->hyphens != other->rareInheritedData->hyphens
     401            || rareInheritedData->hyphenationLimitBefore != other->rareInheritedData->hyphenationLimitBefore
     402            || rareInheritedData->hyphenationLimitAfter != other->rareInheritedData->hyphenationLimitAfter
     403            || rareInheritedData->hyphenationString != other->rareInheritedData->hyphenationString
     404            || rareInheritedData->locale != other->rareInheritedData->locale
     405            || rareInheritedData->textEmphasisMark != other->rareInheritedData->textEmphasisMark
     406            || rareInheritedData->textEmphasisPosition != other->rareInheritedData->textEmphasisPosition
     407            || rareInheritedData->textEmphasisCustomMark != other->rareInheritedData->textEmphasisCustomMark
     408            || rareInheritedData->m_lineBoxContain != other->rareInheritedData->m_lineBoxContain)
    409409            return StyleDifferenceLayout;
    410410
    … …  
    416416    }
    417417
    418     if (inherited->line_height != other->inherited->line_height ||
    419         inherited->list_style_image != other->inherited->list_style_image ||
    420         inherited->font != other->inherited->font ||
    421         inherited->horizontal_border_spacing != other->inherited->horizontal_border_spacing ||
    422         inherited->vertical_border_spacing != other->inherited->vertical_border_spacing ||
    423         inherited_flags._box_direction != other->inherited_flags._box_direction ||
    424         inherited_flags._visuallyOrdered != other->inherited_flags._visuallyOrdered ||
    425         noninherited_flags._position != other->noninherited_flags._position ||
    426         noninherited_flags._floating != other->noninherited_flags._floating ||
    427         noninherited_flags._originalDisplay != other->noninherited_flags._originalDisplay)
     418    if (inherited->line_height != other->inherited->line_height
     419        || inherited->list_style_image != other->inherited->list_style_image
     420        || inherited->font != other->inherited->font
     421        || inherited->horizontal_border_spacing != other->inherited->horizontal_border_spacing
     422        || inherited->vertical_border_spacing != other->inherited->vertical_border_spacing
     423        || inherited_flags._box_direction != other->inherited_flags._box_direction
     424        || inherited_flags._visuallyOrdered != other->inherited_flags._visuallyOrdered
     425        || noninherited_flags._position != other->noninherited_flags._position
     426        || noninherited_flags._floating != other->noninherited_flags._floating
     427        || noninherited_flags._originalDisplay != other->noninherited_flags._originalDisplay)
    428428        return StyleDifferenceLayout;
    429429
    430430
    431431    if (((int)noninherited_flags._effectiveDisplay) >= TABLE) {
    432         if (inherited_flags._border_collapse != other->inherited_flags._border_collapse ||
    433             inherited_flags._empty_cells != other->inherited_flags._empty_cells ||
    434             inherited_flags._caption_side != other->inherited_flags._caption_side ||
    435             noninherited_flags._table_layout != other->noninherited_flags._table_layout)
     432        if (inherited_flags._border_collapse != other->inherited_flags._border_collapse
     433            || inherited_flags._empty_cells != other->inherited_flags._empty_cells
     434            || inherited_flags._caption_side != other->inherited_flags._caption_side
     435            || noninherited_flags._table_layout != other->noninherited_flags._table_layout)
    436436            return StyleDifferenceLayout;
    437437
    438438        // In the collapsing border model, 'hidden' suppresses other borders, while 'none'
    439439        // does not, so these style differences can be width differences.
    440         if (inherited_flags._border_collapse &&
    441             ((borderTopStyle() == BHIDDEN && other->borderTopStyle() == BNONE) ||
    442              (borderTopStyle() == BNONE && other->borderTopStyle() == BHIDDEN) ||
    443              (borderBottomStyle() == BHIDDEN && other->borderBottomStyle() == BNONE) ||
    444              (borderBottomStyle() == BNONE && other->borderBottomStyle() == BHIDDEN) ||
    445              (borderLeftStyle() == BHIDDEN && other->borderLeftStyle() == BNONE) ||
    446              (borderLeftStyle() == BNONE && other->borderLeftStyle() == BHIDDEN) ||
    447              (borderRightStyle() == BHIDDEN && other->borderRightStyle() == BNONE) ||
    448              (borderRightStyle() == BNONE && other->borderRightStyle() == BHIDDEN)))
     440        if (inherited_flags._border_collapse
     441            && ((borderTopStyle() == BHIDDEN && other->borderTopStyle() == BNONE)
     442                || (borderTopStyle() == BNONE && other->borderTopStyle() == BHIDDEN)
     443                || (borderBottomStyle() == BHIDDEN && other->borderBottomStyle() == BNONE)
     444                || (borderBottomStyle() == BNONE && other->borderBottomStyle() == BHIDDEN)
     445                || (borderLeftStyle() == BHIDDEN && other->borderLeftStyle() == BNONE)
     446                || (borderLeftStyle() == BNONE && other->borderLeftStyle() == BHIDDEN)
     447                || (borderRightStyle() == BHIDDEN && other->borderRightStyle() == BNONE)
     448                || (borderRightStyle() == BNONE && other->borderRightStyle() == BHIDDEN)))
    449449            return StyleDifferenceLayout;
    450450    }
    451451
    452452    if (noninherited_flags._effectiveDisplay == LIST_ITEM) {
    453         if (inherited_flags._list_style_type != other->inherited_flags._list_style_type ||
    454             inherited_flags._list_style_position != other->inherited_flags._list_style_position)
     453        if (inherited_flags._list_style_type != other->inherited_flags._list_style_type
     454            || inherited_flags._list_style_position != other->inherited_flags._list_style_position)
    455455            return StyleDifferenceLayout;
    456456    }
    457457
    458     if (inherited_flags._text_align != other->inherited_flags._text_align ||
    459         inherited_flags._text_transform != other->inherited_flags._text_transform ||
    460         inherited_flags._direction != other->inherited_flags._direction ||
    461         inherited_flags._white_space != other->inherited_flags._white_space ||
    462         noninherited_flags._clear != other->noninherited_flags._clear ||
    463         noninherited_flags._unicodeBidi != other->noninherited_flags._unicodeBidi)
     458    if (inherited_flags._text_align != other->inherited_flags._text_align
     459        || inherited_flags._text_transform != other->inherited_flags._text_transform
     460        || inherited_flags._direction != other->inherited_flags._direction
     461        || inherited_flags._white_space != other->inherited_flags._white_space
     462        || noninherited_flags._clear != other->noninherited_flags._clear
     463        || noninherited_flags._unicodeBidi != other->noninherited_flags._unicodeBidi)
    464464        return StyleDifferenceLayout;
    465465
    … …  
    473473
    474474    // Overflow returns a layout hint.
    475     if (noninherited_flags._overflowX != other->noninherited_flags._overflowX ||
    476         noninherited_flags._overflowY != other->noninherited_flags._overflowY)
     475    if (noninherited_flags._overflowX != other->noninherited_flags._overflowX
     476        || noninherited_flags._overflowY != other->noninherited_flags._overflowY)
    477477        return StyleDifferenceLayout;
    478478
    479479    // If our border widths change, then we need to layout.  Other changes to borders
    480480    // only necessitate a repaint.
    481     if (borderLeftWidth() != other->borderLeftWidth() ||
    482         borderTopWidth() != other->borderTopWidth() ||
    483         borderBottomWidth() != other->borderBottomWidth() ||
    484         borderRightWidth() != other->borderRightWidth())
     481    if (borderLeftWidth() != other->borderLeftWidth()
     482        || borderTopWidth() != other->borderTopWidth()
     483        || borderBottomWidth() != other->borderBottomWidth()
     484        || borderRightWidth() != other->borderRightWidth())
    485485        return StyleDifferenceLayout;
    486486
    … …  
    490490    if (!(mapA == mapB || (mapA && mapB && *mapA == *mapB)))
    491491        return StyleDifferenceLayout;
    492     if (rareNonInheritedData->m_counterIncrement != other->rareNonInheritedData->m_counterIncrement ||
    493         rareNonInheritedData->m_counterReset != other->rareNonInheritedData->m_counterReset)
     492    if (rareNonInheritedData->m_counterIncrement != other->rareNonInheritedData->m_counterIncrement
     493        || rareNonInheritedData->m_counterReset != other->rareNonInheritedData->m_counterReset)
    494494        return StyleDifferenceLayout;
    495495
    … …  
    497497        return StyleDifferenceLayout;
    498498
    499     if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opacity < 1) ||
    500         (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->opacity == 1)) {
     499    if ((rareNonInheritedData->opacity == 1 && other->rareNonInheritedData->opacity < 1)
     500        || (rareNonInheritedData->opacity < 1 && other->rareNonInheritedData->opacity == 1)) {
    501501        // FIXME: We would like to use SimplifiedLayout here, but we can't quite do that yet.
    502502        // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
    … …  
    528528            // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
    529529            return StyleDifferenceLayout;
    530         } else if (m_box->zIndex() != other->m_box->zIndex() || m_box->hasAutoZIndex() != other->m_box->hasAutoZIndex() ||
    531                  visual->clip != other->visual->clip || visual->hasClip != other->visual->hasClip)
     530        } else if (m_box->zIndex() != other->m_box->zIndex() || m_box->hasAutoZIndex() != other->m_box->hasAutoZIndex()
     531                 || visual->clip != other->visual->clip || visual->hasClip != other->visual->hasClip)
    532532            return StyleDifferenceRepaintLayer;
    533533    }
    … …  
    542542    }
    543543
    544     if (rareNonInheritedData->m_mask != other->rareNonInheritedData->m_mask ||
    545         rareNonInheritedData->m_maskBoxImage != other->rareNonInheritedData->m_maskBoxImage)
     544    if (rareNonInheritedData->m_mask != other->rareNonInheritedData->m_mask
     545        || rareNonInheritedData->m_maskBoxImage != other->rareNonInheritedData->m_maskBoxImage)
    546546        return StyleDifferenceRepaintLayer;
    547547
    548     if (inherited->color != other->inherited->color ||
    549         inherited_flags._visibility != other->inherited_flags._visibility ||
    550         inherited_flags._text_decorations != other->inherited_flags._text_decorations ||
    551         inherited_flags._force_backgrounds_to_white != other->inherited_flags._force_backgrounds_to_white ||
    552         inherited_flags._insideLink != other->inherited_flags._insideLink ||
    553         surround->border != other->surround->border ||
    554         *m_background.get() != *other->m_background.get() ||
    555         visual->textDecoration != other->visual->textDecoration ||
    556         rareInheritedData->userModify != other->rareInheritedData->userModify ||
    557         rareInheritedData->userSelect != other->rareInheritedData->userSelect ||
    558         rareNonInheritedData->userDrag != other->rareNonInheritedData->userDrag ||
    559         rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_borderFit ||
    560         rareInheritedData->textFillColor != other->rareInheritedData->textFillColor ||
    561         rareInheritedData->textStrokeColor != other->rareInheritedData->textStrokeColor ||
    562         rareInheritedData->textEmphasisColor != other->rareInheritedData->textEmphasisColor ||
    563         rareInheritedData->textEmphasisFill != other->rareInheritedData->textEmphasisFill)
     548    if (inherited->color != other->inherited->color
     549        || inherited_flags._visibility != other->inherited_flags._visibility
     550        || inherited_flags._text_decorations != other->inherited_flags._text_decorations
     551        || inherited_flags._force_backgrounds_to_white != other->inherited_flags._force_backgrounds_to_white
     552        || inherited_flags._insideLink != other->inherited_flags._insideLink
     553        || surround->border != other->surround->border
     554        || *m_background.get() != *other->m_background.get()
     555        || visual->textDecoration != other->visual->textDecoration
     556        || rareInheritedData->userModify != other->rareInheritedData->userModify
     557        || rareInheritedData->userSelect != other->rareInheritedData->userSelect
     558        || rareNonInheritedData->userDrag != other->rareNonInheritedData->userDrag
     559        || rareNonInheritedData->m_borderFit != other->rareNonInheritedData->m_borderFit
     560        || rareInheritedData->textFillColor != other->rareInheritedData->textFillColor
     561        || rareInheritedData->textStrokeColor != other->rareInheritedData->textStrokeColor
     562        || rareInheritedData->textEmphasisColor != other->rareInheritedData->textEmphasisColor
     563        || rareInheritedData->textEmphasisFill != other->rareInheritedData->textEmphasisFill)
    564564        return StyleDifferenceRepaint;
    565565
    566566#if USE(ACCELERATED_COMPOSITING)
    567567    if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
    568         if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheritedData->m_transformStyle3D ||
    569             rareNonInheritedData->m_backfaceVisibility != other->rareNonInheritedData->m_backfaceVisibility ||
    570             rareNonInheritedData->m_perspective != other->rareNonInheritedData->m_perspective ||
    571             rareNonInheritedData->m_perspectiveOriginX != other->rareNonInheritedData->m_perspectiveOriginX ||
    572             rareNonInheritedData->m_perspectiveOriginY != other->rareNonInheritedData->m_perspectiveOriginY)
     568        if (rareNonInheritedData->m_transformStyle3D != other->rareNonInheritedData->m_transformStyle3D
     569            || rareNonInheritedData->m_backfaceVisibility != other->rareNonInheritedData->m_backfaceVisibility
     570            || rareNonInheritedData->m_perspective != other->rareNonInheritedData->m_perspective
     571            || rareNonInheritedData->m_perspectiveOriginX != other->rareNonInheritedData->m_perspectiveOriginX
     572            || rareNonInheritedData->m_perspectiveOriginY != other->rareNonInheritedData->m_perspectiveOriginY)
    573573            return StyleDifferenceRecompositeLayer;
    574574    }
    … …  
    694694        for (i = 0; i < s; i++) {
    695695            TransformOperation::OperationType type = rareNonInheritedData->m_transform->m_operations.operations()[i]->getOperationType();
    696             if (type != TransformOperation::TRANSLATE_X &&
    697                     type != TransformOperation::TRANSLATE_Y &&
    698                     type != TransformOperation::TRANSLATE &&
    699                     type != TransformOperation::TRANSLATE_Z &&
    700                     type != TransformOperation::TRANSLATE_3D
     696            if (type != TransformOperation::TRANSLATE_X
     697                    && type != TransformOperation::TRANSLATE_Y
     698                    && type != TransformOperation::TRANSLATE
     699                    && type != TransformOperation::TRANSLATE_Z
     700                    && type != TransformOperation::TRANSLATE_3D
    701701                    ) {
    702702                applyTransformOrigin = true;

  • trunk/Source/WebCore/rendering/style/RenderStyle.h

    r82828 r83698  
    162162        bool operator==(const InheritedFlags& other) const
    163163        {
    164             return (_empty_cells == other._empty_cells) &&
    165                    (_caption_side == other._caption_side) &&
    166                    (_list_style_type == other._list_style_type) &&
    167                    (_list_style_position == other._list_style_position) &&
    168                    (_visibility == other._visibility) &&
    169                    (_text_align == other._text_align) &&
    170                    (_text_transform == other._text_transform) &&
    171                    (_text_decorations == other._text_decorations) &&
    172                    (_cursor_style == other._cursor_style) &&
    173                    (_direction == other._direction) &&
    174                    (_border_collapse == other._border_collapse) &&
    175                    (_white_space == other._white_space) &&
    176                    (_box_direction == other._box_direction) &&
    177                    (_visuallyOrdered == other._visuallyOrdered) &&
    178                    (_force_backgrounds_to_white == other._force_backgrounds_to_white) &&
    179                    (_pointerEvents == other._pointerEvents) &&
    180                    (_insideLink == other._insideLink) &&
    181                   (m_writingMode == other.m_writingMode);
     164            return (_empty_cells == other._empty_cells)
     165                && (_caption_side == other._caption_side)
     166                && (_list_style_type == other._list_style_type)
     167                && (_list_style_position == other._list_style_position)
     168                && (_visibility == other._visibility)
     169                && (_text_align == other._text_align)
     170                && (_text_transform == other._text_transform)
     171                && (_text_decorations == other._text_decorations)
     172                && (_cursor_style == other._cursor_style)
     173                && (_direction == other._direction)
     174                && (_border_collapse == other._border_collapse)
     175                && (_white_space == other._white_space)
     176                && (_box_direction == other._box_direction)
     177                && (_visuallyOrdered == other._visuallyOrdered)
     178                && (_force_backgrounds_to_white == other._force_backgrounds_to_white)
     179                && (_pointerEvents == other._pointerEvents)
     180                && (_insideLink == other._insideLink)
     181                && (m_writingMode == other.m_writingMode);
    182182        }
    183183
    … …  
    11711171    bool isOriginalDisplayInlineType() const
    11721172    {
    1173         return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK ||
    1174               originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE;
     1173        return originalDisplay() == INLINE || originalDisplay() == INLINE_BLOCK
     1174            || originalDisplay() == INLINE_BOX || originalDisplay() == INLINE_TABLE;
    11751175    }
    11761176
Note: See TracChangeset for help on using the changeset viewer.