Title: [166618] trunk
Revision
166618
Author
zol...@webkit.org
Date
2014-04-01 15:13:34 -0700 (Tue, 01 Apr 2014)

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

Modified Paths

Removed Paths

  • trunk/LayoutTests/fast/exclusions/

Diff

Modified: trunk/LayoutTests/ChangeLog (166617 => 166618)


--- trunk/LayoutTests/ChangeLog	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/LayoutTests/ChangeLog	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1,3 +1,24 @@
+2014-04-01  Zoltan Horvath  <zol...@webkit.org>
+
+        [CSS Exclusions] Remove exclusions parsing support
+        https://bugs.webkit.org/show_bug.cgi?id=131046
+
+        Reviewed by David Hyatt.
+
+        * 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:
+
 2014-04-01  Manuel Rego Casasnovas  <r...@igalia.com>
 
         [CSS Grid Layout] Enable runtime feature if feature flag is enabled

Modified: trunk/LayoutTests/platform/win/TestExpectations (166617 => 166618)


--- trunk/LayoutTests/platform/win/TestExpectations	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/LayoutTests/platform/win/TestExpectations	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1409,9 +1409,6 @@
 # JSC does not support setIsolatedWorldSecurityOrigin
 webkit.org/b/61540 http/tests/security/isolatedWorld/cross-origin-xhr.html [ Failure ]
 
-# CSS Exclusions support not yet enabled.
-webkit.org/b/57311 fast/exclusions
-
 webkit.org/b/62595 fast/workers/worker-crash-with-invalid-location.html [ Failure ]
 
 # Need to implement getFormValue().

Modified: trunk/LayoutTests/platform/wincairo/TestExpectations (166617 => 166618)


--- trunk/LayoutTests/platform/wincairo/TestExpectations	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/LayoutTests/platform/wincairo/TestExpectations	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1981,10 +1981,6 @@
 # CSS Regions support not yet enabled. http://webkit.org/b/57312
 fast/regions
 
-# CSS Exclusions support not yet enabled. http://webkit.org/b/57311
-fast/exclusions
-csswg/submitted/shapes
-
 # Causes a SyntaxError (http://webkit.org/b/62595).
 fast/workers/worker-crash-with-invalid-location.html
 

Modified: trunk/Source/WebCore/ChangeLog (166617 => 166618)


--- trunk/Source/WebCore/ChangeLog	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/ChangeLog	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1,3 +1,43 @@
+2014-04-01  Zoltan Horvath  <zol...@webkit.org>
+
+        [CSS Exclusions] Remove exclusions parsing support
+        https://bugs.webkit.org/show_bug.cgi?id=131046
+
+        Reviewed by David Hyatt.
+
+        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:
+
 2014-04-01  Timothy Hatcher  <timo...@apple.com>
 
         Remove the rest of the old Canvas inspection support.

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (166617 => 166618)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2014-04-01 22:13:34 UTC (rev 166618)
@@ -385,10 +385,6 @@
     CSSPropertyWebkitRegionBreakInside,
     CSSPropertyWebkitRegionFragment,
 #endif
-#if ENABLE(CSS_EXCLUSIONS)
-    CSSPropertyWebkitWrapFlow,
-    CSSPropertyWebkitWrapThrough,
-#endif
 #if ENABLE(CSS_SHAPES)
     CSSPropertyWebkitShapeMargin,
     CSSPropertyWebkitShapeImageThreshold,
@@ -2806,12 +2802,6 @@
         case CSSPropertyWebkitRegionFragment:
             return cssValuePool().createValue(style->regionFragment());
 #endif
-#if ENABLE(CSS_EXCLUSIONS)
-        case CSSPropertyWebkitWrapFlow:
-            return cssValuePool().createValue(style->wrapFlow());
-        case CSSPropertyWebkitWrapThrough:
-            return cssValuePool().createValue(style->wrapThrough());
-#endif
 #if ENABLE(CSS_SHAPES)
         case CSSPropertyWebkitShapeMargin:
             return cssValuePool().createValue(style->shapeMargin());

Modified: trunk/Source/WebCore/css/CSSParser.cpp (166617 => 166618)


--- trunk/Source/WebCore/css/CSSParser.cpp	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSParser.cpp	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1017,20 +1017,6 @@
         if (valueID == CSSValueAuto || valueID == CSSValueNone || valueID == CSSValueText || valueID == CSSValueAll)
             return true;
         break;
-#if ENABLE(CSS_EXCLUSIONS)
-    case CSSPropertyWebkitWrapFlow:
-        if (!RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
-            return false;
-        if (valueID == CSSValueAuto || valueID == CSSValueBoth || valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueMaximum || valueID == CSSValueClear)
-            return true;
-        break;
-    case CSSPropertyWebkitWrapThrough:
-        if (!RuntimeEnabledFeatures::sharedFeatures().cssExclusionsEnabled())
-            return false;
-        if (valueID == CSSValueWrap || valueID == CSSValueNone)
-            return true;
-        break;
-#endif
     case CSSPropertyWebkitWritingMode:
         if (valueID >= CSSValueHorizontalTb && valueID <= CSSValueHorizontalBt)
             return true;
@@ -1163,10 +1149,6 @@
     case CSSPropertyWebkitUserDrag:
     case CSSPropertyWebkitUserModify:
     case CSSPropertyWebkitUserSelect:
-#if ENABLE(CSS_EXCLUSIONS)
-    case CSSPropertyWebkitWrapFlow:
-    case CSSPropertyWebkitWrapThrough:
-#endif
     case CSSPropertyWebkitWritingMode:
     case CSSPropertyWhiteSpace:
     case CSSPropertyWordBreak:
@@ -3038,10 +3020,6 @@
     case CSSPropertyWebkitUserDrag:
     case CSSPropertyWebkitUserModify:
     case CSSPropertyWebkitUserSelect:
-#if ENABLE(CSS_EXCLUSIONS)
-    case CSSPropertyWebkitWrapFlow:
-    case CSSPropertyWebkitWrapThrough:
-#endif
     case CSSPropertyWebkitWritingMode:
     case CSSPropertyWhiteSpace:
     case CSSPropertyWordBreak:

Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (166617 => 166618)


--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h	2014-04-01 22:13:34 UTC (rev 166618)
@@ -4581,88 +4581,6 @@
     return NormalColumnProgression;
 }
 
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapFlow wrapFlow)
-    : CSSValue(PrimitiveClass)
-{
-    m_primitiveUnitType = CSS_VALUE_ID;
-    switch (wrapFlow) {
-    case WrapFlowAuto:
-        m_value.valueID = CSSValueAuto;
-        break;
-    case WrapFlowBoth:
-        m_value.valueID = CSSValueBoth;
-        break;
-    case WrapFlowStart:
-        m_value.valueID = CSSValueStart;
-        break;
-    case WrapFlowEnd:
-        m_value.valueID = CSSValueEnd;
-        break;
-    case WrapFlowMaximum:
-        m_value.valueID = CSSValueMaximum;
-        break;
-    case WrapFlowClear:
-        m_value.valueID = CSSValueClear;
-        break;
-    }
-}
-
-template<> inline CSSPrimitiveValue::operator WrapFlow() const
-{
-    ASSERT(isValueID());
-
-    switch (m_value.valueID) {
-    case CSSValueAuto:
-        return WrapFlowAuto;
-    case CSSValueBoth:
-        return WrapFlowBoth;
-    case CSSValueStart:
-        return WrapFlowStart;
-    case CSSValueEnd:
-        return WrapFlowEnd;
-    case CSSValueMaximum:
-        return WrapFlowMaximum;
-    case CSSValueClear:
-        return WrapFlowClear;
-    default:
-        break;
-    }
-
-    ASSERT_NOT_REACHED();
-    return WrapFlowAuto;
-}
-
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WrapThrough wrapThrough)
-    : CSSValue(PrimitiveClass)
-{
-    m_primitiveUnitType = CSS_VALUE_ID;
-    switch (wrapThrough) {
-    case WrapThroughWrap:
-        m_value.valueID = CSSValueWrap;
-        break;
-    case WrapThroughNone:
-        m_value.valueID = CSSValueNone;
-        break;
-    }
-}
-
-template<> inline CSSPrimitiveValue::operator WrapThrough() const
-{
-    ASSERT(isValueID());
-
-    switch (m_value.valueID) {
-    case CSSValueWrap:
-        return WrapThroughWrap;
-    case CSSValueNone:
-        return WrapThroughNone;
-    default:
-        break;
-    }
-
-    ASSERT_NOT_REACHED();
-    return WrapThroughWrap;
-}
-
 #if ENABLE(CSS_GRID_LAYOUT)
 template<> inline CSSPrimitiveValue::operator GridAutoFlow() const
 {

Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (166617 => 166618)


--- trunk/Source/WebCore/css/CSSPropertyNames.in	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in	2014-04-01 22:13:34 UTC (rev 166618)
@@ -440,10 +440,6 @@
 -webkit-shape-margin
 -webkit-shape-image-threshold
 #endif
-#if defined(ENABLE_CSS_EXCLUSIONS) && ENABLE_CSS_EXCLUSIONS
--webkit-wrap-flow
--webkit-wrap-through
-#endif
 #if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
 max-zoom
 min-zoom

Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (166617 => 166618)


--- trunk/Source/WebCore/css/CSSValueKeywords.in	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in	2014-04-01 22:13:34 UTC (rev 166618)
@@ -982,17 +982,7 @@
 // auto
 break
 
-// -webkit-wrap-flow
-// auto
-// both
-// left
-// right
-maximum
-// clear
-
-// -webkit-wrap-through
 wrap
-// none
 
 // -webkit-line-align
 edges

Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (166617 => 166618)


--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp	2014-04-01 22:13:34 UTC (rev 166618)
@@ -2609,11 +2609,6 @@
     setPropertyHandler(CSSPropertyWebkitUserModify, ApplyPropertyDefault<EUserModify, &RenderStyle::userModify, EUserModify, &RenderStyle::setUserModify, EUserModify, &RenderStyle::initialUserModify>::createHandler());
     setPropertyHandler(CSSPropertyWebkitUserSelect, ApplyPropertyDefault<EUserSelect, &RenderStyle::userSelect, EUserSelect, &RenderStyle::setUserSelect, EUserSelect, &RenderStyle::initialUserSelect>::createHandler());
     setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
-
-#if ENABLE(CSS_EXCLUSIONS)
-    setPropertyHandler(CSSPropertyWebkitWrapFlow, ApplyPropertyDefault<WrapFlow, &RenderStyle::wrapFlow, WrapFlow, &RenderStyle::setWrapFlow, WrapFlow, &RenderStyle::initialWrapFlow>::createHandler());
-    setPropertyHandler(CSSPropertyWebkitWrapThrough, ApplyPropertyDefault<WrapThrough, &RenderStyle::wrapThrough, WrapThrough, &RenderStyle::setWrapThrough, WrapThrough, &RenderStyle::initialWrapThrough>::createHandler());
-#endif
 #if ENABLE(CSS_SHAPES)
     setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
     setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyDefault<float, &RenderStyle::shapeImageThreshold, float, &RenderStyle::setShapeImageThreshold, float, &RenderStyle::initialShapeImageThreshold>::createHandler());

Modified: trunk/Source/WebCore/css/StyleResolver.cpp (166617 => 166618)


--- trunk/Source/WebCore/css/StyleResolver.cpp	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/css/StyleResolver.cpp	2014-04-01 22:13:34 UTC (rev 166618)
@@ -3002,10 +3002,6 @@
     case CSSPropertyWebkitShapeImageThreshold:
     case CSSPropertyWebkitShapeOutside:
 #endif
-#if ENABLE(CSS_EXCLUSIONS)
-    case CSSPropertyWebkitWrapFlow:
-    case CSSPropertyWebkitWrapThrough:
-#endif
     case CSSPropertyWhiteSpace:
     case CSSPropertyWidows:
     case CSSPropertyWidth:

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (166617 => 166618)


--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2014-04-01 22:13:34 UTC (rev 166618)
@@ -415,10 +415,6 @@
         if (rareNonInheritedData->m_regionFragment != other->rareNonInheritedData->m_regionFragment)
             return true;
 
-        if (rareNonInheritedData->m_wrapFlow != other->rareNonInheritedData->m_wrapFlow
-            || rareNonInheritedData->m_wrapThrough != other->rareNonInheritedData->m_wrapThrough)
-            return true;
-
 #if ENABLE(CSS_SHAPES)
         if (rareNonInheritedData->m_shapeMargin != other->rareNonInheritedData->m_shapeMargin)
             return true;

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (166617 => 166618)


--- trunk/Source/WebCore/rendering/style/RenderStyle.h	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1031,9 +1031,6 @@
     LineSnap lineSnap() const { return static_cast<LineSnap>(rareInheritedData->m_lineSnap); }
     LineAlign lineAlign() const { return static_cast<LineAlign>(rareInheritedData->m_lineAlign); }
 
-    WrapFlow wrapFlow() const { return static_cast<WrapFlow>(rareNonInheritedData->m_wrapFlow); }
-    WrapThrough wrapThrough() const { return static_cast<WrapThrough>(rareNonInheritedData->m_wrapThrough); }
-
     // Apple-specific property getter methods
     EPointerEvents pointerEvents() const { return static_cast<EPointerEvents>(inherited_flags._pointerEvents); }
     const AnimationList* animations() const { return rareNonInheritedData->m_animations.get(); }
@@ -1547,9 +1544,6 @@
     void setRegionThread(const AtomicString& regionThread) { SET_VAR(rareNonInheritedData, m_regionThread, regionThread); }
     void setRegionFragment(RegionFragment regionFragment) { SET_VAR(rareNonInheritedData, m_regionFragment, regionFragment); }
 
-    void setWrapFlow(WrapFlow wrapFlow) { SET_VAR(rareNonInheritedData, m_wrapFlow, wrapFlow); }
-    void setWrapThrough(WrapThrough wrapThrough) { SET_VAR(rareNonInheritedData, m_wrapThrough, wrapThrough); }
-
     // Apple-specific property setters
     void setPointerEvents(EPointerEvents p) { inherited_flags._pointerEvents = p; }
 
@@ -1913,9 +1907,6 @@
     static const AtomicString& initialRegionThread() { return nullAtom; }
     static RegionFragment initialRegionFragment() { return AutoRegionFragment; }
 
-    static WrapFlow initialWrapFlow() { return WrapFlowAuto; }
-    static WrapThrough initialWrapThrough() { return WrapThroughWrap; }
-
     // Keep these at the end.
     static LineClampValue initialLineClamp() { return LineClampValue(); }
     static ETextSecurity initialTextSecurity() { return TSNONE; }

Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (166617 => 166618)


--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h	2014-04-01 22:13:34 UTC (rev 166618)
@@ -535,10 +535,6 @@
 
 enum LineAlign { LineAlignNone, LineAlignEdges };
 
-enum WrapFlow { WrapFlowAuto, WrapFlowBoth, WrapFlowStart, WrapFlowEnd, WrapFlowMaximum, WrapFlowClear };
-
-enum WrapThrough { WrapThroughWrap, WrapThroughNone };
-
 enum RubyPosition { RubyPositionBefore, RubyPositionAfter };
 
 #if ENABLE(CSS_GRID_LAYOUT)

Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (166617 => 166618)


--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp	2014-04-01 22:13:34 UTC (rev 166618)
@@ -84,8 +84,6 @@
     , m_borderFit(RenderStyle::initialBorderFit())
     , m_textCombine(RenderStyle::initialTextCombine())
     , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
-    , m_wrapFlow(RenderStyle::initialWrapFlow())
-    , m_wrapThrough(RenderStyle::initialWrapThrough())
     , m_runningAcceleratedAnimation(false)
     , m_aspectRatioType(RenderStyle::initialAspectRatioType())
 #if ENABLE(CSS_COMPOSITING)
@@ -163,8 +161,6 @@
     , m_borderFit(o.m_borderFit)
     , m_textCombine(o.m_textCombine)
     , m_textDecorationStyle(o.m_textDecorationStyle)
-    , m_wrapFlow(o.m_wrapFlow)
-    , m_wrapThrough(o.m_wrapThrough)
     , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
     , m_aspectRatioType(o.m_aspectRatioType)
 #if ENABLE(CSS_COMPOSITING)
@@ -253,8 +249,6 @@
         && m_borderFit == o.m_borderFit
         && m_textCombine == o.m_textCombine
         && m_textDecorationStyle == o.m_textDecorationStyle
-        && m_wrapFlow == o.m_wrapFlow
-        && m_wrapThrough == o.m_wrapThrough
         && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
 #if ENABLE(CSS_COMPOSITING)
         && m_effectiveBlendMode == o.m_effectiveBlendMode

Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h (166617 => 166618)


--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h	2014-04-01 22:13:34 UTC (rev 166618)
@@ -185,8 +185,6 @@
     unsigned m_textCombine : 1; // CSS3 text-combine properties
 
     unsigned m_textDecorationStyle : 3; // TextDecorationStyle
-    unsigned m_wrapFlow: 3; // WrapFlow
-    unsigned m_wrapThrough: 1; // WrapThrough
 
     unsigned m_runningAcceleratedAnimation : 1;
 

Modified: trunk/Source/WebInspectorUI/ChangeLog (166617 => 166618)


--- trunk/Source/WebInspectorUI/ChangeLog	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebInspectorUI/ChangeLog	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1,3 +1,12 @@
+2014-04-01  Zoltan Horvath  <zol...@webkit.org>
+
+        [CSS Exclusions] Remove exclusions parsing support
+        https://bugs.webkit.org/show_bug.cgi?id=131046
+
+        Reviewed by David Hyatt.
+
+        * UserInterface/Models/CSSKeywordCompletions.js:
+
 2014-04-01  Timothy Hatcher  <timo...@apple.com>
 
         Remove the rest of the old Canvas inspection support.

Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (166617 => 166618)


--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js	2014-04-01 22:13:34 UTC (rev 166618)
@@ -766,12 +766,6 @@
     "-webkit-region-overflow": [
         "auto", "break"
     ],
-    "-webkit-wrap-flow": [
-        "auto", "both", "start", "end", "maximum", "clear"
-    ],
-    "-webkit-wrap-through": [
-        "wrap", "none"
-    ],
     "-webkit-backface-visibility": [
         "visible", "hidden"
     ],

Modified: trunk/Tools/ChangeLog (166617 => 166618)


--- trunk/Tools/ChangeLog	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Tools/ChangeLog	2014-04-01 22:13:34 UTC (rev 166618)
@@ -1,3 +1,12 @@
+2014-04-01  Zoltan Horvath  <zol...@webkit.org>
+
+        [CSS Exclusions] Remove exclusions parsing support
+        https://bugs.webkit.org/show_bug.cgi?id=131046
+
+        Reviewed by David Hyatt.
+
+        * Scripts/webkitperl/FeatureList.pm:
+
 2014-04-01  Manuel Rego Casasnovas  <r...@igalia.com>
 
         [GTK] Remove last reference to GTK+ WK1 EWS

Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (166617 => 166618)


--- trunk/Tools/Scripts/webkitperl/FeatureList.pm	2014-04-01 22:03:31 UTC (rev 166617)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm	2014-04-01 22:13:34 UTC (rev 166618)
@@ -56,7 +56,6 @@
     $css4ImagesSupport,
     $cssBoxDecorationBreakSupport,
     $cssDeviceAdaptation,
-    $cssExclusionsSupport,
     $cssFiltersSupport,
     $cssGridLayoutSupport,
     $cssImageOrientationSupport,
@@ -183,9 +182,6 @@
     { option => "css-device-adaptation", desc => "Toggle CSS Device Adaptation support",
       define => "ENABLE_CSS_DEVICE_ADAPTATION", default => isEfl(), value => \$cssDeviceAdaptation },
 
-    { option => "css-exclusions", desc => "Toggle CSS Exclusions support",
-      define => "ENABLE_CSS_EXCLUSIONS", default => 1, value => \$cssExclusionsSupport },
-
     { option => "css-shapes", desc => "Toggle CSS Shapes support",
       define => "ENABLE_CSS_SHAPES", default => 1, value => \$cssShapesSupport },
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to