Changeset 166618 in webkit


Ignore:
Timestamp:
Apr 1, 2014 3:13:34 PM (10 years ago)
Author:
zoltan@webkit.org
Message:

[CSS Exclusions] Remove exclusions parsing support
​https://bugs.webkit.org/show_bug.cgi?id=131046

Reviewed by David Hyatt.

Source/WebCore:

CSS Exclusions specification [1] needs some evolution before the actual implementation happens.
We have only the parsing code in WebKit for -webkit-wrap-flow and -webkit-wrap-through.
This patch removes the code from the trunk for now, it doesn't make sense to keep it around.

[1] ​http://www.w3.org/TR/css3-exclusions/

Removed existing parsing tests.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::propertyValue):

  • css/CSSParser.cpp:

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

  • css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
(WebCore::CSSPrimitiveValue::operator WrapFlow): Deleted.
(WebCore::CSSPrimitiveValue::operator WrapThrough): Deleted.

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

(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

  • css/StyleResolver.cpp:

(WebCore::StyleResolver::applyProperty):

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

Source/WebInspectorUI:

  • UserInterface/Models/CSSKeywordCompletions.js:

Tools:

  • Scripts/webkitperl/FeatureList.pm:

LayoutTests:

  • fast/exclusions/css-exclusions-disabled-expected.txt: Removed.
  • fast/exclusions/css-exclusions-disabled.html: Removed.
  • fast/exclusions/css-exclusions-enabled-expected.txt: Removed.
  • fast/exclusions/css-exclusions-enabled.html: Removed.
  • fast/exclusions/parsing/parsing-wrap-flow-expected.txt: Removed.
  • fast/exclusions/parsing/parsing-wrap-flow.html: Removed.
  • fast/exclusions/parsing/parsing-wrap-through-expected.txt: Removed.
  • fast/exclusions/parsing/parsing-wrap-through.html: Removed.
  • fast/exclusions/parsing/script-tests/parsing-test-utils.js: Removed.
  • fast/exclusions/parsing/script-tests/parsing-wrap-flow.js: Removed.
  • fast/exclusions/parsing/script-tests/parsing-wrap-through.js: Removed.
  • platform/win/TestExpectations:
  • platform/wincairo/TestExpectations:
Location:
trunk
Files:
1 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r166614 r166618  
     12014-04-01  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        [CSS Exclusions] Remove exclusions parsing support
     4        https://bugs.webkit.org/show_bug.cgi?id=131046
     5
     6        Reviewed by David Hyatt.
     7
     8        * fast/exclusions/css-exclusions-disabled-expected.txt: Removed.
     9        * fast/exclusions/css-exclusions-disabled.html: Removed.
     10        * fast/exclusions/css-exclusions-enabled-expected.txt: Removed.
     11        * fast/exclusions/css-exclusions-enabled.html: Removed.
     12        * fast/exclusions/parsing/parsing-wrap-flow-expected.txt: Removed.
     13        * fast/exclusions/parsing/parsing-wrap-flow.html: Removed.
     14        * fast/exclusions/parsing/parsing-wrap-through-expected.txt: Removed.
     15        * fast/exclusions/parsing/parsing-wrap-through.html: Removed.
     16        * fast/exclusions/parsing/script-tests/parsing-test-utils.js: Removed.
     17        * fast/exclusions/parsing/script-tests/parsing-wrap-flow.js: Removed.
     18        * fast/exclusions/parsing/script-tests/parsing-wrap-through.js: Removed.
     19        * platform/win/TestExpectations:
     20        * platform/wincairo/TestExpectations:
     21
    1222014-04-01  Manuel Rego Casasnovas  <rego@igalia.com>
    223

  • trunk/LayoutTests/platform/win/TestExpectations

    r166301 r166618  
    14091409# JSC does not support setIsolatedWorldSecurityOrigin
    14101410webkit.org/b/61540 http/tests/security/isolatedWorld/cross-origin-xhr.html [ Failure ]
    1411 
    1412 # CSS Exclusions support not yet enabled.
    1413 webkit.org/b/57311 fast/exclusions
    14141411
    14151412webkit.org/b/62595 fast/workers/worker-crash-with-invalid-location.html [ Failure ]

  • trunk/LayoutTests/platform/wincairo/TestExpectations

    r165676 r166618  
    19821982fast/regions
    19831983
    1984 # CSS Exclusions support not yet enabled. http://webkit.org/b/57311
    1985 fast/exclusions
    1986 csswg/submitted/shapes
    1987 
    19881984# Causes a SyntaxError (http://webkit.org/b/62595).
    19891985fast/workers/worker-crash-with-invalid-location.html

  • trunk/Source/WebCore/ChangeLog

    r166616 r166618  
     12014-04-01  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        [CSS Exclusions] Remove exclusions parsing support
     4        https://bugs.webkit.org/show_bug.cgi?id=131046
     5
     6        Reviewed by David Hyatt.
     7
     8        CSS Exclusions specification [1] needs some evolution before the actual implementation happens.
     9        We have only the parsing code in WebKit for -webkit-wrap-flow and -webkit-wrap-through.
     10        This patch removes the code from the trunk for now, it doesn't make sense to keep it around.
     11
     12        [1] http://www.w3.org/TR/css3-exclusions/
     13
     14        Removed existing parsing tests.
     15
     16        * css/CSSComputedStyleDeclaration.cpp:
     17        (WebCore::ComputedStyleExtractor::propertyValue):
     18        * css/CSSParser.cpp:
     19        (WebCore::isValidKeywordPropertyAndValue):
     20        (WebCore::isKeywordPropertyID):
     21        (WebCore::CSSParser::parseValue):
     22        * css/CSSPrimitiveValueMappings.h:
     23        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue): Deleted.
     24        (WebCore::CSSPrimitiveValue::operator WrapFlow): Deleted.
     25        (WebCore::CSSPrimitiveValue::operator WrapThrough): Deleted.
     26        * css/CSSPropertyNames.in:
     27        * css/CSSValueKeywords.in:
     28        * css/DeprecatedStyleBuilder.cpp:
     29        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
     30        * css/StyleResolver.cpp:
     31        (WebCore::StyleResolver::applyProperty):
     32        * rendering/style/RenderStyle.cpp:
     33        (WebCore::RenderStyle::changeRequiresLayout):
     34        * rendering/style/RenderStyle.h:
     35        * rendering/style/RenderStyleConstants.h:
     36        * rendering/style/StyleRareNonInheritedData.cpp:
     37        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
     38        (WebCore::StyleRareNonInheritedData::operator==):
     39        * rendering/style/StyleRareNonInheritedData.h:
     40
    1412014-04-01  Timothy Hatcher  <timothy@apple.com>
    242

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

    r166486 r166618  
    385385    CSSPropertyWebkitRegionBreakInside,
    386386    CSSPropertyWebkitRegionFragment,
    387 #endif
    388 #if ENABLE(CSS_EXCLUSIONS)
    389     CSSPropertyWebkitWrapFlow,
    390     CSSPropertyWebkitWrapThrough,
    391387#endif
    392388#if ENABLE(CSS_SHAPES)
    … …  
    28072803            return cssValuePool().createValue(style->regionFragment());
    28082804#endif
    2809 #if ENABLE(CSS_EXCLUSIONS)
    2810         case CSSPropertyWebkitWrapFlow:
    2811             return cssValuePool().createValue(style->wrapFlow());
    2812         case CSSPropertyWebkitWrapThrough:
    2813             return cssValuePool().createValue(style->wrapThrough());
    2814 #endif
    28152805#if ENABLE(CSS_SHAPES)
    28162806        case CSSPropertyWebkitShapeMargin:

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

    r166486 r166618  
    10181018            return true;
    10191019        break;
    1020 #if ENABLE(CSS_EXCLUSIONS)
    1021     case CSSPropertyWebkitWrapFlow:
    1022         if (!RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
    1023             return false;
    1024         if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueMaximum || valueID == CSSValueClear)
    1025             return true;
    1026         break;
    1027     case CSSPropertyWebkitWrapThrough:
    1028         if (!RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
    1029             return false;
    1030         if (valueID == CSSValueWrap || valueID == CSSValueNone)
    1031             return true;
    1032         break;
    1033 #endif
    10341020    case CSSPropertyWebkitWritingMode:
    10351021        if (valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalBt)
    … …  
    11641150    case CSSPropertyWebkitUserModify:
    11651151    case CSSPropertyWebkitUserSelect:
    1166 #if ENABLE(CSS_EXCLUSIONS)
    1167     case CSSPropertyWebkitWrapFlow:
    1168     case CSSPropertyWebkitWrapThrough:
    1169 #endif
    11701152    case CSSPropertyWebkitWritingMode:
    11711153    case CSSPropertyWhiteSpace:
    … …  
    30393021    case CSSPropertyWebkitUserModify:
    30403022    case CSSPropertyWebkitUserSelect:
    3041 #if ENABLE(CSS_EXCLUSIONS)
    3042     case CSSPropertyWebkitWrapFlow:
    3043     case CSSPropertyWebkitWrapThrough:
    3044 #endif
    30453023    case CSSPropertyWebkitWritingMode:
    30463024    case CSSPropertyWhiteSpace:

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

    r165843 r166618  
    45824582}
    45834583
    4584 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow)
    4585     : CSSValue(PrimitiveClass)
    4586 {
    4587     m_primitiveUnitType = CSS_VALUE_ID;
    4588     switch (wrapFlow) {
    4589     case WrapFlowAuto:
    4590         m_value.valueID = CSSValueAuto;
    4591         break;
    4592     case WrapFlowBoth:
    4593         m_value.valueID = CSSValueBoth;
    4594         break;
    4595     case WrapFlowStart:
    4596         m_value.valueID = CSSValueStart;
    4597         break;
    4598     case WrapFlowEnd:
    4599         m_value.valueID = CSSValueEnd;
    4600         break;
    4601     case WrapFlowMaximum:
    4602         m_value.valueID = CSSValueMaximum;
    4603         break;
    4604     case WrapFlowClear:
    4605         m_value.valueID = CSSValueClear;
    4606         break;
    4607     }
    4608 }
    4609 
    4610 template<> inline CSSPrimitiveValue::operator WrapFlow() const
    4611 {
    4612     ASSERT(isValueID());
    4613 
    4614     switch (m_value.valueID) {
    4615     case CSSValueAuto:
    4616         return WrapFlowAuto;
    4617     case CSSValueBoth:
    4618         return WrapFlowBoth;
    4619     case CSSValueStart:
    4620         return WrapFlowStart;
    4621     case CSSValueEnd:
    4622         return WrapFlowEnd;
    4623     case CSSValueMaximum:
    4624         return WrapFlowMaximum;
    4625     case CSSValueClear:
    4626         return WrapFlowClear;
    4627     default:
    4628         break;
    4629     }
    4630 
    4631     ASSERT_NOT_REACHED();
    4632     return WrapFlowAuto;
    4633 }
    4634 
    4635 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapThrough wrapThrough)
    4636     : CSSValue(PrimitiveClass)
    4637 {
    4638     m_primitiveUnitType = CSS_VALUE_ID;
    4639     switch (wrapThrough) {
    4640     case WrapThroughWrap:
    4641         m_value.valueID = CSSValueWrap;
    4642         break;
    4643     case WrapThroughNone:
    4644         m_value.valueID = CSSValueNone;
    4645         break;
    4646     }
    4647 }
    4648 
    4649 template<> inline CSSPrimitiveValue::operator WrapThrough() const
    4650 {
    4651     ASSERT(isValueID());
    4652 
    4653     switch (m_value.valueID) {
    4654     case CSSValueWrap:
    4655         return WrapThroughWrap;
    4656     case CSSValueNone:
    4657         return WrapThroughNone;
    4658     default:
    4659         break;
    4660     }
    4661 
    4662     ASSERT_NOT_REACHED();
    4663     return WrapThroughWrap;
    4664 }
    4665 
    46664584#if ENABLE(CSS_GRID_LAYOUT)
    46674585template<> inline CSSPrimitiveValue::operator GridAutoFlow() const

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

    r166301 r166618  
    441441-webkit-shape-image-threshold
    442442#endif
    443 #if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
    444 -webkit-wrap-flow
    445 -webkit-wrap-through
    446 #endif
    447443#if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
    448444max-zoom

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

    r165595 r166618  
    983983break
    984984
    985 // -webkit-wrap-flow
    986 // auto
    987 // both
    988 // left
    989 // right
    990 maximum
    991 // clear
    992 
    993 // -webkit-wrap-through
    994985wrap
    995 // none
    996986
    997987// -webkit-line-align

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

    r166486 r166618  
    26102610    setPropertyHandler(CSSPropertyWebkitUserSelect, ApplyPropertyDefault<EUserSelect, &RenderStyle::userSelect, EUserSelect, &RenderStyle::setUserSelect, EUserSelect, &RenderStyle::initialUserSelect>::createHandler());
    26112611    setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
    2612 
    2613 #if ENABLE(CSS_EXCLUSIONS)
    2614     setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
    2615     setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
    2616 #endif
    26172612#if ENABLE(CSS_SHAPES)
    26182613    setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());

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

    r166537 r166618  
    30033003    case CSSPropertyWebkitShapeOutside:
    30043004#endif
    3005 #if ENABLE(CSS_EXCLUSIONS)
    3006     case CSSPropertyWebkitWrapFlow:
    3007     case CSSPropertyWebkitWrapThrough:
    3008 #endif
    30093005    case CSSPropertyWhiteSpace:
    30103006    case CSSPropertyWidows:

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

    r166519 r166618  
    414414
    415415        if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedData->m_regionFragment)
    416             return true;
    417 
    418         if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_wrapFlow
    419             || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedData->m_wrapThrough)
    420416            return true;
    421417

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

    r166589 r166618  
    10311031    LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData->m_lineSnap); }
    10321032    LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedData->m_lineAlign); }
    1033 
    1034     WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedData->m_wrapFlow); }
    1035     WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInheritedData->m_wrapThrough); }
    10361033
    10371034    // Apple-specific property getter methods
    … …  
    15481545    void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInheritedData, m_regionFragment, regionFragment); }
    15491546
    1550     void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
    1551     void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
    1552 
    15531547    // Apple-specific property setters
    15541548    void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p; }
    … …  
    19141908    static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
    19151909
    1916     static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
    1917     static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
    1918 
    19191910    // Keep these at the end.
    19201911    static LineClampValue initialLineClamp() { return LineClampValue(); }

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

    r165843 r166618  
    536536enum LineAlign { LineAlignNone, LineAlignEdges };
    537537
    538 enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlowMaximum, WrapFlowClear };
    539 
    540 enum WrapThrough { WrapThroughWrap, WrapThroughNone };
    541 
    542538enum RubyPosition { RubyPositionBefore, RubyPositionAfter };
    543539

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

    r166489 r166618  
    8585    , m_textCombine(RenderStyle::initialTextCombine())
    8686    , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
    87     , m_wrapFlow(RenderStyle::initialWrapFlow())
    88     , m_wrapThrough(RenderStyle::initialWrapThrough())
    8987    , m_runningAcceleratedAnimation(false)
    9088    , m_aspectRatioType(RenderStyle::initialAspectRatioType())
    … …  
    164162    , m_textCombine(o.m_textCombine)
    165163    , m_textDecorationStyle(o.m_textDecorationStyle)
    166     , m_wrapFlow(o.m_wrapFlow)
    167     , m_wrapThrough(o.m_wrapThrough)
    168164    , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
    169165    , m_aspectRatioType(o.m_aspectRatioType)
    … …  
    254250        && m_textCombine == o.m_textCombine
    255251        && m_textDecorationStyle == o.m_textDecorationStyle
    256         && m_wrapFlow == o.m_wrapFlow
    257         && m_wrapThrough == o.m_wrapThrough
    258252        && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
    259253#if ENABLE(CSS_COMPOSITING)

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

    r166489 r166618  
    186186
    187187    unsigned m_textDecorationStyle : 3; // TextDecorationStyle
    188     unsigned m_wrapFlow: 3; // WrapFlow
    189     unsigned m_wrapThrough: 1; // WrapThrough
    190188
    191189    unsigned m_runningAcceleratedAnimation : 1;

  • trunk/Source/WebInspectorUI/ChangeLog

    r166616 r166618  
     12014-04-01  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        [CSS Exclusions] Remove exclusions parsing support
     4        https://bugs.webkit.org/show_bug.cgi?id=131046
     5
     6        Reviewed by David Hyatt.
     7
     8        * UserInterface/Models/CSSKeywordCompletions.js:
     9
    1102014-04-01  Timothy Hatcher  <timothy@apple.com>
    211

  • trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js

    r165661 r166618  
    767767        "auto", "break"
    768768    ],
    769     "-webkit-wrap-flow": [
    770         "auto", "both", "start", "end", "maximum", "clear"
    771     ],
    772     "-webkit-wrap-through": [
    773         "wrap", "none"
    774     ],
    775769    "-webkit-backface-visibility": [
    776770        "visible", "hidden"

  • trunk/Tools/ChangeLog

    r166609 r166618  
     12014-04-01  Zoltan Horvath  <zoltan@webkit.org>
     2
     3        [CSS Exclusions] Remove exclusions parsing support
     4        https://bugs.webkit.org/show_bug.cgi?id=131046
     5
     6        Reviewed by David Hyatt.
     7
     8        * Scripts/webkitperl/FeatureList.pm:
     9
    1102014-04-01  Manuel Rego Casasnovas  <rego@igalia.com>
    211

  • trunk/Tools/Scripts/webkitperl/FeatureList.pm

    r166535 r166618  
    5757    $cssBoxDecorationBreakSupport,
    5858    $cssDeviceAdaptation,
    59     $cssExclusionsSupport,
    6059    $cssFiltersSupport,
    6160    $cssGridLayoutSupport,
    … …  
    184183      define => "ENABLE_CSS_DEVICE_ADAPTATION", default => isEfl(), value => \$cssDeviceAdaptation },
    185184
    186     { option => "css-exclusions", desc => "Toggle CSS Exclusions support",
    187       define => "ENABLE_CSS_EXCLUSIONS", default => 1, value => \$cssExclusionsSupport },
    188 
    189185    { option => "css-shapes", desc => "Toggle CSS Shapes support",
    190186      define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
Note: See TracChangeset for help on using the changeset viewer.