Changeset 93430 in webkit


Ignore:
Timestamp:
Aug 19, 2011 12:27:13 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[CSSRegions]Parse -webkit-region-break(after, before, inside)
​https://bugs.webkit.org/show_bug.cgi?id=66559

Patch by Mihnea Ovidenie <​mihnea@adobe.com> on 2011-08-19
Reviewed by David Hyatt.

Source/WebCore:

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • css/CSSMutableStyleDeclaration.cpp:
  • css/CSSParser.cpp:

(WebCore::CSSParser::parseValue):

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

(WebCore::CSSStyleSelector::applyProperty):

  • rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::regionBreakBefore):
(WebCore::InheritedFlags::regionBreakInside):
(WebCore::InheritedFlags::regionBreakAfter):
(WebCore::InheritedFlags::setRegionBreakBefore):
(WebCore::InheritedFlags::setRegionBreakInside):
(WebCore::InheritedFlags::setRegionBreakAfter):

  • rendering/style/StyleRareNonInheritedData.cpp:

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

  • rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

  • 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:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r93428 r93430  
     12011-08-19  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]Parse -webkit-region-break(after, before, inside)
     4        https://bugs.webkit.org/show_bug.cgi?id=66559
     5
     6        Reviewed by David Hyatt.
     7
     8        * fast/css/getComputedStyle/computed-style-expected.txt:
     9        * platform/mac/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     10        * svg/css/getComputedStyle-basic-expected.txt:
     11
    1122011-08-19  Mihnea Ovidenie  <mihnea@adobe.com>
    213

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

    r92792 r93430  
    190190-webkit-content-order: 0;
    191191-webkit-region-overflow: auto;
     192-webkit-region-break-after: auto;
     193-webkit-region-break-before: auto;
     194-webkit-region-break-inside: auto;
    192195clip-path: none;
    193196clip-rule: nonzero;

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

    r92792 r93430  
    189189    -webkit-content-order: 0
    190190    -webkit-region-overflow: auto
     191    -webkit-region-break-after: auto
     192    -webkit-region-break-before: auto
     193    -webkit-region-break-inside: auto
    191194    clip-path: none
    192195    clip-rule: nonzero

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

    r92792 r93430  
    377377rect: style.getPropertyValue(-webkit-region-overflow) : auto
    378378rect: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
     379rect: style.getPropertyValue(-webkit-region-break-after) : auto
     380rect: style.getPropertyCSSValue(-webkit-region-break-after) : [object CSSPrimitiveValue]
     381rect: style.getPropertyValue(-webkit-region-break-before) : auto
     382rect: style.getPropertyCSSValue(-webkit-region-break-before) : [object CSSPrimitiveValue]
     383rect: style.getPropertyValue(-webkit-region-break-inside) : auto
     384rect: style.getPropertyCSSValue(-webkit-region-break-inside) : [object CSSPrimitiveValue]
    379385rect: style.getPropertyValue(clip-path) : none
    380386rect: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue]
    … …  
    829835g: style.getPropertyValue(-webkit-region-overflow) : auto
    830836g: style.getPropertyCSSValue(-webkit-region-overflow) : [object CSSPrimitiveValue]
     837g: style.getPropertyValue(-webkit-region-break-after) : auto
     838g: style.getPropertyCSSValue(-webkit-region-break-after) : [object CSSPrimitiveValue]
     839g: style.getPropertyValue(-webkit-region-break-before) : auto
     840g: style.getPropertyCSSValue(-webkit-region-break-before) : [object CSSPrimitiveValue]
     841g: style.getPropertyValue(-webkit-region-break-inside) : auto
     842g: style.getPropertyCSSValue(-webkit-region-break-inside) : [object CSSPrimitiveValue]
    831843g: style.getPropertyValue(clip-path) : none
    832844g: style.getPropertyCSSValue(clip-path) : [object CSSPrimitiveValue]

  • trunk/Source/WebCore/ChangeLog

    r93429 r93430  
     12011-08-19  Mihnea Ovidenie  <mihnea@adobe.com>
     2
     3        [CSSRegions]Parse -webkit-region-break(after, before, inside)
     4        https://bugs.webkit.org/show_bug.cgi?id=66559
     5
     6        Reviewed by David Hyatt.
     7
     8        * css/CSSComputedStyleDeclaration.cpp:
     9        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     10        * css/CSSMutableStyleDeclaration.cpp:
     11        * css/CSSParser.cpp:
     12        (WebCore::CSSParser::parseValue):
     13        * css/CSSPropertyNames.in:
     14        * css/CSSStyleSelector.cpp:
     15        (WebCore::CSSStyleSelector::applyProperty):
     16        * rendering/style/RenderStyle.h:
     17        (WebCore::InheritedFlags::regionBreakBefore):
     18        (WebCore::InheritedFlags::regionBreakInside):
     19        (WebCore::InheritedFlags::regionBreakAfter):
     20        (WebCore::InheritedFlags::setRegionBreakBefore):
     21        (WebCore::InheritedFlags::setRegionBreakInside):
     22        (WebCore::InheritedFlags::setRegionBreakAfter):
     23        * rendering/style/StyleRareNonInheritedData.cpp:
     24        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     25        (WebCore::StyleRareNonInheritedData::operator==):
     26        * rendering/style/StyleRareNonInheritedData.h:
     27
    1282011-08-19  Emil A Eklund  <eae@chromium.org>
    229

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

    r93097 r93430  
    252252    CSSPropertyWebkitFlow,
    253253    CSSPropertyWebkitContentOrder,
    254     CSSPropertyWebkitRegionOverflow
     254    CSSPropertyWebkitRegionOverflow,
     255    CSSPropertyWebkitRegionBreakAfter,
     256    CSSPropertyWebkitRegionBreakBefore,
     257    CSSPropertyWebkitRegionBreakInside
    255258#if ENABLE(SVG)
    256259    ,
    … …  
    10691072                return primitiveValueCache->createIdentifierValue(CSSValueAuto);
    10701073            return zoomAdjustedPixelValue(style->columnWidth(), style.get(), primitiveValueCache);
     1074        case CSSPropertyWebkitRegionBreakAfter:
     1075            return primitiveValueCache->createValue(style->regionBreakAfter());
     1076        case CSSPropertyWebkitRegionBreakBefore:
     1077            return primitiveValueCache->createValue(style->regionBreakBefore());
     1078        case CSSPropertyWebkitRegionBreakInside:
     1079            return primitiveValueCache->createValue(style->regionBreakInside());
    10711080        case CSSPropertyCursor: {
    10721081            RefPtr<CSSValueList> list;

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

    r86542 r93430  
    803803    CSSPropertyPageBreakBefore,
    804804    CSSPropertyPageBreakInside,
     805    CSSPropertyWebkitRegionBreakAfter,
     806    CSSPropertyWebkitRegionBreakBefore,
     807    CSSPropertyWebkitRegionBreakInside,
    805808    CSSPropertyTextAlign,
    806809    CSSPropertyTextIndent,

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

    r92792 r93430  
    884884    case CSSPropertyWebkitColumnBreakAfter:
    885885    case CSSPropertyWebkitColumnBreakBefore:
     886    case CSSPropertyWebkitRegionBreakAfter:
     887    case CSSPropertyWebkitRegionBreakBefore:
    886888        if (id == CSSValueAuto ||
    887889             id == CSSValueAlways ||
    … …  
    894896    case CSSPropertyPageBreakInside:    // avoid | auto | inherit
    895897    case CSSPropertyWebkitColumnBreakInside:
     898    case CSSPropertyWebkitRegionBreakInside:
    896899        if (id == CSSValueAuto || id == CSSValueAvoid)
    897900            validPrimitive = true;

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

    r92792 r93430  
    332332-webkit-region-overflow
    333333-webkit-wrap-shape
     334-webkit-region-break-after
     335-webkit-region-break-before
     336-webkit-region-break-inside
    334337

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

    r93263 r93430  
    45564556            m_style->setColumnCount(RenderStyle::initialColumnCount());
    45574557        }
     4558        return;
     4559    case CSSPropertyWebkitRegionBreakBefore:
     4560        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(regionBreakBefore, RegionBreakBefore, PageBreak)
     4561        return;
     4562    case CSSPropertyWebkitRegionBreakAfter:
     4563        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(regionBreakAfter, RegionBreakAfter, PageBreak)
     4564        return;
     4565    case CSSPropertyWebkitRegionBreakInside:
     4566        HANDLE_INHERIT_AND_INITIAL_AND_PRIMITIVE_WITH_VALUE(regionBreakInside, RegionBreakInside, PageBreak)
    45584567        return;
    45594568    case CSSPropertyWebkitMarquee:

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

    r93218 r93430  
    726726    EPageBreak columnBreakInside() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakInside); }
    727727    EPageBreak columnBreakAfter() const { return static_cast<EPageBreak>(rareNonInheritedData->m_multiCol->m_breakAfter); }
     728    EPageBreak regionBreakBefore() const { return static_cast<EPageBreak>(rareNonInheritedData->m_regionBreakBefore); }
     729    EPageBreak regionBreakInside() const { return static_cast<EPageBreak>(rareNonInheritedData->m_regionBreakInside); }
     730    EPageBreak regionBreakAfter() const { return static_cast<EPageBreak>(rareNonInheritedData->m_regionBreakAfter); }
    728731    const TransformOperations& transform() const { return rareNonInheritedData->m_transform->m_operations; }
    729732    Length transformOriginX() const { return rareNonInheritedData->m_transform->m_x; }
    … …  
    10981101    void setColumnBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID); SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakInside, p); }
    10991102    void setColumnBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData.access()->m_multiCol, m_breakAfter, p); }
     1103    void setRegionBreakBefore(EPageBreak p) { SET_VAR(rareNonInheritedData, m_regionBreakBefore, p); }
     1104    void setRegionBreakInside(EPageBreak p) { ASSERT(p == PBAUTO || p == PBAVOID); SET_VAR(rareNonInheritedData, m_regionBreakInside, p); }
     1105    void setRegionBreakAfter(EPageBreak p) { SET_VAR(rareNonInheritedData, m_regionBreakAfter, p); }
    11001106    void inheritColumnPropertiesFrom(RenderStyle* parent) { rareNonInheritedData.access()->m_multiCol = parent->rareNonInheritedData->m_multiCol; }
    11011107    void setTransform(const TransformOperations& ops) { SET_VAR(rareNonInheritedData.access()->m_transform, m_operations, ops); }

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

    r92792 r93430  
    6161    , m_regionOverflow(RenderStyle::initialRegionOverflow())
    6262    , m_wrapShape(RenderStyle::initialWrapShape())
     63    , m_regionBreakAfter(RenderStyle::initialPageBreak())
     64    , m_regionBreakBefore(RenderStyle::initialPageBreak())
     65    , m_regionBreakInside(RenderStyle::initialPageBreak())
    6366{
    6467}
    … …  
    108111    , m_regionOverflow(o.m_regionOverflow)
    109112    , m_wrapShape(o.m_wrapShape)
     113    , m_regionBreakAfter(o.m_regionBreakAfter)
     114    , m_regionBreakBefore(o.m_regionBreakBefore)
     115    , m_regionBreakInside(o.m_regionBreakInside)
    110116{
    111117}
    … …  
    161167        && (m_regionIndex == o.m_regionIndex)
    162168        && (m_regionOverflow == o.m_regionOverflow)
    163         && (m_wrapShape == o.m_wrapShape);
     169        && (m_wrapShape == o.m_wrapShape)
     170        && (m_regionBreakAfter == o.m_regionBreakAfter)
     171        && (m_regionBreakBefore == o.m_regionBreakBefore)
     172        && (m_regionBreakInside == o.m_regionBreakInside);
    164173}
    165174

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

    r93195 r93430  
    144144    RefPtr<CSSWrapShape> m_wrapShape;
    145145
     146    unsigned m_regionBreakAfter : 2; // EPageBreak
     147    unsigned m_regionBreakBefore : 2; // EPageBreak
     148    unsigned m_regionBreakInside : 2; // EPageBreak
     149
    146150private:
    147151    StyleRareNonInheritedData();
Note: See TracChangeset for help on using the changeset viewer.