Changeset 120609 in webkit


Ignore:
Timestamp:
Jun 18, 2012, 11:05:40 AM (13 years ago)
Author:
mitz@apple.com
Message:

Column progression direction cannot be set independently of writing direction
​https://bugs.webkit.org/show_bug.cgi?id=89315

Source/WebCore:

Added a column-progression property, which can have the values 'normal' and 'reverse'. When
set to 'reverse', the first column is positioned at the end side of the block, and
subsequent columns go from the in the start direction (in the inline column axis case; in
the block column axis case, the first column coincides with the block and subsequent columns
go before the block).

Reviewed by Darin Adler.

Test: fast/multicol/progression-reverse.html

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Added handling of the new
property.

  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue): Added validity check for the new property. The valid
values are the identifiers 'normal' and 'reverse'.

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added this mapping from ColumnProgression
enum values to the identifiers 'normal and 'reverse'.
(WebCore::CSSPrimitiveValue::operator ColumnProgression): Added this mapping from the
identifiers 'normal' and 'reverse' to ColumnProgression enum values.

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty): Added the new property to the set of
non-inherited properties.

  • css/CSSPropertyNames.in: Added -webkit-column-progression.
  • css/StyleBuilder.cpp:

(WebCore::StyleBuilder::StyleBuilder): Added a handler for the new property.

  • rendering/ColumnInfo.h:

(WebCore::ColumnInfo::ColumnInfo): Added an initializer for the m_progressionIsReversed
member variable.
(WebCore::ColumnInfo::progressionIsReversed): Added this accessor.
(WebCore::ColumnInfo::setProgressionIsReversed): Ditto.
(ColumnInfo): Added a m_progressionIsReversed member variable.

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintColumnRules): Changed to advance in the reverse direction if
needed.
(WebCore::RenderBlock::setDesiredColumnCountAndWidth): Added call to
ColumnInfo::setProgressionIsReversed(), based on the new property.
(WebCore::RenderBlock::columnRectAt): Changed to take the progression direction into
account.

  • rendering/style/RenderStyle.h: Added accessors and initial value for column progression.
  • rendering/style/RenderStyleConstants.h: Added ColumnProgression enum.
  • rendering/style/StyleMultiColData.cpp:

(WebCore::StyleMultiColData::StyleMultiColData): Added initializer for the m_progression
member variable.
(WebCore::StyleMultiColData::operator==): Added equality check for m_progression.

  • rendering/style/StyleMultiColData.h:

(StyleMultiColData): Added m_progression member variable.

LayoutTests:

Reviewed by Darin Adler.

  • fast/css/getComputedStyle/computed-style-expected.txt:
  • fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • fast/multicol/progression-reverse-expected.png: Added.
  • fast/multicol/progression-reverse-expected.txt: Added.
  • fast/multicol/progression-reverse.html: Added.
  • platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
  • platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
  • platform/mac/svg/css/getComputedStyle-basic-expected.txt:
  • svg/css/getComputedStyle-basic-expected.txt:
Location:
trunk
Files:
3 added
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r120607 r120609  
     12012-06-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Column progression direction cannot be set independently of writing direction
     4        https://bugs.webkit.org/show_bug.cgi?id=89315
     5
     6        Reviewed by Darin Adler.
     7
     8        * fast/css/getComputedStyle/computed-style-expected.txt:
     9        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     10        * fast/multicol/progression-reverse-expected.png: Added.
     11        * fast/multicol/progression-reverse-expected.txt: Added.
     12        * fast/multicol/progression-reverse.html: Added.
     13        * platform/mac/fast/css/getComputedStyle/computed-style-expected.txt:
     14        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     15        * platform/mac/svg/css/getComputedStyle-basic-expected.txt:
     16        * svg/css/getComputedStyle-basic-expected.txt:
     17
    1182012-06-18  Sheriff Bot  <webkit.review.bot@gmail.com>
    219

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

    r120495 r120609  
    140140-webkit-column-count: auto;
    141141-webkit-column-gap: normal;
     142-webkit-column-progression: normal;
    142143-webkit-column-rule-color: rgb(0, 0, 0);
    143144-webkit-column-rule-style: none;

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

    r120495 r120609  
    139139    -webkit-column-count: auto
    140140    -webkit-column-gap: normal
     141    -webkit-column-progression: normal
    141142    -webkit-column-rule-color: rgb(0, 0, 0)
    142143    -webkit-column-rule-style: none

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

    r120495 r120609  
    140140-webkit-column-count: auto;
    141141-webkit-column-gap: normal;
     142-webkit-column-progression: normal;
    142143-webkit-column-rule-color: rgb(0, 0, 0);
    143144-webkit-column-rule-style: none;

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

    r120495 r120609  
    139139    -webkit-column-count: auto
    140140    -webkit-column-gap: normal
     141    -webkit-column-progression: normal
    141142    -webkit-column-rule-color: rgb(0, 0, 0)
    142143    -webkit-column-rule-style: none

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

    r120495 r120609  
    277277rect: style.getPropertyValue(-webkit-column-gap) : normal
    278278rect: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
     279rect: style.getPropertyValue(-webkit-column-progression) : normal
     280rect: style.getPropertyCSSValue(-webkit-column-progression) : [object CSSPrimitiveValue]
    279281rect: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
    280282rect: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]
    … …  
    811813g: style.getPropertyValue(-webkit-column-gap) : normal
    812814g: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
     815g: style.getPropertyValue(-webkit-column-progression) : normal
     816g: style.getPropertyCSSValue(-webkit-column-progression) : [object CSSPrimitiveValue]
    813817g: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
    814818g: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]

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

    r120495 r120609  
    275275rect: style.getPropertyValue(-webkit-column-gap) : normal
    276276rect: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
     277rect: style.getPropertyValue(-webkit-column-progression) : normal
     278rect: style.getPropertyCSSValue(-webkit-column-progression) : [object CSSPrimitiveValue]
    277279rect: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
    278280rect: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]
    … …  
    805807g: style.getPropertyValue(-webkit-column-gap) : normal
    806808g: style.getPropertyCSSValue(-webkit-column-gap) : [object CSSPrimitiveValue]
     809g: style.getPropertyValue(-webkit-column-progression) : normal
     810g: style.getPropertyCSSValue(-webkit-column-progression) : [object CSSPrimitiveValue]
    807811g: style.getPropertyValue(-webkit-column-rule-color) : rgb(0, 0, 0)
    808812g: style.getPropertyCSSValue(-webkit-column-rule-color) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r120608 r120609  
     12012-06-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Column progression direction cannot be set independently of writing direction
     4        https://bugs.webkit.org/show_bug.cgi?id=89315
     5
     6        Added a column-progression property, which can have the values 'normal' and 'reverse'. When
     7        set to 'reverse', the first column is positioned at the end side of the block, and
     8        subsequent columns go from the in the start direction (in the inline column axis case; in
     9        the block column axis case, the first column coincides with the block and subsequent columns
     10        go before the block).
     11
     12        Reviewed by Darin Adler.
     13
     14        Test: fast/multicol/progression-reverse.html
     15
     16        * css/CSSComputedStyleDeclaration.cpp:
     17        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue): Added handling of the new
     18        property.
     19
     20        * css/CSSParser.cpp:
     21        (WebCore::CSSParser::parseValue): Added validity check for the new property. The valid
     22        values are the identifiers 'normal' and 'reverse'.
     23        * css/CSSPrimitiveValueMappings.h:
     24        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Added this mapping from ColumnProgression
     25        enum values to the identifiers 'normal and 'reverse'.
     26        (WebCore::CSSPrimitiveValue::operator ColumnProgression): Added this mapping from the
     27        identifiers 'normal' and 'reverse' to ColumnProgression enum values.
     28        * css/CSSProperty.cpp:
     29        (WebCore::CSSProperty::isInheritedProperty): Added the new property to the set of
     30        non-inherited properties.
     31        * css/CSSPropertyNames.in: Added -webkit-column-progression.
     32        * css/StyleBuilder.cpp:
     33        (WebCore::StyleBuilder::StyleBuilder): Added a handler for the new property.
     34        * rendering/ColumnInfo.h:
     35        (WebCore::ColumnInfo::ColumnInfo): Added an initializer for the m_progressionIsReversed
     36        member variable.
     37        (WebCore::ColumnInfo::progressionIsReversed): Added this accessor.
     38        (WebCore::ColumnInfo::setProgressionIsReversed): Ditto.
     39        (ColumnInfo): Added a m_progressionIsReversed member variable.
     40        * rendering/RenderBlock.cpp:
     41        (WebCore::RenderBlock::paintColumnRules): Changed to advance in the reverse direction if
     42        needed.
     43        (WebCore::RenderBlock::setDesiredColumnCountAndWidth): Added call to
     44        ColumnInfo::setProgressionIsReversed(), based on the new property.
     45        (WebCore::RenderBlock::columnRectAt): Changed to take the progression direction into
     46        account.
     47        * rendering/style/RenderStyle.h: Added accessors and initial value for column progression.
     48        * rendering/style/RenderStyleConstants.h: Added ColumnProgression enum.
     49        * rendering/style/StyleMultiColData.cpp:
     50        (WebCore::StyleMultiColData::StyleMultiColData): Added initializer for the m_progression
     51        member variable.
     52        (WebCore::StyleMultiColData::operator==): Added equality check for m_progression.
     53        * rendering/style/StyleMultiColData.h:
     54        (StyleMultiColData): Added m_progression member variable.
     55
    1562012-06-18  Martin Robinson  <mrobinson@igalia.com>
    257

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r120154 r120609  
    222222    CSSPropertyWebkitColumnCount,
    223223    CSSPropertyWebkitColumnGap,
     224    CSSPropertyWebkitColumnProgression,
    224225    CSSPropertyWebkitColumnRuleColor,
    225226    CSSPropertyWebkitColumnRuleStyle,
    … …  
    15951596                return cssValuePool().createIdentifierValue(CSSValueNormal);
    15961597            return zoomAdjustedPixelValue(style->columnGap(), style.get());
     1598        case CSSPropertyWebkitColumnProgression:
     1599            return cssValuePool().createValue(style->columnProgression());
    15971600        case CSSPropertyWebkitColumnRuleColor:
    15981601            return m_allowVisitedStyle ? cssValuePool().createColorValue(style->visitedDependentColor(CSSPropertyOutlineColor).rgb()) : currentColorOrValidColor(style.get(), style->columnRuleColor());

  • trunk/Source/WebCore/css/CSSParser.cpp

    r120495 r120609  
    23392339    case CSSPropertyWebkitColumnAxis:
    23402340        if (id == CSSValueHorizontal || id == CSSValueVertical || id == CSSValueAuto)
     2341            validPrimitive = true;
     2342        break;
     2343    case CSSPropertyWebkitColumnProgression:
     2344        if (id == CSSValueNormal || id == CSSValueReverse)
    23412345            validPrimitive = true;
    23422346        break;

  • trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

    r120495 r120609  
    37153715}
    37163716
     3717template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnProgression e)
     3718    : CSSValue(PrimitiveClass)
     3719{
     3720    m_primitiveUnitType = CSS_IDENT;
     3721    switch (e) {
     3722    case NormalColumnProgression:
     3723        m_value.ident = CSSValueNormal;
     3724        break;
     3725    case ReverseColumnProgression:
     3726        m_value.ident = CSSValueReverse;
     3727        break;
     3728    }
     3729}
     3730
     3731template<> inline CSSPrimitiveValue::operator ColumnProgression() const
     3732{
     3733    switch (m_value.ident) {
     3734    case CSSValueNormal:
     3735        return NormalColumnProgression;
     3736    case CSSValueReverse:
     3737        return ReverseColumnProgression;
     3738    default:
     3739        ASSERT_NOT_REACHED();
     3740        return NormalColumnProgression;
     3741    }
     3742}
     3743
    37173744template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow)
    37183745: CSSValue(PrimitiveClass)

  • trunk/Source/WebCore/css/CSSProperty.cpp

    r120154 r120609  
    537537    case CSSPropertyWebkitColumnCount:
    538538    case CSSPropertyWebkitColumnGap:
     539    case CSSPropertyWebkitColumnProgression:
    539540    case CSSPropertyWebkitColumnRule:
    540541    case CSSPropertyWebkitColumnRuleColor:

  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r120523 r120609  
    250250-webkit-column-count
    251251-webkit-column-gap
     252-webkit-column-progression
    252253-webkit-column-rule
    253254-webkit-column-rule-color

  • trunk/Source/WebCore/css/StyleBuilder.cpp

    r120029 r120609  
    19691969    setPropertyHandler(CSSPropertyWebkitColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
    19701970    setPropertyHandler(CSSPropertyWebkitColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
     1971    setPropertyHandler(CSSPropertyWebkitColumnProgression, ApplyPropertyDefault<ColumnProgression, &RenderStyle::columnProgression, ColumnProgression, &RenderStyle::setColumnProgression, ColumnProgression, &RenderStyle::initialColumnProgression>::createHandler());
    19711972    setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
    19721973    setPropertyHandler(CSSPropertyWebkitColumnRuleWidth, ApplyPropertyComputeLength<unsigned short, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth, &RenderStyle::initialColumnRuleWidth, NormalDisabled, ThicknessEnabled>::createHandler());

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

    r112172 r120609  
    3939        , m_desiredColumnCount(1)
    4040        , m_progressionAxis(InlineAxis)
     41        , m_progressionIsReversed(false)
    4142        , m_columnCount(1)
    4243        , m_columnHeight(0)
    … …  
    5960    Axis progressionAxis() const { return m_progressionAxis; }
    6061    void setProgressionAxis(Axis progressionAxis) { m_progressionAxis = progressionAxis; }
     62
     63    bool progressionIsReversed() const { return m_progressionIsReversed; }
     64    void setProgressionIsReversed(bool reversed) { m_progressionIsReversed = reversed; }
    6165
    6266    unsigned columnCount() const { return m_columnCount; }
    … …  
    103107    unsigned m_desiredColumnCount;
    104108    Axis m_progressionAxis;
     109    bool m_progressionIsReversed;
    105110
    106111    unsigned m_columnCount;

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

    r120477 r120609  
    26722672
    26732673    if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
    2674         LayoutUnit currLogicalLeftOffset = style()->isLeftToRightDirection() ? ZERO_LAYOUT_UNIT : contentLogicalWidth();
     2674        bool leftToRight = style()->isLeftToRightDirection() ^ colInfo->progressionIsReversed();
     2675        LayoutUnit currLogicalLeftOffset = leftToRight ? ZERO_LAYOUT_UNIT : contentLogicalWidth();
    26752676        LayoutUnit ruleAdd = logicalLeftOffsetForContent();
    2676         LayoutUnit ruleLogicalLeft = style()->isLeftToRightDirection() ? ZERO_LAYOUT_UNIT : contentLogicalWidth();
     2677        LayoutUnit ruleLogicalLeft = leftToRight ? ZERO_LAYOUT_UNIT : contentLogicalWidth();
    26772678        LayoutUnit inlineDirectionSize = colInfo->desiredColumnWidth();
    26782679        BoxSide boxSide = isHorizontalWritingMode()
    2679             ? style()->isLeftToRightDirection() ? BSLeft : BSRight
    2680             : style()->isLeftToRightDirection() ? BSTop : BSBottom;
     2680            ? leftToRight ? BSLeft : BSRight
     2681            : leftToRight ? BSTop : BSBottom;
    26812682
    26822683        for (unsigned i = 0; i < colCount; i++) {
    26832684            // Move to the next position.
    2684             if (style()->isLeftToRightDirection()) {
     2685            if (leftToRight) {
    26852686                ruleLogicalLeft += inlineDirectionSize + colGap / 2;
    26862687                currLogicalLeftOffset += inlineDirectionSize + colGap;
    … …  
    27032704        }
    27042705    } else {
    2705         LayoutUnit ruleLeft = isHorizontalWritingMode() ? borderLeft() + paddingLeft() : colGap / 2 - colGap - ruleThickness / 2 + borderBefore() + paddingBefore();
     2706        bool topToBottom = !style()->isFlippedBlocksWritingMode() ^ colInfo->progressionIsReversed();
     2707        LayoutUnit ruleLeft = isHorizontalWritingMode()
     2708            ? borderLeft() + paddingLeft()
     2709            : colGap / 2 - colGap - ruleThickness / 2 + (!colInfo->progressionIsReversed() ? borderBefore() + paddingBefore() : borderAfter() + paddingAfter());
    27062710        LayoutUnit ruleWidth = isHorizontalWritingMode() ? contentWidth() : ruleThickness;
    2707         LayoutUnit ruleTop = isHorizontalWritingMode() ? colGap / 2 - colGap - ruleThickness / 2 + borderBefore() + paddingBefore() : borderStart() + paddingStart();
     2711        LayoutUnit ruleTop = isHorizontalWritingMode()
     2712            ? colGap / 2 - colGap - ruleThickness / 2 + (!colInfo->progressionIsReversed() ? borderBefore() + paddingBefore() : borderAfter() + paddingAfter())
     2713            : borderStart() + paddingStart();
    27082714        LayoutUnit ruleHeight = isHorizontalWritingMode() ? ruleThickness : contentHeight();
    27092715        LayoutRect ruleRect(ruleLeft, ruleTop, ruleWidth, ruleHeight);
    27102716
    2711         flipForWritingMode(ruleRect);
     2717        if (!topToBottom) {
     2718            if (isHorizontalWritingMode())
     2719                ruleRect.setY(height() - ruleRect.maxY());
     2720            else
     2721                ruleRect.setX(width() - ruleRect.maxX());
     2722        }
     2723
    27122724        ruleRect.moveBy(paintOffset);
    27132725
    27142726        BoxSide boxSide = isHorizontalWritingMode()
    2715             ? !style()->isFlippedBlocksWritingMode() ? BSTop : BSBottom
    2716             : !style()->isFlippedBlocksWritingMode() ? BSLeft : BSRight;
    2717 
    2718         LayoutSize step(0, !style()->isFlippedBlocksWritingMode() ? colInfo->columnHeight() + colGap : -(colInfo->columnHeight() + colGap));
     2727            ? topToBottom ? BSTop : BSBottom
     2728            : topToBottom ? BSLeft : BSRight;
     2729
     2730        LayoutSize step(0, topToBottom ? colInfo->columnHeight() + colGap : -(colInfo->columnHeight() + colGap));
    27192731        if (!isHorizontalWritingMode())
    27202732            step = step.transposedSize();
    … …  
    49774989        info->setDesiredColumnWidth(width);
    49784990        info->setProgressionAxis(style()->hasInlineColumnAxis() ? ColumnInfo::InlineAxis : ColumnInfo::BlockAxis);
     4991        info->setProgressionIsReversed(style()->columnProgression() == ReverseColumnProgression);
    49794992    }
    49804993}
    … …  
    50195032    int colGap = columnGap();
    50205033    if (colInfo->progressionAxis() == ColumnInfo::InlineAxis) {
    5021         if (style()->isLeftToRightDirection())
     5034        if (style()->isLeftToRightDirection() ^ colInfo->progressionIsReversed())
    50225035            colLogicalLeft += index * (colLogicalWidth + colGap);
    50235036        else
    50245037            colLogicalLeft += contentLogicalWidth() - colLogicalWidth - index * (colLogicalWidth + colGap);
    5025     } else
    5026         colLogicalTop += index * (colLogicalHeight + colGap);
     5038    } else {
     5039        if (!colInfo->progressionIsReversed())
     5040            colLogicalTop += index * (colLogicalHeight + colGap);
     5041        else
     5042            colLogicalTop += contentLogicalHeight() - colLogicalHeight - index * (colLogicalHeight + colGap);
     5043    }
    50275044
    50285045    if (isHorizontalWritingMode())

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

    r120495 r120609  
    876876        return axis == AutoColumnAxis || isHorizontalWritingMode() == (axis == HorizontalColumnAxis);
    877877    }
     878    ColumnProgression columnProgression() const { return static_cast<ColumnProgression>(rareNonInheritedData->m_multiCol->m_progression); }
    878879    float columnWidth() const { return rareNonInheritedData->m_multiCol->m_width; }
    879880    bool hasAutoColumnWidth() const { return rareNonInheritedData->m_multiCol->m_autoWidth; }
    … …  
    13101311    void setResize(EResize r) { SET_VAR(rareInheritedData, resize, r); }
    13111312    void setColumnAxis(ColumnAxis axis) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_axis, axis); }
     1313    void setColumnProgression(ColumnProgression progression) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_progression, progression); }
    13121314    void setColumnWidth(float f) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_autoWidth, false); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_width, f); }
    13131315    void setHasAutoColumnWidth() { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_autoWidth, true); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_width, 0); }
    … …  
    15491551    static ColorSpace initialColorSpace() { return ColorSpaceDeviceRGB; }
    15501552    static ColumnAxis initialColumnAxis() { return AutoColumnAxis; }
     1553    static ColumnProgression initialColumnProgression() { return NormalColumnProgression; }
    15511554    static TextDirection initialDirection() { return LTR; }
    15521555    static WritingMode initialWritingMode() { return TopToBottomWritingMode; }

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

    r120495 r120609  
    461461enum ColumnAxis { HorizontalColumnAxis, VerticalColumnAxis, AutoColumnAxis };
    462462
     463enum ColumnProgression { NormalColumnProgression, ReverseColumnProgression };
     464
    463465enum LineSnap { LineSnapNone, LineSnapBaseline, LineSnapContain };
    464466

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

    r98608 r120609  
    3939    , m_breakInside(RenderStyle::initialPageBreak())
    4040    , m_axis(RenderStyle::initialColumnAxis())
     41    , m_progression(RenderStyle::initialColumnProgression())
    4142{
    4243}
    … …  
    5758    , m_breakInside(o.m_breakInside)
    5859    , m_axis(o.m_axis)
     60    , m_progression(o.m_progression)
    5961{
    6062}
    … …  
    6567           && m_rule == o.m_rule && m_visitedLinkColumnRuleColor == o.m_visitedLinkColumnRuleColor && m_breakBefore == o.m_breakBefore
    6668           && m_autoWidth == o.m_autoWidth && m_autoCount == o.m_autoCount && m_normalGap == o.m_normalGap
    67            && m_columnSpan == o.m_columnSpan && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside && m_axis == o.m_axis;
     69           && m_columnSpan == o.m_columnSpan && m_breakAfter == o.m_breakAfter && m_breakInside == o.m_breakInside && m_axis == o.m_axis
     70           && m_progression == o.m_progression;
    6871}
    6972

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

    r98748 r120609  
    6868    unsigned m_breakInside : 2; // EPageBreak
    6969    unsigned m_axis : 2; // ColumnAxis
     70    unsigned m_progression : 2; // ColumnProgression
    7071
    7172private:
Note: See TracChangeset for help on using the changeset viewer.