Changeset 151394 in webkit


Ignore:
Timestamp:
Jun 10, 2013 7:19:13 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

[CSS Regions] Rename region-overflow to region-fragment
​https://bugs.webkit.org/show_bug.cgi?id=117397

PerformanceTests:

Renamed -webkit-region-overflow to -webkit-region-fragment according to the new working draft
at ​http://www.w3.org/TR/2013/WD-css3-regions-20130528/#the-region-fragment-property

Patch by Radu Stavila <​stavila@adobe.com> on 2013-06-10
Reviewed by Alexander Pavlov.

  • Layout/resources/regions.css:

Source/WebCore:

Renamed -webkit-region-overflow to -webkit-region-fragment and
webkitRegionOverflow to webkitRegionFragment according to the new working draft
at ​http://www.w3.org/TR/2013/WD-css3-regions-20130528/#the-region-fragment-property

Patch by Radu Stavila <​stavila@adobe.com> on 2013-06-10
Reviewed by Alexander Pavlov.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

(WebCore::isValidKeywordPropertyAndValue):
(WebCore::isKeywordPropertyID):
(WebCore::CSSParser::parseValue):

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::operator RegionFragment):

  • css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

  • css/CSSPropertyNames.in:
  • css/CSSValueKeywords.in:
  • css/DeprecatedStyleBuilder.cpp:

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

  • rendering/RenderBlock.cpp:

(WebCore::RenderBlock::hasNextPage):

  • rendering/RenderRegion.cpp:

(WebCore::RenderRegion::overflowRectForFlowThreadPortion):

  • rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::changeRequiresLayout):

  • rendering/style/RenderStyle.h:
  • rendering/style/RenderStyleConstants.h:
  • rendering/style/StyleRareNonInheritedData.cpp:

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

  • rendering/style/StyleRareNonInheritedData.h:

LayoutTests:

Renamed -webkit-region-overflow to -webkit-region-fragment and
webkitRegionOverflow to webkitRegionFragment according to the new working draft
at ​http://www.w3.org/TR/2013/WD-css3-regions-20130528/#the-region-fragment-property

Patch by Radu Stavila <​stavila@adobe.com> on 2013-06-10
Reviewed by Alexander Pavlov.

  • fast/regions/autoheight-breakafteralways-maxheight.html:
  • fast/regions/autoheight-breakbeforealways.html:
  • fast/regions/autoheight-singleregion-breakafteralways-maxheight.html:
  • fast/regions/autoheight-singleregion-breakafteralways.html:
  • fast/regions/autoheight-singleregion-breakaftermargin.html:
  • fast/regions/autoheight-singleregion-breakbeforealways-minheight.html:
  • fast/regions/autoheight-singleregion-breakbeforealways.html:
  • fast/regions/autoheight-singleregion-multiplebreaks.html:
  • fast/regions/css-regions-disabled-expected.txt:
  • fast/regions/region-overflow-auto-overflow-hidden.html:
  • fast/regions/region-overflow-auto-overflow-visible.html:
  • fast/regions/region-overflow-break.html:
  • fast/regions/regions-widows-and-orphans.html:
  • fast/regions/script-tests/css-regions-disabled.js:
  • fast/regions/script-tests/webkit-region-overflow-parsing.js:
  • fast/regions/webkit-region-overflow-parsing-expected.txt:
Location:
trunk
Files:
1 added
1 deleted
33 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r151375 r151394  
     12013-06-10  Radu Stavila  <stavila@adobe.com>
     2
     3        [CSS Regions] Rename region-overflow to region-fragment
     4        https://bugs.webkit.org/show_bug.cgi?id=117397
     5
     6        Renamed -webkit-region-overflow to -webkit-region-fragment and
     7        webkitRegionOverflow to webkitRegionFragment according to the new working draft
     8        at http://www.w3.org/TR/2013/WD-css3-regions-20130528/#the-region-fragment-property
     9
     10        Reviewed by Alexander Pavlov.
     11
     12        * fast/regions/autoheight-breakafteralways-maxheight.html:
     13        * fast/regions/autoheight-breakbeforealways.html:
     14        * fast/regions/autoheight-singleregion-breakafteralways-maxheight.html:
     15        * fast/regions/autoheight-singleregion-breakafteralways.html:
     16        * fast/regions/autoheight-singleregion-breakaftermargin.html:
     17        * fast/regions/autoheight-singleregion-breakbeforealways-minheight.html:
     18        * fast/regions/autoheight-singleregion-breakbeforealways.html:
     19        * fast/regions/autoheight-singleregion-multiplebreaks.html:
     20        * fast/regions/css-regions-disabled-expected.txt:
     21        * fast/regions/region-overflow-auto-overflow-hidden.html:
     22        * fast/regions/region-overflow-auto-overflow-visible.html:
     23        * fast/regions/region-overflow-break.html:
     24        * fast/regions/regions-widows-and-orphans.html:
     25        * fast/regions/script-tests/css-regions-disabled.js:
     26        * fast/regions/script-tests/webkit-region-overflow-parsing.js:
     27        * fast/regions/webkit-region-overflow-parsing-expected.txt:
     28
    1292013-06-10  Mátyás Mustoha  <mmatyas@inf.u-szeged.hu>
    230

  • trunk/LayoutTests/fast/regions/autoheight-breakafteralways-maxheight.html

    r132602 r151394  
    99
    1010            .regionSize { width: 250px; }
    11             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 100px; max-height: 100px; }
     11            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 100px; max-height: 100px; }
    1212
    1313             .redBox { position: absolute; height: 50px; background-color: red; }

  • trunk/LayoutTests/fast/regions/autoheight-breakbeforealways.html

    r132602 r151394  
    99
    1010            .regionSize { width: 250px; }
    11             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 100px; }
     11            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 100px; }
    1212
    1313            .redBox { position: absolute; height: 50px; background-color: red; }

  • trunk/LayoutTests/fast/regions/autoheight-singleregion-breakafteralways-maxheight.html

    r132602 r151394  
    99
    1010            .regionSize { width: 250px; }
    11             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 100px; max-height: 100px; }
     11            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 100px; max-height: 100px; }
    1212
    1313             .redBox { position: absolute; height: 50px; background-color: red; }

  • trunk/LayoutTests/fast/regions/autoheight-singleregion-breakafteralways.html

    r132602 r151394  
    77
    88            .regionSize { width: 250px; }
    9             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 100px; }
     9            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 100px; }
    1010
    1111            #p2 { -webkit-region-break-after: always; }

  • trunk/LayoutTests/fast/regions/autoheight-singleregion-breakaftermargin.html

    r132602 r151394  
    99
    1010            .regionSize { width: 250px; }
    11             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 150px; border: 15px solid green;}
     11            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 150px; border: 15px solid green;}
    1212
    1313            .redContainer { border: 15px solid red; position: absolute; top: 150px; width: 250px; height: 200px; }

  • trunk/LayoutTests/fast/regions/autoheight-singleregion-breakbeforealways-minheight.html

    r132602 r151394  
    77
    88            .regionSize { width: 250px; }
    9             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 150px; min-height: 150px; background-color: green; }
     9            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 150px; min-height: 150px; background-color: green; }
    1010
    1111            .redBox { position: absolute; height: 150px; background-color: red; }

  • trunk/LayoutTests/fast/regions/autoheight-singleregion-breakbeforealways.html

    r132602 r151394  
    99
    1010            .regionSize { width: 250px; }
    11             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 100px; }
     11            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 100px; }
    1212
    1313            .redBox { position: absolute; height: 50px; background-color: red; }

  • trunk/LayoutTests/fast/regions/autoheight-singleregion-multiplebreaks.html

    r132602 r151394  
    99
    1010            .regionSize { width: 250px; }
    11             #region { -webkit-flow-from: flow; -webkit-region-overflow: break; position: absolute; top: 100px; }
     11            #region { -webkit-flow-from: flow; -webkit-region-fragment: break; position: absolute; top: 100px; }
    1212
    1313            .redBox { position: absolute; height: 50px; background-color: red; }

  • trunk/LayoutTests/fast/regions/css-regions-disabled-expected.txt

    r109015 r151394  
    1212PASS testComputedStyleWebKitFlowFrom("first-flow") is "none"
    1313PASS testComputedStyleWebKitFlowFrom("none") is "none"
    14 PASS testWebKitRegionOverflow("-webkit-region-overflow: auto") is ""
    15 PASS testWebKitRegionOverflow("-webkit-region-overflow: break") is ""
    16 PASS testComputedStyleWebKitRegionOverflow("auto") is "auto"
    17 PASS testComputedStyleWebKitRegionOverflow("break") is "auto"
     14PASS testWebKitRegionFragment("-webkit-region-fragment: auto") is ""
     15PASS testWebKitRegionFragment("-webkit-region-fragment: break") is ""
     16PASS testComputedStyleWebKitRegionFragment("auto") is "auto"
     17PASS testComputedStyleWebKitRegionFragment("break") is "auto"
    1818PASS webkitRegionRuleIndex is -1
    1919PASS successfullyParsed is true

  • trunk/LayoutTests/fast/regions/region-overflow-auto-overflow-hidden.html

    r141568 r151394  
    1313            #region_1, #region_2 {
    1414                -webkit-flow-from: article;
    15                 -webkit-region-overflow: auto;
     15                -webkit-region-fragment: auto;
    1616                overflow: hidden;
    1717                display: inline-block;

  • trunk/LayoutTests/fast/regions/region-overflow-auto-overflow-visible.html

    r141568 r151394  
    1313            #region_1, #region_2 {
    1414                -webkit-flow-from: article;
    15                 -webkit-region-overflow: auto;
     15                -webkit-region-fragment: auto;
    1616                overflow: visible;
    1717                display: inline-block;

  • trunk/LayoutTests/fast/regions/region-overflow-break.html

    r102015 r151394  
    1010#region_1, #region_2 {
    1111    -webkit-flow-from: article;
    12     -webkit-region-overflow: break;
     12    -webkit-region-fragment: break;
    1313    display:inline-block;
    1414    vertical-align:top;

  • trunk/LayoutTests/fast/regions/regions-widows-and-orphans.html

    r140139 r151394  
    1111.region {
    1212    height: 200px;
    13     -webkit-region-overflow: break;
     13    -webkit-region-fragment: break;
    1414    display: inline-block;
    1515}

  • trunk/LayoutTests/fast/regions/script-tests/css-regions-disabled.js

    r124410 r151394  
    1616}
    1717
    18 function testWebKitRegionOverflow(declaration) {
     18function testWebKitRegionFragment(declaration) {
    1919    var div = document.createElement("div");
    2020    div.setAttribute("style", declaration);
    21     return div.style.webkitRegionOverflow;
     21    return div.style.webkitRegionFragment;
    2222}
    2323
    … …  
    4040}
    4141
    42 function testComputedStyleWebKitRegionOverflow(value) {
     42function testComputedStyleWebKitRegionFragment(value) {
    4343    var div = document.createElement("div");
    4444    document.body.appendChild(div);
    45     div.style.setProperty("-webkit-region-overflow", value);
    46     var computedValue = getComputedStyle(div).getPropertyValue("-webkit-region-overflow");
     45    div.style.setProperty("-webkit-region-fragment", value);
     46    var computedValue = getComputedStyle(div).getPropertyValue("-webkit-region-fragment");
    4747    document.body.removeChild(div);
    4848    return computedValue;
    … …  
    5959shouldBeEqualToString('testComputedStyleWebKitFlowFrom("none")', "none");
    6060
    61 shouldBeEqualToString('testWebKitRegionOverflow("-webkit-region-overflow: auto")', "");
    62 shouldBeEqualToString('testWebKitRegionOverflow("-webkit-region-overflow: break")', "");
    63 shouldBeEqualToString('testComputedStyleWebKitRegionOverflow("auto")', "auto");
    64 shouldBeEqualToString('testComputedStyleWebKitRegionOverflow("break")', "auto");
     61shouldBeEqualToString('testWebKitRegionFragment("-webkit-region-fragment: auto")', "");
     62shouldBeEqualToString('testWebKitRegionFragment("-webkit-region-fragment: break")', "");
     63shouldBeEqualToString('testComputedStyleWebKitRegionFragment("auto")', "auto");
     64shouldBeEqualToString('testComputedStyleWebKitRegionFragment("break")', "auto");
    6565
    6666// Test that region styling rules are not parsed.

  • trunk/LayoutTests/fast/regions/script-tests/webkit-region-fragment-parsing.js

    r151378 r151394  
    1 description('Tests parsing of webkit-region-overflow property');
     1description('Tests parsing of webkit-region-fragment property');
    22
    3 var webkitRegionOverflowProperty = "-webkit-region-overflow";
     3var webkitRegionFragmentProperty = "-webkit-region-fragment";
    44
    55function testCSSText(declaration) {
    66    var div = document.createElement("div");
    77    div.setAttribute("style", declaration);
    8     return div.style.webkitRegionOverflow;
     8    return div.style.webkitRegionFragment;
    99}
    1010
    … …  
    1212    var div = document.createElement("div");
    1313    document.body.appendChild(div);
    14     div.style.setProperty(webkitRegionOverflowProperty, declaration);
     14    div.style.setProperty(webkitRegionFragmentProperty, declaration);
    1515
    16     var contentComputedValue = getComputedStyle(div).getPropertyValue(webkitRegionOverflowProperty);
     16    var contentComputedValue = getComputedStyle(div).getPropertyValue(webkitRegionFragmentProperty);
    1717    document.body.removeChild(div);
    1818    return contentComputedValue;
    1919}
    2020
    21 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': auto")', "auto");
    22 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': initial")', "initial");
    23 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': inherit")', "inherit");
    24 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': break")', "break");
    25 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': 0")', "");
    26 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': -1")', "");
    27 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': 12.5")', "");
    28 shouldBeEqualToString('testCSSText("' + webkitRegionOverflowProperty + ': 1px")', "");
     21shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': auto")', "auto");
     22shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': initial")', "initial");
     23shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': inherit")', "inherit");
     24shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': break")', "break");
     25shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': 0")', "");
     26shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': -1")', "");
     27shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': 12.5")', "");
     28shouldBeEqualToString('testCSSText("' + webkitRegionFragmentProperty + ': 1px")', "");
    2929
    3030shouldBeEqualToString('testComputedStyle("auto")', "auto");

  • trunk/LayoutTests/fast/regions/webkit-region-fragment-parsing.html

    r151378 r151394  
    55</head>
    66<body>
    7 <script src="script-tests/webkit-region-overflow-parsing.js"></script>
     7<script src="script-tests/webkit-region-fragment-parsing.js"></script>
    88<script src="../../fast/js/resources/js-test-post.js"></script>
    99</body>

  • trunk/PerformanceTests/ChangeLog

    r151199 r151394  
     12013-06-10  Radu Stavila  <stavila@adobe.com>
     2
     3        [CSS Regions] Rename region-overflow to region-fragment
     4        https://bugs.webkit.org/show_bug.cgi?id=117397
     5
     6        Renamed -webkit-region-overflow to -webkit-region-fragment according to the new working draft
     7        at http://www.w3.org/TR/2013/WD-css3-regions-20130528/#the-region-fragment-property
     8
     9        Reviewed by Alexander Pavlov.
     10
     11        * Layout/resources/regions.css:
     12
    1132013-06-05  Zan Dobersek  <zdobersek@igalia.com>
    214

  • trunk/PerformanceTests/Layout/resources/regions.css

    r147214 r151394  
    1010    -webkit-flow-from: flow;
    1111    border: 1px solid black;
    12     -webkit-region-overflow: break;
     12    -webkit-region-fragment: break;
    1313}
    1414

  • trunk/Source/WebCore/ChangeLog

    r151378 r151394  
     12013-06-10  Radu Stavila  <stavila@adobe.com>
     2
     3        [CSS Regions] Rename region-overflow to region-fragment
     4        https://bugs.webkit.org/show_bug.cgi?id=117397
     5
     6        Renamed -webkit-region-overflow to -webkit-region-fragment and
     7        webkitRegionOverflow to webkitRegionFragment according to the new working draft
     8        at http://www.w3.org/TR/2013/WD-css3-regions-20130528/#the-region-fragment-property
     9
     10        Reviewed by Alexander Pavlov.
     11
     12        * css/CSSComputedStyleDeclaration.cpp:
     13        (WebCore::ComputedStyleExtractor::propertyValue):
     14        * css/CSSParser.cpp:
     15        (WebCore::isValidKeywordPropertyAndValue):
     16        (WebCore::isKeywordPropertyID):
     17        (WebCore::CSSParser::parseValue):
     18        * css/CSSPrimitiveValueMappings.h:
     19        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
     20        (WebCore::CSSPrimitiveValue::operator RegionFragment):
     21        * css/CSSProperty.cpp:
     22        (WebCore::CSSProperty::isInheritedProperty):
     23        * css/CSSPropertyNames.in:
     24        * css/CSSValueKeywords.in:
     25        * css/DeprecatedStyleBuilder.cpp:
     26        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
     27        * css/StyleResolver.cpp:
     28        (WebCore::StyleResolver::applyProperty):
     29        * rendering/RenderBlock.cpp:
     30        (WebCore::RenderBlock::hasNextPage):
     31        * rendering/RenderRegion.cpp:
     32        (WebCore::RenderRegion::overflowRectForFlowThreadPortion):
     33        * rendering/style/RenderStyle.cpp:
     34        (WebCore::RenderStyle::changeRequiresLayout):
     35        * rendering/style/RenderStyle.h:
     36        * rendering/style/RenderStyleConstants.h:
     37        * rendering/style/StyleRareNonInheritedData.cpp:
     38        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     39        (WebCore::StyleRareNonInheritedData::operator==):
     40        * rendering/style/StyleRareNonInheritedData.h:
     41
    1422013-06-10  Christophe Dumez  <ch.dumez@sisa.samsung.com>
    243

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

    r151247 r151394  
    370370    CSSPropertyWebkitFlowInto,
    371371    CSSPropertyWebkitFlowFrom,
    372     CSSPropertyWebkitRegionOverflow,
    373372    CSSPropertyWebkitRegionBreakAfter,
    374373    CSSPropertyWebkitRegionBreakBefore,
    375374    CSSPropertyWebkitRegionBreakInside,
     375    CSSPropertyWebkitRegionFragment,
    376376#endif
    377377#if ENABLE(DRAGGABLE_REGION)
    … …  
    26832683                return cssValuePool().createIdentifierValue(CSSValueNone);
    26842684            return cssValuePool().createValue(style->regionThread(), CSSPrimitiveValue::CSS_STRING);
    2685         case CSSPropertyWebkitRegionOverflow:
    2686             return cssValuePool().createValue(style->regionOverflow());
     2685        case CSSPropertyWebkitRegionFragment:
     2686            return cssValuePool().createValue(style->regionFragment());
    26872687#endif
    26882688#if ENABLE(CSS_EXCLUSIONS)

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

    r151247 r151394  
    964964            return true;
    965965        break;
    966     case CSSPropertyWebkitRegionOverflow:
     966    case CSSPropertyWebkitRegionFragment:
    967967        if (parserContext.isCSSRegionsEnabled && (valueID == CSSValueAuto || valueID == CSSValueBreak))
    968968            return true;
    … …  
    11471147    case CSSPropertyWebkitRegionBreakBefore:
    11481148    case CSSPropertyWebkitRegionBreakInside:
    1149     case CSSPropertyWebkitRegionOverflow:
     1149    case CSSPropertyWebkitRegionFragment:
    11501150#endif
    11511151    case CSSPropertyWebkitRtlOrdering:
    … …  
    30733073    case CSSPropertyWebkitRegionBreakBefore:
    30743074    case CSSPropertyWebkitRegionBreakInside:
    3075     case CSSPropertyWebkitRegionOverflow:
     3075    case CSSPropertyWebkitRegionFragment:
    30763076#endif
    30773077    case CSSPropertyWebkitRtlOrdering:

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

    r150525 r151394  
    19461946}
    19471947
    1948 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RegionOverflow e)
    1949     : CSSValue(PrimitiveClass)
    1950 {
    1951     m_primitiveUnitType = CSS_IDENT;
    1952     switch (e) {
    1953     case AutoRegionOverflow:
     1948template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RegionFragment e)
     1949    : CSSValue(PrimitiveClass)
     1950{
     1951    m_primitiveUnitType = CSS_IDENT;
     1952    switch (e) {
     1953    case AutoRegionFragment:
    19541954        m_value.ident = CSSValueAuto;
    19551955        break;
    1956     case BreakRegionOverflow:
     1956    case BreakRegionFragment:
    19571957        m_value.ident = CSSValueBreak;
    19581958        break;
    … …  
    19601960}
    19611961
    1962 template<> inline CSSPrimitiveValue::operator RegionOverflow() const
     1962template<> inline CSSPrimitiveValue::operator RegionFragment() const
    19631963{
    19641964    switch (m_value.ident) {
    19651965    case CSSValueAuto:
    1966         return AutoRegionOverflow;
     1966        return AutoRegionFragment;
    19671967    case CSSValueBreak:
    1968         return BreakRegionOverflow;
    1969     }
    1970 
    1971     ASSERT_NOT_REACHED();
    1972     return AutoRegionOverflow;
     1968        return BreakRegionFragment;
     1969    }
     1970
     1971    ASSERT_NOT_REACHED();
     1972    return AutoRegionFragment;
    19731973}
    19741974

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

    r151247 r151394  
    665665    case CSSPropertyWebkitFlowInto:
    666666    case CSSPropertyWebkitFlowFrom:
    667     case CSSPropertyWebkitRegionOverflow:
    668667    case CSSPropertyWebkitRegionBreakAfter:
    669668    case CSSPropertyWebkitRegionBreakBefore:
    670669    case CSSPropertyWebkitRegionBreakInside:
     670    case CSSPropertyWebkitRegionFragment:
    671671#endif
    672672#if ENABLE(CSS_EXCLUSIONS)

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

    r151247 r151394  
    416416-webkit-flow-into
    417417-webkit-flow-from
    418 -webkit-region-overflow
     418-webkit-region-fragment
    419419-webkit-region-break-after
    420420-webkit-region-break-before

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

    r148949 r151394  
    945945outside-shape
    946946
    947 // -webkit-region-overflow
     947// -webkit-region-fragment
    948948// auto
    949949break

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

    r151247 r151394  
    23132313    setPropertyHandler(CSSPropertyWebkitRegionBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakBefore, EPageBreak, &RenderStyle::setRegionBreakBefore, EPageBreak, &RenderStyle::initialPageBreak>::createHandler());
    23142314    setPropertyHandler(CSSPropertyWebkitRegionBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakInside, EPageBreak, &RenderStyle::setRegionBreakInside, EPageBreak, &RenderStyle::initialPageBreak>::createHandler());
    2315     setPropertyHandler(CSSPropertyWebkitRegionOverflow, ApplyPropertyDefault<RegionOverflow, &RenderStyle::regionOverflow, RegionOverflow, &RenderStyle::setRegionOverflow, RegionOverflow, &RenderStyle::initialRegionOverflow>::createHandler());
     2315    setPropertyHandler(CSSPropertyWebkitRegionFragment, ApplyPropertyDefault<RegionFragment, &RenderStyle::regionFragment, RegionFragment, &RenderStyle::setRegionFragment, RegionFragment, &RenderStyle::initialRegionFragment>::createHandler());
    23162316#endif
    23172317    setPropertyHandler(CSSPropertyWebkitRtlOrdering, ApplyPropertyDefault<Order, &RenderStyle::rtlOrdering, Order, &RenderStyle::setRTLOrdering, Order, &RenderStyle::initialRTLOrdering>::createHandler());

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

    r151247 r151394  
    30903090    case CSSPropertyWebkitRegionBreakBefore:
    30913091    case CSSPropertyWebkitRegionBreakInside:
    3092     case CSSPropertyWebkitRegionOverflow:
     3092    case CSSPropertyWebkitRegionFragment:
    30933093#endif
    30943094    case CSSPropertyWebkitRtlOrdering:

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

    r151360 r151394  
    73777377        return false;
    73787378    if (region->isLastRegion())
    7379         return region->isRenderRegionSet() || region->style()->regionOverflow() == BreakRegionOverflow
     7379        return region->isRenderRegionSet() || region->style()->regionFragment() == BreakRegionFragment
    73807380            || (pageBoundaryRule == IncludePageBoundary && pageOffset == region->logicalTopForFlowThreadContent());
    73817381    return true;

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

    r150761 r151394  
    107107    bool clipX = style()->overflowX() != OVISIBLE;
    108108    bool clipY = style()->overflowY() != OVISIBLE;
    109     bool isLastRegionWithRegionOverflowBreak = (isLastPortion && (style()->regionOverflow() == BreakRegionOverflow));
    110     if ((clipX && clipY) || isLastRegionWithRegionOverflowBreak)
     109    bool isLastRegionWithRegionFragmentBreak = (isLastPortion && (style()->regionFragment() == BreakRegionFragment));
     110    if ((clipX && clipY) || isLastRegionWithRegionFragmentBreak)
    111111        return flowThreadPortionRect;
    112112

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

    r151247 r151394  
    398398            return true;
    399399
    400         if (rareNonInheritedData->m_regionOverflow != other->rareNonInheritedData->m_regionOverflow)
     400        if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedData->m_regionFragment)
    401401            return true;
    402402

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

    r151247 r151394  
    887887    const AtomicString& flowThread() const { return rareNonInheritedData->m_flowThread; }
    888888    const AtomicString& regionThread() const { return rareNonInheritedData->m_regionThread; }
    889     RegionOverflow regionOverflow() const { return static_cast<RegionOverflow>(rareNonInheritedData->m_regionOverflow); }
     889    RegionFragment regionFragment() const { return static_cast<RegionFragment>(rareNonInheritedData->m_regionFragment); }
    890890
    891891    const AtomicString& lineGrid() const { return rareInheritedData->m_lineGrid; }
    … …  
    13871387    void setFlowThread(const AtomicString& flowThread) { SET_VAR(rareNonInheritedData, m_flowThread, flowThread); }
    13881388    void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
    1389     void setRegionOverflow(RegionOverflow regionOverflow) { SET_VAR(rareNonInheritedData, m_regionOverflow, regionOverflow); }
     1389    void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInheritedData, m_regionFragment, regionFragment); }
    13901390
    13911391    void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
    … …  
    17401740    static const AtomicString& initialFlowThread() { return nullAtom; }
    17411741    static const AtomicString& initialRegionThread() { return nullAtom; }
    1742     static RegionOverflow initialRegionOverflow() { return AutoRegionOverflow; }
     1742    static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
    17431743
    17441744    static WrapFlow initialWrapFlow() { return WrapFlowAuto; }

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

    r150525 r151394  
    490490enum Order { LogicalOrder = 0, VisualOrder };
    491491
    492 enum RegionOverflow { AutoRegionOverflow, BreakRegionOverflow };
     492enum RegionFragment { AutoRegionFragment, BreakRegionFragment };
    493493
    494494enum ColumnAxis { HorizontalColumnAxis, VerticalColumnAxis, AutoColumnAxis };

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

    r150941 r151394  
    5656    , m_flowThread(RenderStyle::initialFlowThread())
    5757    , m_regionThread(RenderStyle::initialRegionThread())
    58     , m_regionOverflow(RenderStyle::initialRegionOverflow())
     58    , m_regionFragment(RenderStyle::initialRegionFragment())
    5959    , m_regionBreakAfter(RenderStyle::initialPageBreak())
    6060    , m_regionBreakBefore(RenderStyle::initialPageBreak())
    … …  
    139139    , m_flowThread(o.m_flowThread)
    140140    , m_regionThread(o.m_regionThread)
    141     , m_regionOverflow(o.m_regionOverflow)
     141    , m_regionFragment(o.m_regionFragment)
    142142    , m_regionBreakAfter(o.m_regionBreakAfter)
    143143    , m_regionBreakBefore(o.m_regionBreakBefore)
    … …  
    228228        && m_flowThread == o.m_flowThread
    229229        && m_regionThread == o.m_regionThread
    230         && m_regionOverflow == o.m_regionOverflow
     230        && m_regionFragment == o.m_regionFragment
    231231        && m_regionBreakAfter == o.m_regionBreakAfter
    232232        && m_regionBreakBefore == o.m_regionBreakBefore

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

    r150941 r151394  
    159159    AtomicString m_flowThread;
    160160    AtomicString m_regionThread;
    161     unsigned m_regionOverflow : 1; // RegionOverflow
     161    unsigned m_regionFragment : 1; // RegionFragment
    162162
    163163    unsigned m_regionBreakAfter : 2; // EPageBreak
Note: See TracChangeset for help on using the changeset viewer.