Changeset 204566 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Aug 17, 2016, 12:56:28 PM (9 years ago)

Author:

Antti Koivisto

Message:

Remove CSS_IMAGE_SET feature define
​https://bugs.webkit.org/show_bug.cgi?id=160944

Reviewed by Dean Jackson.

Source/WebCore:

This seems to be enabled everywhere already (except Mac cmake build which it keep breaking).

• css/CSSCursorImageValue.cpp:

(WebCore::CSSCursorImageValue::CSSCursorImageValue):
(WebCore::CSSCursorImageValue::cachedImage):
(WebCore::CSSCursorImageValue::cachedOrPendingImage):

• css/CSSImageSetValue.cpp:

(WebCore::CSSImageSetValue::cloneForCSSOM):

• css/CSSImageSetValue.h:
• css/CSSParser.cpp:

(WebCore::CSSParser::parseVariableDependentValue):
(WebCore::isImageSetFunctionValue):
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parseContent):
(WebCore::CSSParser::parseFillImage):
(WebCore::CSSParser::parseBorderImage):
(WebCore::CSSParser::parseImageResolution):
(WebCore::CSSParser::parseImageSet):

• css/CSSParser.h:
• css/CSSToStyleMap.cpp:

(WebCore::CSSToStyleMap::mapNinePieceImage):

• css/CSSValue.cpp:

(WebCore::CSSValue::traverseSubresources):
(WebCore::CSSValue::equals):
(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):
(WebCore::CSSValue::cloneForCSSOM):

• css/CSSValue.h:

(WebCore::CSSValue::isImageGeneratorValue):
(WebCore::CSSValue::isGradientValue):
(WebCore::CSSValue::isNamedImageValue):
(WebCore::CSSValue::isImageSetValue):
(WebCore::CSSValue::isImageValue):
(WebCore::CSSValue::isInheritedValue):

• css/StyleBuilderConverter.h:

(WebCore::isImageShape):

• css/StyleBuilderCustom.h:

(WebCore::StyleBuilderCustom::applyValueContent):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::styleImage):
(WebCore::StyleResolver::generatedOrPendingFromValue):
(WebCore::StyleResolver::setOrPendingFromValue):
(WebCore::StyleResolver::cursorOrPendingFromValue):

• css/StyleResolver.h:

(WebCore::StyleResolver::applyPropertyToRegularStyle):

• css/makeprop.pl:

(generateFillLayerPropertyValueSetter):

• rendering/style/StyleCachedImage.cpp:

(WebCore::StyleCachedImage::cssValue):

• rendering/style/StylePendingImage.h:
• style/StylePendingResources.cpp:

(WebCore::Style::loadPendingImage):

Source/WTF:

• wtf/FeatureDefines.h:

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (5 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -151 +151 @@
     if (is<CSSFilterImageValue>(*this))
         return downcast<CSSFilterImageValue>(*this).traverseSubresources(handler);
-#if ENABLE(CSS_IMAGE_SET)
     if (is<CSSImageSetValue>(*this))
         return downcast<CSSImageSetValue>(*this).traverseSubresources(handler);
-#endif
     return false;
 }
@@ -239 +237 @@
         case CalculationClass:
             return compareCSSValues<CSSCalcValue>(*this, other);
-#if ENABLE(CSS_IMAGE_SET)
         case ImageSetClass:
             return compareCSSValues<CSSImageSetValue>(*this, other);
-#endif
         case WebKitCSSFilterClass:
             return compareCSSValues<WebKitCSSFilterValue>(*this, other);
@@ -347 +343 @@
     case CalculationClass:
         return downcast<CSSCalcValue>(*this).customCSSText();
-#if ENABLE(CSS_IMAGE_SET)
     case ImageSetClass:
         return downcast<CSSImageSetValue>(*this).customCSSText();
-#endif
     case WebKitCSSFilterClass:
         return downcast<WebKitCSSFilterValue>(*this).customCSSText();
@@ -480 +474 @@
         delete downcast<CSSCalcValue>(this);
         return;
-#if ENABLE(CSS_IMAGE_SET)
     case ImageSetClass:
         delete downcast<CSSImageSetValue>(this);
         return;
-#endif
     case FilterImageClass:
         delete downcast<CSSFilterImageValue>(this);
@@ -532 +524 @@
     case WebKitCSSTransformClass:
         return downcast<WebKitCSSTransformValue>(*this).cloneForCSSOM();
-#if ENABLE(CSS_IMAGE_SET)
     case ImageSetClass:
         return downcast<CSSImageSetValue>(*this).cloneForCSSOM();
-#endif
     case SVGColorClass:
         return downcast<SVGColor>(*this).cloneForCSSOM();