Changeset 68561 in webkit


Ignore:
Timestamp:
Sep 28, 2010, 2:16:50 PM (15 years ago)
Author:
hyatt@apple.com
Message:

Right now we have two properties named margin-top-collapse and margin-after-collapse. They are proprietary and only used by Safari RSS.

Reviewed by Sam Weinig.

I am adding margin-before-collapse and margin-after-collapse and just aliasing the old properties to the new ones.
This way we have some names that are directionally independent.

Note that these properties aren't like other directional properties. They are about what to do with the before side and after side of
your block's margins when collapsing with adjacent blocks. The meaning of before/after depend on the block-flow directionality
of the containing block.

Computed style tests all changed and the remove-shorthand.html test covers manipulation of the shorthand.

WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

  • css/CSSPropertyLonghand.cpp:

(WebCore::initShorthandMap):

  • css/CSSPropertyNames.in:
  • css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::MarginInfo::MarginInfo):
(WebCore::RenderBlock::isSelfCollapsingBlock):
(WebCore::RenderBlock::collapseMargins):
(WebCore::RenderBlock::layoutBlockChild):

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

  • rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::marginBeforeCollapse):
(WebCore::InheritedFlags::marginAfterCollapse):
(WebCore::InheritedFlags::setMarginBeforeCollapse):
(WebCore::InheritedFlags::setMarginAfterCollapse):
(WebCore::InheritedFlags::initialMarginBeforeCollapse):
(WebCore::InheritedFlags::initialMarginAfterCollapse):

  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):

  • rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

  • fast/css/remove-shorthand-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r68558 r68561  
     12010-09-28  David Hyatt  <hyatt@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Right now we have two properties named margin-top-collapse and margin-after-collapse.  They are proprietary and only used by Safari RSS.
     6
     7        I am adding margin-before-collapse and margin-after-collapse and just aliasing the old properties to the new ones.
     8        This way we have some names that are directionally independent.
     9
     10        Note that these properties aren't like other directional properties.  They are about what to do with the before side and after side of
     11        your block's margins when collapsing with adjacent blocks.  The meaning of before/after depend on the block-flow directionality
     12        of the containing block.
     13
     14        Computed style tests all changed and the remove-shorthand.html test covers manipulation of the shorthand.
     15
     16        * fast/css/remove-shorthand-expected.txt:
     17        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
     18        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     19        * svg/css/getComputedStyle-basic-expected.txt:
     20
    1212010-09-28  Martin Robinson  <mrobinson@igalia.com>
    222

  • trunk/LayoutTests/fast/css/remove-shorthand-expected.txt

    r47906 r68561  
    2020Removing list-style removes list-style-type, list-style-position, list-style-image.
    2121Removing margin removes margin-top, margin-right, margin-bottom, margin-left.
    22 Removing -webkit-margin-collapse removes -webkit-margin-top-collapse, -webkit-margin-bottom-collapse.
     22Removing -webkit-margin-collapse removes -webkit-margin-before-collapse, -webkit-margin-after-collapse.
    2323Removing -webkit-marquee removes -webkit-marquee-direction, -webkit-marquee-increment, -webkit-marquee-repetition, -webkit-marquee-style, -webkit-marquee-speed.
    2424Removing -webkit-mask removes -webkit-mask-image, -webkit-mask-repeat-x, -webkit-mask-repeat-y, -webkit-mask-attachment, -webkit-mask-position-x, -webkit-mask-position-y, -webkit-mask-origin, -webkit-mask-clip.

  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-expected.txt

    r67667 r68561  
    140140-webkit-line-break: normal;
    141141-webkit-line-clamp: none;
    142 -webkit-margin-bottom-collapse: collapse;
    143 -webkit-margin-top-collapse: collapse;
     142-webkit-margin-before-collapse: collapse;
     143-webkit-margin-after-collapse: collapse;
    144144-webkit-marquee-direction: auto;
    145145-webkit-marquee-increment: 6px;

  • trunk/LayoutTests/platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r67667 r68561  
    139139    -webkit-line-break: normal
    140140    -webkit-line-clamp: none
    141     -webkit-margin-bottom-collapse: collapse
    142     -webkit-margin-top-collapse: collapse
     141    -webkit-margin-before-collapse: collapse
     142    -webkit-margin-after-collapse: collapse
    143143    -webkit-marquee-direction: auto
    144144    -webkit-marquee-increment: 6px

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r67667 r68561  
    277277rect: style.getPropertyValue(-webkit-line-clamp) : none
    278278rect: style.getPropertyCSSValue(-webkit-line-clamp) : [object CSSPrimitiveValue]
    279 rect: style.getPropertyValue(-webkit-margin-bottom-collapse) : collapse
    280 rect: style.getPropertyCSSValue(-webkit-margin-bottom-collapse) : [object CSSPrimitiveValue]
    281 rect: style.getPropertyValue(-webkit-margin-top-collapse) : collapse
    282 rect: style.getPropertyCSSValue(-webkit-margin-top-collapse) : [object CSSPrimitiveValue]
     279rect: style.getPropertyValue(-webkit-margin-before-collapse) : collapse
     280rect: style.getPropertyCSSValue(-webkit-margin-before-collapse) : [object CSSPrimitiveValue]
     281rect: style.getPropertyValue(-webkit-margin-after-collapse) : collapse
     282rect: style.getPropertyCSSValue(-webkit-margin-after-collapse) : [object CSSPrimitiveValue]
    283283rect: style.getPropertyValue(-webkit-marquee-direction) : auto
    284284rect: style.getPropertyCSSValue(-webkit-marquee-direction) : [object CSSPrimitiveValue]
    … …  
    699699g: style.getPropertyValue(-webkit-line-clamp) : none
    700700g: style.getPropertyCSSValue(-webkit-line-clamp) : [object CSSPrimitiveValue]
    701 g: style.getPropertyValue(-webkit-margin-bottom-collapse) : collapse
    702 g: style.getPropertyCSSValue(-webkit-margin-bottom-collapse) : [object CSSPrimitiveValue]
    703 g: style.getPropertyValue(-webkit-margin-top-collapse) : collapse
    704 g: style.getPropertyCSSValue(-webkit-margin-top-collapse) : [object CSSPrimitiveValue]
     701g: style.getPropertyValue(-webkit-margin-before-collapse) : collapse
     702g: style.getPropertyCSSValue(-webkit-margin-before-collapse) : [object CSSPrimitiveValue]
     703g: style.getPropertyValue(-webkit-margin-after-collapse) : collapse
     704g: style.getPropertyCSSValue(-webkit-margin-after-collapse) : [object CSSPrimitiveValue]
    705705g: style.getPropertyValue(-webkit-marquee-direction) : auto
    706706g: style.getPropertyCSSValue(-webkit-marquee-direction) : [object CSSPrimitiveValue]

  • trunk/WebCore/ChangeLog

    r68558 r68561  
     12010-09-28  David Hyatt  <hyatt@apple.com>
     2
     3        Reviewed by Sam Weinig.
     4
     5        Right now we have two properties named margin-top-collapse and margin-after-collapse.  They are proprietary and only used by Safari RSS.
     6
     7        I am adding margin-before-collapse and margin-after-collapse and just aliasing the old properties to the new ones.
     8        This way we have some names that are directionally independent.
     9
     10        Note that these properties aren't like other directional properties.  They are about what to do with the before side and after side of
     11        your block's margins when collapsing with adjacent blocks.  The meaning of before/after depend on the block-flow directionality
     12        of the containing block.
     13
     14        Computed style tests all changed and the remove-shorthand.html test covers manipulation of the shorthand.
     15
     16        * css/CSSComputedStyleDeclaration.cpp:
     17        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     18        * css/CSSParser.cpp:
     19        (WebCore::CSSParser::parseValue):
     20        * css/CSSPropertyLonghand.cpp:
     21        (WebCore::initShorthandMap):
     22        * css/CSSPropertyNames.in:
     23        * css/CSSStyleSelector.cpp:
     24        (WebCore::CSSStyleSelector::applyProperty):
     25        * rendering/RenderBlock.cpp:
     26        (WebCore::RenderBlock::MarginInfo::MarginInfo):
     27        (WebCore::RenderBlock::isSelfCollapsingBlock):
     28        (WebCore::RenderBlock::collapseMargins):
     29        (WebCore::RenderBlock::layoutBlockChild):
     30        * rendering/style/RenderStyle.cpp:
     31        (WebCore::RenderStyle::diff):
     32        * rendering/style/RenderStyle.h:
     33        (WebCore::InheritedFlags::marginBeforeCollapse):
     34        (WebCore::InheritedFlags::marginAfterCollapse):
     35        (WebCore::InheritedFlags::setMarginBeforeCollapse):
     36        (WebCore::InheritedFlags::setMarginAfterCollapse):
     37        (WebCore::InheritedFlags::initialMarginBeforeCollapse):
     38        (WebCore::InheritedFlags::initialMarginAfterCollapse):
     39        * rendering/style/StyleRareNonInheritedData.cpp:
     40        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     41        (WebCore::StyleRareNonInheritedData::operator==):
     42        * rendering/style/StyleRareNonInheritedData.h:
     43
    1442010-09-28  Martin Robinson  <mrobinson@igalia.com>
    245

  • trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

    r67882 r68561  
    193193    CSSPropertyWebkitLineBreak,
    194194    CSSPropertyWebkitLineClamp,
    195     CSSPropertyWebkitMarginBottomCollapse,
    196     CSSPropertyWebkitMarginTopCollapse,
     195    CSSPropertyWebkitMarginBeforeCollapse,
     196    CSSPropertyWebkitMarginAfterCollapse,
    197197    CSSPropertyWebkitMarqueeDirection,
    198198    CSSPropertyWebkitMarqueeIncrement,
    … …  
    13631363            // Not a real style property -- used by the editing engine -- so has no computed value.
    13641364            break;
    1365         case CSSPropertyWebkitMarginBottomCollapse:
    1366             return CSSPrimitiveValue::create(style->marginBottomCollapse());
    1367         case CSSPropertyWebkitMarginTopCollapse:
    1368             return CSSPrimitiveValue::create(style->marginTopCollapse());
     1365        case CSSPropertyWebkitMarginAfterCollapse:
     1366            return CSSPrimitiveValue::create(style->marginAfterCollapse());
     1367        case CSSPropertyWebkitMarginBeforeCollapse:
     1368            return CSSPrimitiveValue::create(style->marginBeforeCollapse());
    13691369        case CSSPropertyWebkitPerspective:
    13701370            if (!style->hasPerspective())

  • trunk/WebCore/css/CSSParser.cpp

    r68521 r68561  
    14321432    }
    14331433    case CSSPropertyWebkitMarginCollapse: {
    1434         const int properties[2] = { CSSPropertyWebkitMarginTopCollapse,
    1435             CSSPropertyWebkitMarginBottomCollapse };
     1434        const int properties[2] = { CSSPropertyWebkitMarginBeforeCollapse,
     1435            CSSPropertyWebkitMarginAfterCollapse };
    14361436        if (num == 1) {
    14371437            ShorthandScope scope(this, CSSPropertyWebkitMarginCollapse);
    … …  
    14501450        return false;
    14511451    }
     1452    case CSSPropertyWebkitMarginBeforeCollapse:
     1453    case CSSPropertyWebkitMarginAfterCollapse:
    14521454    case CSSPropertyWebkitMarginTopCollapse:
    14531455    case CSSPropertyWebkitMarginBottomCollapse:

  • trunk/WebCore/css/CSSPropertyLonghand.cpp

    r59111 r68561  
    9999    SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSSPropertyMargin, marginProperties);
    100100
    101     static const int marginCollapseProperties[] = { CSSPropertyWebkitMarginTopCollapse, CSSPropertyWebkitMarginBottomCollapse };
     101    static const int marginCollapseProperties[] = { CSSPropertyWebkitMarginBeforeCollapse, CSSPropertyWebkitMarginAfterCollapse };
    102102    SET_SHORTHAND_MAP_ENTRY(shorthandMap, CSSPropertyWebkitMarginCollapse, marginCollapseProperties);
    103103

  • trunk/WebCore/css/CSSPropertyNames.in

    r67882 r68561  
    233233-webkit-logical-width
    234234-webkit-logical-height
     235-webkit-margin-after-collapse
     236-webkit-margin-before-collapse
    235237-webkit-margin-bottom-collapse
     238-webkit-margin-top-collapse
    236239-webkit-margin-collapse
    237240-webkit-margin-after
    … …  
    239242-webkit-margin-end
    240243-webkit-margin-start
    241 -webkit-margin-top-collapse
    242244-webkit-marquee
    243245-webkit-marquee-direction

  • trunk/WebCore/css/CSSStyleSelector.cpp

    r68227 r68561  
    51595159    case CSSPropertyWebkitMarginCollapse: {
    51605160        if (isInherit) {
    5161             m_style->setMarginTopCollapse(m_parentStyle->marginTopCollapse());
    5162             m_style->setMarginBottomCollapse(m_parentStyle->marginBottomCollapse());
     5161            m_style->setMarginBeforeCollapse(m_parentStyle->marginBeforeCollapse());
     5162            m_style->setMarginAfterCollapse(m_parentStyle->marginAfterCollapse());
    51635163        }
    51645164        else if (isInitial) {
    5165             m_style->setMarginTopCollapse(MCOLLAPSE);
    5166             m_style->setMarginBottomCollapse(MCOLLAPSE);
    5167         }
    5168         return;
    5169     }
    5170 
     5165            m_style->setMarginBeforeCollapse(MCOLLAPSE);
     5166            m_style->setMarginAfterCollapse(MCOLLAPSE);
     5167        }
     5168        return;
     5169    }
     5170
     5171    case CSSPropertyWebkitMarginBeforeCollapse:
    51715172    case CSSPropertyWebkitMarginTopCollapse:
    5172         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marginTopCollapse, MarginTopCollapse)
    5173         return;
     5173        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marginBeforeCollapse, MarginBeforeCollapse)
     5174        return;
     5175    case CSSPropertyWebkitMarginAfterCollapse:
    51745176    case CSSPropertyWebkitMarginBottomCollapse:
    5175         HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marginBottomCollapse, MarginBottomCollapse)
     5177        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE(marginAfterCollapse, MarginAfterCollapse)
    51765178        return;
    51775179    case CSSPropertyWebkitLineClamp: {

  • trunk/WebCore/rendering/RenderBlock.cpp

    r68556 r68561  
    9393        && !block->isBlockFlowRoot();
    9494
    95     m_canCollapseMarginBeforeWithChildren = m_canCollapseWithChildren && (beforeBorderPadding == 0) && block->style()->marginTopCollapse() != MSEPARATE;
     95    m_canCollapseMarginBeforeWithChildren = m_canCollapseWithChildren && (beforeBorderPadding == 0) && block->style()->marginBeforeCollapse() != MSEPARATE;
    9696
    9797    // If any height other than auto is specified in CSS, then we don't collapse our bottom
    … …  
    100100    // with it.  We also don't collapse if we have any bottom border/padding.
    101101    m_canCollapseMarginAfterWithChildren = m_canCollapseWithChildren && (afterBorderPadding == 0) &&
    102         (block->style()->logicalHeight().isAuto() && block->style()->logicalHeight().value() == 0) && block->style()->marginBottomCollapse() != MSEPARATE;
    103    
    104     m_quirkContainer = block->isTableCell() || block->isBody() || block->style()->marginTopCollapse() == MDISCARD ||
    105         block->style()->marginBottomCollapse() == MDISCARD;
     102        (block->style()->logicalHeight().isAuto() && block->style()->logicalHeight().value() == 0) && block->style()->marginAfterCollapse() != MSEPARATE;
     103   
     104    m_quirkContainer = block->isTableCell() || block->isBody() || block->style()->marginBeforeCollapse() == MDISCARD ||
     105        block->style()->marginAfterCollapse() == MDISCARD;
    106106
    107107    m_posMargin = m_canCollapseMarginBeforeWithChildren ? block->maxTopMargin(true) : 0;
    … …  
    10231023        || isTable() || borderAndPaddingHeight()
    10241024        || style()->minHeight().isPositive()
    1025         || style()->marginTopCollapse() == MSEPARATE || style()->marginBottomCollapse() == MSEPARATE)
     1025        || style()->marginBeforeCollapse() == MSEPARATE || style()->marginAfterCollapse() == MSEPARATE)
    10261026        return false;
    10271027
    … …  
    14801480    // See if the top margin is quirky. We only care if this child has
    14811481    // margins that will collapse with us.
    1482     bool topQuirk = child->isTopMarginQuirk() || style()->marginTopCollapse() == MDISCARD;
     1482    bool topQuirk = child->isTopMarginQuirk() || style()->marginBeforeCollapse() == MDISCARD;
    14831483
    14841484    if (marginInfo.canCollapseWithMarginBefore()) {
    … …  
    15331533    }
    15341534    else {
    1535         if (child->style()->marginTopCollapse() == MSEPARATE) {
     1535        if (child->style()->marginBeforeCollapse() == MSEPARATE) {
    15361536            setLogicalHeight(height() + marginInfo.margin() + child->marginTop());
    15371537            ypos = height();
    … …  
    15501550
    15511551        if (marginInfo.margin())
    1552             marginInfo.setMarginAfterQuirk(child->isBottomMarginQuirk() || style()->marginBottomCollapse() == MDISCARD);
     1552            marginInfo.setMarginAfterQuirk(child->isBottomMarginQuirk() || style()->marginAfterCollapse() == MDISCARD);
    15531553    }
    15541554   
    … …  
    18111811
    18121812    // Do not allow a collapse if the margin top collapse style is set to SEPARATE.
    1813     if (child->style()->marginTopCollapse() == MSEPARATE) {
     1813    if (child->style()->marginBeforeCollapse() == MSEPARATE) {
    18141814        marginInfo.setAtBeforeSideOfBlock(false);
    18151815        marginInfo.clearMargin();
    … …  
    19351935    // Update our height now that the child has been placed in the correct position.
    19361936    setLogicalHeight(height() + child->height());
    1937     if (child->style()->marginBottomCollapse() == MSEPARATE) {
     1937    if (child->style()->marginAfterCollapse() == MSEPARATE) {
    19381938        setLogicalHeight(height() + child->marginBottom());
    19391939        marginInfo.clearMargin();

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

    r68551 r68561  
    324324    if (rareNonInheritedData.get() != other->rareNonInheritedData.get()) {
    325325        if (rareNonInheritedData->m_appearance != other->rareNonInheritedData->m_appearance ||
    326             rareNonInheritedData->marginTopCollapse != other->rareNonInheritedData->marginTopCollapse ||
    327             rareNonInheritedData->marginBottomCollapse != other->rareNonInheritedData->marginBottomCollapse ||
     326            rareNonInheritedData->marginBeforeCollapse != other->rareNonInheritedData->marginBeforeCollapse ||
     327            rareNonInheritedData->marginAfterCollapse != other->rareNonInheritedData->marginAfterCollapse ||
    328328            rareNonInheritedData->lineClamp != other->rareNonInheritedData->lineClamp ||
    329329            rareNonInheritedData->textOverflow != other->rareNonInheritedData->textOverflow)

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

    r68427 r68561  
    666666    EUserSelect userSelect() const { return static_cast<EUserSelect>(rareInheritedData->userSelect); }
    667667    bool textOverflow() const { return rareNonInheritedData->textOverflow; }
    668     EMarginCollapse marginTopCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginTopCollapse); }
    669     EMarginCollapse marginBottomCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginBottomCollapse); }
     668    EMarginCollapse marginBeforeCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginBeforeCollapse); }
     669    EMarginCollapse marginAfterCollapse() const { return static_cast<EMarginCollapse>(rareNonInheritedData->marginAfterCollapse); }
    670670    EWordBreak wordBreak() const { return static_cast<EWordBreak>(rareInheritedData->wordBreak); }
    671671    EWordWrap wordWrap() const { return static_cast<EWordWrap>(rareInheritedData->wordWrap); }
    … …  
    10061006    void setUserSelect(EUserSelect s) { SET_VAR(rareInheritedData, userSelect, s); }
    10071007    void setTextOverflow(bool b) { SET_VAR(rareNonInheritedData, textOverflow, b); }
    1008     void setMarginTopCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginTopCollapse, c); }
    1009     void setMarginBottomCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginBottomCollapse, c); }
     1008    void setMarginBeforeCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginBeforeCollapse, c); }
     1009    void setMarginAfterCollapse(EMarginCollapse c) { SET_VAR(rareNonInheritedData, marginAfterCollapse, c); }
    10101010    void setWordBreak(EWordBreak b) { SET_VAR(rareInheritedData, wordBreak, b); }
    10111011    void setWordWrap(EWordWrap b) { SET_VAR(rareInheritedData, wordWrap, b); }
    … …  
    12191219    static EUserSelect initialUserSelect() { return SELECT_TEXT; }
    12201220    static bool initialTextOverflow() { return false; }
    1221     static EMarginCollapse initialMarginTopCollapse() { return MCOLLAPSE; }
    1222     static EMarginCollapse initialMarginBottomCollapse() { return MCOLLAPSE; }
     1221    static EMarginCollapse initialMarginBeforeCollapse() { return MCOLLAPSE; }
     1222    static EMarginCollapse initialMarginAfterCollapse() { return MCOLLAPSE; }
    12231223    static EWordBreak initialWordBreak() { return NormalWordBreak; }
    12241224    static EWordWrap initialWordWrap() { return NormalWordWrap; }

  • trunk/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r66037 r68561  
    3838    , userDrag(RenderStyle::initialUserDrag())
    3939    , textOverflow(RenderStyle::initialTextOverflow())
    40     , marginTopCollapse(MCOLLAPSE)
    41     , marginBottomCollapse(MCOLLAPSE)
     40    , marginBeforeCollapse(MCOLLAPSE)
     41    , marginAfterCollapse(MCOLLAPSE)
    4242    , matchNearestMailBlockquoteColor(RenderStyle::initialMatchNearestMailBlockquoteColor())
    4343    , m_appearance(RenderStyle::initialAppearance())
    … …  
    7474    , userDrag(o.userDrag)
    7575    , textOverflow(o.textOverflow)
    76     , marginTopCollapse(o.marginTopCollapse)
    77     , marginBottomCollapse(o.marginBottomCollapse)
     76    , marginBeforeCollapse(o.marginBeforeCollapse)
     77    , marginAfterCollapse(o.marginAfterCollapse)
    7878    , matchNearestMailBlockquoteColor(o.matchNearestMailBlockquoteColor)
    7979    , m_appearance(o.m_appearance)
    … …  
    119119        && userDrag == o.userDrag
    120120        && textOverflow == o.textOverflow
    121         && marginTopCollapse == o.marginTopCollapse
    122         && marginBottomCollapse == o.marginBottomCollapse
     121        && marginBeforeCollapse == o.marginBeforeCollapse
     122        && marginAfterCollapse == o.marginAfterCollapse
    123123        && matchNearestMailBlockquoteColor == o.matchNearestMailBlockquoteColor
    124124        && m_appearance == o.m_appearance

  • trunk/WebCore/rendering/style/StyleRareNonInheritedData.h

    r66037 r68561  
    9999    unsigned userDrag : 2; // EUserDrag
    100100    bool textOverflow : 1; // Whether or not lines that spill out should be truncated with "..."
    101     unsigned marginTopCollapse : 2; // EMarginCollapse
    102     unsigned marginBottomCollapse : 2; // EMarginCollapse
     101    unsigned marginBeforeCollapse : 2; // EMarginCollapse
     102    unsigned marginAfterCollapse : 2; // EMarginCollapse
    103103    unsigned matchNearestMailBlockquoteColor : 1; // EMatchNearestMailBlockquoteColor, FIXME: This property needs to be eliminated. It should never have been added.
    104104    unsigned m_appearance : 6; // EAppearance
Note: See TracChangeset for help on using the changeset viewer.