Diff
Modified: trunk/Source/WTF/ChangeLog (204565 => 204566)
--- trunk/Source/WTF/ChangeLog 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WTF/ChangeLog 2016-08-17 19:56:28 UTC (rev 204566)
@@ -1,3 +1,12 @@
+2016-08-17 Antti Koivisto <[email protected]>
+
+ Remove CSS_IMAGE_SET feature define
+ https://bugs.webkit.org/show_bug.cgi?id=160944
+
+ Reviewed by Dean Jackson.
+
+ * wtf/FeatureDefines.h:
+
2016-08-16 Keith Miller <[email protected]>
Enable WebAssembly in the build.
Modified: trunk/Source/WTF/wtf/FeatureDefines.h (204565 => 204566)
--- trunk/Source/WTF/wtf/FeatureDefines.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WTF/wtf/FeatureDefines.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -66,10 +66,6 @@
#define ENABLE_CONTEXT_MENUS 0
#endif
-#if !defined(ENABLE_CSS_IMAGE_SET)
-#define ENABLE_CSS_IMAGE_SET 1
-#endif
-
#if !defined(ENABLE_CURSOR_SUPPORT)
#define ENABLE_CURSOR_SUPPORT 0
#endif
@@ -181,10 +177,6 @@
#define ENABLE_CONTENT_EXTENSIONS 1
#endif
-#if !defined(ENABLE_CSS_IMAGE_SET)
-#define ENABLE_CSS_IMAGE_SET 1
-#endif
-
#if !defined(ENABLE_DASHBOARD_SUPPORT)
#define ENABLE_DASHBOARD_SUPPORT 1
#endif
@@ -412,10 +404,6 @@
#define ENABLE_CSS_IMAGE_RESOLUTION 0
#endif
-#if !defined(ENABLE_CSS_IMAGE_SET)
-#define ENABLE_CSS_IMAGE_SET 0
-#endif
-
#if !defined(ENABLE_CURSOR_SUPPORT)
#define ENABLE_CURSOR_SUPPORT 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (204565 => 204566)
--- trunk/Source/WebCore/ChangeLog 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/ChangeLog 2016-08-17 19:56:28 UTC (rev 204566)
@@ -1,5 +1,65 @@
2016-08-17 Antti Koivisto <[email protected]>
+ Remove CSS_IMAGE_SET feature define
+ https://bugs.webkit.org/show_bug.cgi?id=160944
+
+ Reviewed by Dean Jackson.
+
+ 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):
+
+2016-08-17 Antti Koivisto <[email protected]>
+
Try to fix CMake build.
* rendering/style/StyleCachedImage.cpp:
Modified: trunk/Source/WebCore/css/CSSCursorImageValue.cpp (204565 => 204566)
--- trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSCursorImageValue.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -38,10 +38,6 @@
#include <wtf/text/StringBuilder.h>
#include <wtf/text/WTFString.h>
-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
namespace WebCore {
CSSCursorImageValue::CSSCursorImageValue(Ref<CSSValue>&& imageValue, bool hasHotSpot, const IntPoint& hotSpot)
@@ -118,10 +114,8 @@
StyleImage* CSSCursorImageValue::cachedImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
{
-#if ENABLE(CSS_IMAGE_SET)
if (is<CSSImageSetValue>(m_imageValue.get()))
return downcast<CSSImageSetValue>(m_imageValue.get()).bestFitImage(loader, options);
-#endif
auto* cursorElement = loader.document() ? updateCursorElement(*loader.document()) : nullptr;
@@ -152,13 +146,9 @@
StyleImage* CSSCursorImageValue::cachedOrPendingImage(const Document& document)
{
-#if ENABLE(CSS_IMAGE_SET)
// Need to delegate completely so that changes in device scale factor can be handled appropriately.
if (is<CSSImageSetValue>(m_imageValue.get()))
return downcast<CSSImageSetValue>(m_imageValue.get()).cachedOrPendingImageSet(document);
-#else
- UNUSED_PARAM(document);
-#endif
if (!m_image)
m_image = StylePendingImage::create(this);
Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (204565 => 204566)
--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -26,8 +26,6 @@
#include "config.h"
#include "CSSImageSetValue.h"
-#if ENABLE(CSS_IMAGE_SET)
-
#include "CSSImageValue.h"
#include "CSSPrimitiveValue.h"
#include "CachedImage.h"
@@ -204,5 +202,3 @@
}
} // namespace WebCore
-
-#endif // ENABLE(CSS_IMAGE_SET)
Modified: trunk/Source/WebCore/css/CSSImageSetValue.h (204565 => 204566)
--- trunk/Source/WebCore/css/CSSImageSetValue.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSImageSetValue.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -26,8 +26,6 @@
#ifndef CSSImageSetValue_h
#define CSSImageSetValue_h
-#if ENABLE(CSS_IMAGE_SET)
-
#include "CSSValueList.h"
namespace WebCore {
@@ -90,6 +88,4 @@
SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSImageSetValue, isImageSetValue())
-#endif // ENABLE(CSS_IMAGE_SET)
-
#endif // CSSImageSetValue_h
Modified: trunk/Source/WebCore/css/CSSParser.cpp (204565 => 204566)
--- trunk/Source/WebCore/css/CSSParser.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -45,6 +45,7 @@
#include "CSSFontValue.h"
#include "CSSFunctionValue.h"
#include "CSSGradientValue.h"
+#include "CSSImageSetValue.h"
#include "CSSImageValue.h"
#include "CSSInheritedValue.h"
#include "CSSInitialValue.h"
@@ -116,10 +117,6 @@
#include "CSSGridTemplateAreasValue.h"
#endif
-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
#if ENABLE(CSS_SCROLL_SNAP)
#include "LengthRepeat.h"
#endif
@@ -1878,12 +1875,10 @@
return nullptr;
}
-#if ENABLE(CSS_IMAGE_SET)
static bool isImageSetFunctionValue(const CSSParserValue& value)
{
return value.unit == CSSParserValue::Function && (equalLettersIgnoringASCIICase(value.function->name, "image-set(") || equalLettersIgnoringASCIICase(value.function->name, "-webkit-image-set("));
}
-#endif
bool CSSParser::parseValue(CSSPropertyID propId, bool important)
{
@@ -2100,7 +2095,7 @@
String uri = value->string;
if (!uri.isNull())
image = CSSImageValue::create(completeURL(uri));
-#if ENABLE(CSS_IMAGE_SET) && ENABLE(MOUSE_CURSOR_SCALE)
+#if ENABLE(MOUSE_CURSOR_SCALE)
} else if (isImageSetFunctionValue(*value)) {
image = parseImageSet();
if (!image)
@@ -2232,15 +2227,12 @@
m_valueList->next();
else
return false;
- }
-#if ENABLE(CSS_IMAGE_SET)
- else if (isImageSetFunctionValue(valueWithCalculation.value())) {
+ } else if (isImageSetFunctionValue(valueWithCalculation.value())) {
parsedValue = parseImageSet();
if (!parsedValue)
return false;
m_valueList->next();
}
-#endif
break;
case CSSPropertyWebkitTextStrokeWidth:
@@ -4288,12 +4280,10 @@
parsedValue = parseCounterContent(*args, true);
if (!parsedValue)
return false;
-#if ENABLE(CSS_IMAGE_SET)
} else if (isImageSetFunctionValue(*value)) {
parsedValue = parseImageSet();
if (!parsedValue)
return false;
-#endif
} else if (isGeneratedImageValue(*value)) {
if (!parseGeneratedImage(*m_valueList, parsedValue))
return false;
@@ -4386,13 +4376,11 @@
if (isGeneratedImageValue(*valueList.current()))
return parseGeneratedImage(valueList, value);
-#if ENABLE(CSS_IMAGE_SET)
if (isImageSetFunctionValue(*valueList.current())) {
value = parseImageSet();
if (value)
return true;
}
-#endif
return false;
}
@@ -8345,7 +8333,6 @@
context.commitImage(WTFMove(value));
else
return false;
-#if ENABLE(CSS_IMAGE_SET)
} else if (isImageSetFunctionValue(*currentValue)) {
RefPtr<CSSValue> value = parseImageSet();
if (value)
@@ -8352,7 +8339,6 @@
context.commitImage(value.releaseNonNull());
else
return false;
-#endif
} else if (currentValue->id == CSSValueNone)
context.commitImage(CSSValuePool::singleton().createIdentifierValue(CSSValueNone));
}
@@ -9704,7 +9690,6 @@
}
#endif
-#if ENABLE(CSS_IMAGE_SET)
RefPtr<CSSImageSetValue> CSSParser::parseImageSet()
{
CSSParserValue& value = *m_valueList->current();
@@ -9756,7 +9741,6 @@
return WTFMove(imageSet);
}
-#endif
class TransformOperationInfo {
public:
Modified: trunk/Source/WebCore/css/CSSParser.h (204565 => 204566)
--- trunk/Source/WebCore/css/CSSParser.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSParser.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -61,6 +61,7 @@
class CSSBasicShapePath;
class CSSBasicShapePolygon;
class CSSGridLineNamesValue;
+class CSSImageSetValue;
class CSSVariableDependentValue;
class Document;
class Element;
@@ -86,10 +87,6 @@
class StyledElement;
class WebKitCSSTransformValue;
-#if ENABLE(CSS_IMAGE_SET)
-class CSSImageSetValue;
-#endif
-
class CSSParser {
friend inline int cssyylex(void*, CSSParser*);
@@ -334,9 +331,7 @@
RefPtr<CSSValueList> parseImageResolution();
#endif
-#if ENABLE(CSS_IMAGE_SET)
RefPtr<CSSImageSetValue> parseImageSet();
-#endif
bool parseFilterImage(CSSParserValueList&, RefPtr<CSSValue>&);
Modified: trunk/Source/WebCore/css/CSSToStyleMap.cpp (204565 => 204566)
--- trunk/Source/WebCore/css/CSSToStyleMap.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSToStyleMap.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -567,11 +567,7 @@
imageProperty = property;
for (auto& current : borderImage) {
- if (is<CSSImageValue>(current.get()) || is<CSSImageGeneratorValue>(current.get())
-#if ENABLE(CSS_IMAGE_SET)
- || is<CSSImageSetValue>(current.get())
-#endif
- )
+ if (is<CSSImageValue>(current.get()) || is<CSSImageGeneratorValue>(current.get()) || is<CSSImageSetValue>(current.get()))
image.setImage(styleImage(imageProperty, current.get()));
else if (is<CSSBorderImageSliceValue>(current.get()))
mapNinePieceImageSlice(current, image);
Modified: trunk/Source/WebCore/css/CSSValue.cpp (204565 => 204566)
--- trunk/Source/WebCore/css/CSSValue.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSValue.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -150,10 +150,8 @@
return downcast<CSSCrossfadeValue>(*this).traverseSubresources(handler);
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;
}
@@ -238,10 +236,8 @@
return compareCSSValues<CSSLineBoxContainValue>(*this, other);
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);
case SVGColorClass:
@@ -346,10 +342,8 @@
return downcast<CSSLineBoxContainValue>(*this).customCSSText();
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();
case SVGColorClass:
@@ -479,11 +473,9 @@
case CalculationClass:
delete downcast<CSSCalcValue>(this);
return;
-#if ENABLE(CSS_IMAGE_SET)
case ImageSetClass:
delete downcast<CSSImageSetValue>(this);
return;
-#endif
case FilterImageClass:
delete downcast<CSSFilterImageValue>(this);
return;
@@ -531,10 +523,8 @@
return downcast<WebKitCSSFilterValue>(*this).cloneForCSSOM();
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();
case SVGPaintClass:
Modified: trunk/Source/WebCore/css/CSSValue.h (204565 => 204566)
--- trunk/Source/WebCore/css/CSSValue.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/CSSValue.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -88,9 +88,7 @@
bool isImageGeneratorValue() const { return m_classType >= CanvasClass && m_classType <= RadialGradientClass; }
bool isGradientValue() const { return m_classType >= LinearGradientClass && m_classType <= RadialGradientClass; }
bool isNamedImageValue() const { return m_classType == NamedImageClass; }
-#if ENABLE(CSS_IMAGE_SET)
bool isImageSetValue() const { return m_classType == ImageSetClass; }
-#endif
bool isImageValue() const { return m_classType == ImageClass; }
bool isImplicitInitialValue() const;
bool isInheritedValue() const { return m_classType == InheritedClass; }
@@ -200,9 +198,7 @@
// List class types must appear after ValueListClass.
ValueListClass,
-#if ENABLE(CSS_IMAGE_SET)
ImageSetClass,
-#endif
WebKitCSSFilterClass,
WebKitCSSTransformClass,
#if ENABLE(CSS_GRID_LAYOUT)
Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (204565 => 204566)
--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -730,11 +730,7 @@
#if ENABLE(CSS_SHAPES)
static inline bool isImageShape(const CSSValue& value)
{
- return is<CSSImageValue>(value)
-#if ENABLE(CSS_IMAGE_SET)
- || is<CSSImageSetValue>(value)
-#endif
- || is<CSSImageGeneratorValue>(value);
+ return is<CSSImageValue>(value) || is<CSSImageSetValue>(value) || is<CSSImageGeneratorValue>(value);
}
inline PassRefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(StyleResolver& styleResolver, CSSValue& value)
Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (204565 => 204566)
--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -1312,11 +1312,9 @@
else
styleResolver.style()->setContent(StyleGeneratedImage::create(downcast<CSSImageGeneratorValue>(item.get())), didSet);
didSet = true;
-#if ENABLE(CSS_IMAGE_SET)
} else if (is<CSSImageSetValue>(item.get())) {
styleResolver.style()->setContent(styleResolver.setOrPendingFromValue(CSSPropertyContent, downcast<CSSImageSetValue>(item.get())), didSet);
didSet = true;
-#endif
}
if (is<CSSImageValue>(item.get())) {
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (204565 => 204566)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -41,6 +41,7 @@
#include "CSSFontSelector.h"
#include "CSSFontValue.h"
#include "CSSFunctionValue.h"
+#include "CSSImageSetValue.h"
#include "CSSInheritedValue.h"
#include "CSSInitialValue.h"
#include "CSSKeyframeRule.h"
@@ -152,10 +153,6 @@
#include "CSSGridTemplateAreasValue.h"
#endif
-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
#if ENABLE(DASHBOARD_SUPPORT)
#include "DashboardRegion.h"
#endif
@@ -1715,10 +1712,8 @@
return generatedOrPendingFromValue(property, downcast<CSSImageGeneratorValue>(value));
}
-#if ENABLE(CSS_IMAGE_SET)
if (is<CSSImageSetValue>(value))
return setOrPendingFromValue(property, downcast<CSSImageSetValue>(value));
-#endif
if (is<CSSCursorImageValue>(value))
return cursorOrPendingFromValue(property, downcast<CSSCursorImageValue>(value));
@@ -1748,7 +1743,6 @@
return StyleGeneratedImage::create(value);
}
-#if ENABLE(CSS_IMAGE_SET)
RefPtr<StyleImage> StyleResolver::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue& value)
{
RefPtr<StyleImage> image = value.cachedOrPendingImageSet(document());
@@ -1756,7 +1750,6 @@
m_state.ensurePendingResources().pendingImages.set(property, &value);
return image;
}
-#endif
RefPtr<StyleImage> StyleResolver::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue& value)
{
Modified: trunk/Source/WebCore/css/StyleResolver.h (204565 => 204566)
--- trunk/Source/WebCore/css/StyleResolver.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -460,9 +460,7 @@
RefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue&);
Ref<StyleImage> cachedOrPendingFromValue(CSSPropertyID, CSSImageValue&);
Ref<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
-#if ENABLE(CSS_IMAGE_SET)
RefPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, CSSImageSetValue&);
-#endif
RefPtr<StyleImage> cursorOrPendingFromValue(CSSPropertyID, CSSCursorImageValue&);
bool applyPropertyToRegularStyle() const { return m_state.applyPropertyToRegularStyle(); }
Modified: trunk/Source/WebCore/css/makeprop.pl (204565 => 204566)
--- trunk/Source/WebCore/css/makeprop.pl 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/css/makeprop.pl 2016-08-17 19:56:28 UTC (rev 204566)
@@ -659,11 +659,7 @@
my $setterContent = "";
$setterContent .= $indent . "FillLayer* child = &styleResolver.style()->" . getLayersAccessorFunction($name) . "();\n";
$setterContent .= $indent . "FillLayer* previousChild = nullptr;\n";
- $setterContent .= $indent . "if (is<CSSValueList>(value)\n";
- $setterContent .= "#if ENABLE(CSS_IMAGE_SET)\n";
- $setterContent .= $indent . "&& !is<CSSImageSetValue>(value)\n";
- $setterContent .= "#endif\n";
- $setterContent .= $indent . ") {\n";
+ $setterContent .= $indent . "if (is<CSSValueList>(value) && !is<CSSImageSetValue>(value)) {\n";
$setterContent .= $indent . " // Walk each value and put it into a layer, creating new layers as needed.\n";
$setterContent .= $indent . " for (auto& item : downcast<CSSValueList>(value)) {\n";
$setterContent .= $indent . " if (!child) {\n";
Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp (204565 => 204566)
--- trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -46,10 +46,8 @@
PassRefPtr<CSSValue> StyleCachedImage::cssValue() const
{
-#if ENABLE(CSS_IMAGE_SET)
if (m_cssImageSetValue)
return const_cast<CSSImageSetValue*>(m_cssImageSetValue);
-#endif
return CSSPrimitiveValue::create(m_image->url(), CSSPrimitiveValue::CSS_URI);
}
Modified: trunk/Source/WebCore/rendering/style/StylePendingImage.h (204565 => 204566)
--- trunk/Source/WebCore/rendering/style/StylePendingImage.h 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/rendering/style/StylePendingImage.h 2016-08-17 19:56:28 UTC (rev 204566)
@@ -28,13 +28,10 @@
#include "CSSCursorImageValue.h"
#include "CSSImageGeneratorValue.h"
+#include "CSSImageSetValue.h"
#include "CSSImageValue.h"
#include "StyleImage.h"
-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
namespace WebCore {
// StylePendingImage is a placeholder StyleImage that is entered into the RenderStyle during
@@ -48,10 +45,7 @@
CSSImageValue* cssImageValue() const { return is<CSSImageValue>(m_value) ? downcast<CSSImageValue>(m_value) : nullptr; }
CSSImageGeneratorValue* cssImageGeneratorValue() const { return is<CSSImageGeneratorValue>(m_value) ? static_cast<CSSImageGeneratorValue*>(m_value) : nullptr; }
CSSCursorImageValue* cssCursorImageValue() const { return is<CSSCursorImageValue>(m_value) ? downcast<CSSCursorImageValue>(m_value) : nullptr; }
-
-#if ENABLE(CSS_IMAGE_SET)
CSSImageSetValue* cssImageSetValue() const { return is<CSSImageSetValue>(m_value) ? downcast<CSSImageSetValue>(m_value) : nullptr; }
-#endif
void detachFromCSSValue() { m_value = nullptr; }
Modified: trunk/Source/WebCore/style/StylePendingResources.cpp (204565 => 204566)
--- trunk/Source/WebCore/style/StylePendingResources.cpp 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/WebCore/style/StylePendingResources.cpp 2016-08-17 19:56:28 UTC (rev 204566)
@@ -66,10 +66,8 @@
if (auto cursorImageValue = pendingImage.cssCursorImageValue())
return cursorImageValue->cachedImage(document.cachedResourceLoader(), options);
-#if ENABLE(CSS_IMAGE_SET)
if (auto imageSetValue = pendingImage.cssImageSetValue())
return imageSetValue->bestFitImage(document.cachedResourceLoader(), options);
-#endif
return nullptr;
}
Modified: trunk/Source/cmake/OptionsEfl.cmake (204565 => 204566)
--- trunk/Source/cmake/OptionsEfl.cmake 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/cmake/OptionsEfl.cmake 2016-08-17 19:56:28 UTC (rev 204566)
@@ -85,7 +85,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
Modified: trunk/Source/cmake/OptionsGTK.cmake (204565 => 204566)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-08-17 19:56:28 UTC (rev 204566)
@@ -152,7 +152,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
Modified: trunk/Source/cmake/OptionsMac.cmake (204565 => 204566)
--- trunk/Source/cmake/OptionsMac.cmake 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/cmake/OptionsMac.cmake 2016-08-17 19:56:28 UTC (rev 204566)
@@ -20,7 +20,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION PRIVATE OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PRIVATE ON)
Modified: trunk/Source/cmake/OptionsWin.cmake (204565 => 204566)
--- trunk/Source/cmake/OptionsWin.cmake 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/cmake/OptionsWin.cmake 2016-08-17 19:56:28 UTC (rev 204566)
@@ -15,7 +15,6 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PUBLIC OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PUBLIC ON)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (204565 => 204566)
--- trunk/Source/cmake/WebKitFeatures.cmake 2016-08-17 19:19:05 UTC (rev 204565)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2016-08-17 19:56:28 UTC (rev 204566)
@@ -92,7 +92,6 @@
WEBKIT_OPTION_DEFINE(ENABLE_CSS_GRID_LAYOUT "Toggle CSS Grid Layout support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_ORIENTATION "Toggle CSS image-orientation support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" PRIVATE OFF)
