Changeset 204566 in webkit


Ignore:
Timestamp:
Aug 17, 2016 12:56:28 PM (8 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:
Location:
trunk/Source
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r204541 r204566  
     12016-08-17  Antti Koivisto  <antti@apple.com>
     2
     3        Remove CSS_IMAGE_SET feature define
     4        https://bugs.webkit.org/show_bug.cgi?id=160944
     5
     6        Reviewed by Dean Jackson.
     7
     8        * wtf/FeatureDefines.h:
     9
    1102016-08-16  Keith Miller  <keith_miller@apple.com>
    211

  • trunk/Source/WTF/wtf/FeatureDefines.h

    r204541 r204566  
    6767#endif
    6868
    69 #if !defined(ENABLE_CSS_IMAGE_SET)
    70 #define ENABLE_CSS_IMAGE_SET 1
    71 #endif
    72 
    7369#if !defined(ENABLE_CURSOR_SUPPORT)
    7470#define ENABLE_CURSOR_SUPPORT 0
    … …  
    182178#endif
    183179
    184 #if !defined(ENABLE_CSS_IMAGE_SET)
    185 #define ENABLE_CSS_IMAGE_SET 1
    186 #endif
    187 
    188180#if !defined(ENABLE_DASHBOARD_SUPPORT)
    189181#define ENABLE_DASHBOARD_SUPPORT 1
    … …  
    413405#endif
    414406
    415 #if !defined(ENABLE_CSS_IMAGE_SET)
    416 #define ENABLE_CSS_IMAGE_SET 0
    417 #endif
    418 
    419407#if !defined(ENABLE_CURSOR_SUPPORT)
    420408#define ENABLE_CURSOR_SUPPORT 1

  • trunk/Source/WebCore/ChangeLog

    r204564 r204566  
     12016-08-17  Antti Koivisto  <antti@apple.com>
     2
     3        Remove CSS_IMAGE_SET feature define
     4        https://bugs.webkit.org/show_bug.cgi?id=160944
     5
     6        Reviewed by Dean Jackson.
     7
     8        This seems to be enabled everywhere already (except Mac cmake build which it keep breaking).
     9
     10        * css/CSSCursorImageValue.cpp:
     11        (WebCore::CSSCursorImageValue::CSSCursorImageValue):
     12        (WebCore::CSSCursorImageValue::cachedImage):
     13        (WebCore::CSSCursorImageValue::cachedOrPendingImage):
     14        * css/CSSImageSetValue.cpp:
     15        (WebCore::CSSImageSetValue::cloneForCSSOM):
     16        * css/CSSImageSetValue.h:
     17        * css/CSSParser.cpp:
     18        (WebCore::CSSParser::parseVariableDependentValue):
     19        (WebCore::isImageSetFunctionValue):
     20        (WebCore::CSSParser::parseValue):
     21        (WebCore::CSSParser::parseContent):
     22        (WebCore::CSSParser::parseFillImage):
     23        (WebCore::CSSParser::parseBorderImage):
     24        (WebCore::CSSParser::parseImageResolution):
     25        (WebCore::CSSParser::parseImageSet):
     26        * css/CSSParser.h:
     27        * css/CSSToStyleMap.cpp:
     28        (WebCore::CSSToStyleMap::mapNinePieceImage):
     29        * css/CSSValue.cpp:
     30        (WebCore::CSSValue::traverseSubresources):
     31        (WebCore::CSSValue::equals):
     32        (WebCore::CSSValue::cssText):
     33        (WebCore::CSSValue::destroy):
     34        (WebCore::CSSValue::cloneForCSSOM):
     35        * css/CSSValue.h:
     36        (WebCore::CSSValue::isImageGeneratorValue):
     37        (WebCore::CSSValue::isGradientValue):
     38        (WebCore::CSSValue::isNamedImageValue):
     39        (WebCore::CSSValue::isImageSetValue):
     40        (WebCore::CSSValue::isImageValue):
     41        (WebCore::CSSValue::isInheritedValue):
     42        * css/StyleBuilderConverter.h:
     43        (WebCore::isImageShape):
     44        * css/StyleBuilderCustom.h:
     45        (WebCore::StyleBuilderCustom::applyValueContent):
     46        * css/StyleResolver.cpp:
     47        (WebCore::StyleResolver::styleImage):
     48        (WebCore::StyleResolver::generatedOrPendingFromValue):
     49        (WebCore::StyleResolver::setOrPendingFromValue):
     50        (WebCore::StyleResolver::cursorOrPendingFromValue):
     51        * css/StyleResolver.h:
     52        (WebCore::StyleResolver::applyPropertyToRegularStyle):
     53        * css/makeprop.pl:
     54        (generateFillLayerPropertyValueSetter):
     55        * rendering/style/StyleCachedImage.cpp:
     56        (WebCore::StyleCachedImage::cssValue):
     57        * rendering/style/StylePendingImage.h:
     58        * style/StylePendingResources.cpp:
     59        (WebCore::Style::loadPendingImage):
     60
    1612016-08-17  Antti Koivisto  <antti@apple.com>
    262

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

    r204560 r204566  
    3838#include <wtf/text/StringBuilder.h>
    3939#include <wtf/text/WTFString.h>
    40 
    41 #if ENABLE(CSS_IMAGE_SET)
    42 #include "CSSImageSetValue.h"
    43 #endif
    4440
    4541namespace WebCore {
    … …  
    119115StyleImage* CSSCursorImageValue::cachedImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
    120116{
    121 #if ENABLE(CSS_IMAGE_SET)
    122117    if (is<CSSImageSetValue>(m_imageValue.get()))
    123118        return downcast<CSSImageSetValue>(m_imageValue.get()).bestFitImage(loader, options);
    124 #endif
    125119
    126120    auto* cursorElement = loader.document() ? updateCursorElement(*loader.document()) : nullptr;
    … …  
    153147StyleImage* CSSCursorImageValue::cachedOrPendingImage(const Document& document)
    154148{
    155 #if ENABLE(CSS_IMAGE_SET)
    156149    // Need to delegate completely so that changes in device scale factor can be handled appropriately.
    157150    if (is<CSSImageSetValue>(m_imageValue.get()))
    158151        return downcast<CSSImageSetValue>(m_imageValue.get()).cachedOrPendingImageSet(document);
    159 #else
    160     UNUSED_PARAM(document);
    161 #endif
    162152
    163153    if (!m_image)

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

    r204560 r204566  
    2727#include "CSSImageSetValue.h"
    2828
    29 #if ENABLE(CSS_IMAGE_SET)
    30 
    3129#include "CSSImageValue.h"
    3230#include "CSSPrimitiveValue.h"
    … …  
    205203
    206204} // namespace WebCore
    207 
    208 #endif // ENABLE(CSS_IMAGE_SET)

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

    r204560 r204566  
    2626#ifndef CSSImageSetValue_h
    2727#define CSSImageSetValue_h
    28 
    29 #if ENABLE(CSS_IMAGE_SET)
    3028
    3129#include "CSSValueList.h"
    … …  
    9189SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSImageSetValue, isImageSetValue())
    9290
    93 #endif // ENABLE(CSS_IMAGE_SET)
    94 
    9591#endif // CSSImageSetValue_h

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

    r204052 r204566  
    4646#include "CSSFunctionValue.h"
    4747#include "CSSGradientValue.h"
     48#include "CSSImageSetValue.h"
    4849#include "CSSImageValue.h"
    4950#include "CSSInheritedValue.h"
    … …  
    115116#include "CSSGridLineNamesValue.h"
    116117#include "CSSGridTemplateAreasValue.h"
    117 #endif
    118 
    119 #if ENABLE(CSS_IMAGE_SET)
    120 #include "CSSImageSetValue.h"
    121118#endif
    122119
    … …  
    18791876}
    18801877
    1881 #if ENABLE(CSS_IMAGE_SET)
    18821878static bool isImageSetFunctionValue(const CSSParserValue& value)
    18831879{
    18841880    return value.unit == CSSParserValue::Function && (equalLettersIgnoringASCIICase(value.function->name, "image-set(") || equalLettersIgnoringASCIICase(value.function->name, "-webkit-image-set("));
    18851881}
    1886 #endif
    18871882
    18881883bool CSSParser::parseValue(CSSPropertyID propId, bool important)
    … …  
    21012096                if (!uri.isNull())
    21022097                    image = CSSImageValue::create(completeURL(uri));
    2103 #if ENABLE(CSS_IMAGE_SET) && ENABLE(MOUSE_CURSOR_SCALE)
     2098#if ENABLE(MOUSE_CURSOR_SCALE)
    21042099            } else if (isImageSetFunctionValue(*value)) {
    21052100                image = parseImageSet();
    … …  
    22332228            else
    22342229                return false;
    2235         }
    2236 #if ENABLE(CSS_IMAGE_SET)
    2237         else if (isImageSetFunctionValue(valueWithCalculation.value())) {
     2230        } else if (isImageSetFunctionValue(valueWithCalculation.value())) {
    22382231            parsedValue = parseImageSet();
    22392232            if (!parsedValue)
    … …  
    22412234            m_valueList->next();
    22422235        }
    2243 #endif
    22442236        break;
    22452237
    … …  
    42894281                if (!parsedValue)
    42904282                    return false;
    4291 #if ENABLE(CSS_IMAGE_SET)
    42924283            } else if (isImageSetFunctionValue(*value)) {
    42934284                parsedValue = parseImageSet();
    42944285                if (!parsedValue)
    42954286                    return false;
    4296 #endif
    42974287            } else if (isGeneratedImageValue(*value)) {
    42984288                if (!parseGeneratedImage(*m_valueList, parsedValue))
    … …  
    43874377        return parseGeneratedImage(valueList, value);
    43884378   
    4389 #if ENABLE(CSS_IMAGE_SET)
    43904379    if (isImageSetFunctionValue(*valueList.current())) {
    43914380        value = parseImageSet();
    … …  
    43934382            return true;
    43944383    }
    4395 #endif
    43964384
    43974385    return false;
    … …  
    83468334                else
    83478335                    return false;
    8348 #if ENABLE(CSS_IMAGE_SET)
    83498336            } else if (isImageSetFunctionValue(*currentValue)) {
    83508337                RefPtr<CSSValue> value = parseImageSet();
    … …  
    83538340                else
    83548341                    return false;
    8355 #endif
    83568342            } else if (currentValue->id == CSSValueNone)
    83578343                context.commitImage(CSSValuePool::singleton().createIdentifierValue(CSSValueNone));
    … …  
    97059691#endif
    97069692
    9707 #if ENABLE(CSS_IMAGE_SET)
    97089693RefPtr<CSSImageSetValue> CSSParser::parseImageSet()
    97099694{
    … …  
    97579742    return WTFMove(imageSet);
    97589743}
    9759 #endif
    97609744
    97619745class TransformOperationInfo {

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

    r204466 r204566  
    6262class CSSBasicShapePolygon;
    6363class CSSGridLineNamesValue;
     64class CSSImageSetValue;
    6465class CSSVariableDependentValue;
    6566class Document;
    … …  
    8788class WebKitCSSTransformValue;
    8889
    89 #if ENABLE(CSS_IMAGE_SET)
    90 class CSSImageSetValue;
    91 #endif
    92 
    9390class CSSParser {
    9491    friend inline int cssyylex(void*, CSSParser*);
    … …  
    335332#endif
    336333
    337 #if ENABLE(CSS_IMAGE_SET)
    338334    RefPtr<CSSImageSetValue> parseImageSet();
    339 #endif
    340335
    341336    bool parseFilterImage(CSSParserValueList&, RefPtr<CSSValue>&);

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

    r201759 r204566  
    568568
    569569    for (auto& current : borderImage) {
    570         if (is<CSSImageValue>(current.get()) || is<CSSImageGeneratorValue>(current.get())
    571 #if ENABLE(CSS_IMAGE_SET)
    572             || is<CSSImageSetValue>(current.get())
    573 #endif
    574             )
     570        if (is<CSSImageValue>(current.get()) || is<CSSImageGeneratorValue>(current.get()) || is<CSSImageSetValue>(current.get()))
    575571            image.setImage(styleImage(imageProperty, current.get()));
    576572        else if (is<CSSBorderImageSliceValue>(current.get()))

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

    r201759 r204566  
    151151    if (is<CSSFilterImageValue>(*this))
    152152        return downcast<CSSFilterImageValue>(*this).traverseSubresources(handler);
    153 #if ENABLE(CSS_IMAGE_SET)
    154153    if (is<CSSImageSetValue>(*this))
    155154        return downcast<CSSImageSetValue>(*this).traverseSubresources(handler);
    156 #endif
    157155    return false;
    158156}
    … …  
    239237        case CalculationClass:
    240238            return compareCSSValues<CSSCalcValue>(*this, other);
    241 #if ENABLE(CSS_IMAGE_SET)
    242239        case ImageSetClass:
    243240            return compareCSSValues<CSSImageSetValue>(*this, other);
    244 #endif
    245241        case WebKitCSSFilterClass:
    246242            return compareCSSValues<WebKitCSSFilterValue>(*this, other);
    … …  
    347343    case CalculationClass:
    348344        return downcast<CSSCalcValue>(*this).customCSSText();
    349 #if ENABLE(CSS_IMAGE_SET)
    350345    case ImageSetClass:
    351346        return downcast<CSSImageSetValue>(*this).customCSSText();
    352 #endif
    353347    case WebKitCSSFilterClass:
    354348        return downcast<WebKitCSSFilterValue>(*this).customCSSText();
    … …  
    480474        delete downcast<CSSCalcValue>(this);
    481475        return;
    482 #if ENABLE(CSS_IMAGE_SET)
    483476    case ImageSetClass:
    484477        delete downcast<CSSImageSetValue>(this);
    485478        return;
    486 #endif
    487479    case FilterImageClass:
    488480        delete downcast<CSSFilterImageValue>(this);
    … …  
    532524    case WebKitCSSTransformClass:
    533525        return downcast<WebKitCSSTransformValue>(*this).cloneForCSSOM();
    534 #if ENABLE(CSS_IMAGE_SET)
    535526    case ImageSetClass:
    536527        return downcast<CSSImageSetValue>(*this).cloneForCSSOM();
    537 #endif
    538528    case SVGColorClass:
    539529        return downcast<SVGColor>(*this).cloneForCSSOM();

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

    r204466 r204566  
    8989    bool isGradientValue() const { return m_classType >= LinearGradientClass && m_classType <= RadialGradientClass; }
    9090    bool isNamedImageValue() const { return m_classType == NamedImageClass; }
    91 #if ENABLE(CSS_IMAGE_SET)
    9291    bool isImageSetValue() const { return m_classType == ImageSetClass; }
    93 #endif
    9492    bool isImageValue() const { return m_classType == ImageClass; }
    9593    bool isImplicitInitialValue() const;
    … …  
    201199        // List class types must appear after ValueListClass.
    202200        ValueListClass,
    203 #if ENABLE(CSS_IMAGE_SET)
    204201        ImageSetClass,
    205 #endif
    206202        WebKitCSSFilterClass,
    207203        WebKitCSSTransformClass,

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

    r203716 r204566  
    731731static inline bool isImageShape(const CSSValue& value)
    732732{
    733     return is<CSSImageValue>(value)
    734 #if ENABLE(CSS_IMAGE_SET)
    735         || is<CSSImageSetValue>(value)
    736 #endif
    737         || is<CSSImageGeneratorValue>(value);
     733    return is<CSSImageValue>(value) || is<CSSImageSetValue>(value) || is<CSSImageGeneratorValue>(value);
    738734}
    739735

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

    r201086 r204566  
    13131313                styleResolver.style()->setContent(StyleGeneratedImage::create(downcast<CSSImageGeneratorValue>(item.get())), didSet);
    13141314            didSet = true;
    1315 #if ENABLE(CSS_IMAGE_SET)
    13161315        } else if (is<CSSImageSetValue>(item.get())) {
    13171316            styleResolver.style()->setContent(styleResolver.setOrPendingFromValue(CSSPropertyContent, downcast<CSSImageSetValue>(item.get())), didSet);
    13181317            didSet = true;
    1319 #endif
    13201318        }
    13211319

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

    r204560 r204566  
    4242#include "CSSFontValue.h"
    4343#include "CSSFunctionValue.h"
     44#include "CSSImageSetValue.h"
    4445#include "CSSInheritedValue.h"
    4546#include "CSSInitialValue.h"
    … …  
    153154#endif
    154155
    155 #if ENABLE(CSS_IMAGE_SET)
    156 #include "CSSImageSetValue.h"
    157 #endif
    158 
    159156#if ENABLE(DASHBOARD_SUPPORT)
    160157#include "DashboardRegion.h"
    … …  
    17161713    }
    17171714
    1718 #if ENABLE(CSS_IMAGE_SET)
    17191715    if (is<CSSImageSetValue>(value))
    17201716        return setOrPendingFromValue(property, downcast<CSSImageSetValue>(value));
    1721 #endif
    17221717
    17231718    if (is<CSSCursorImageValue>(value))
    … …  
    17491744}
    17501745
    1751 #if ENABLE(CSS_IMAGE_SET)
    17521746RefPtr<StyleImage> StyleResolver::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue& value)
    17531747{
    … …  
    17571751    return image;
    17581752}
    1759 #endif
    17601753
    17611754RefPtr<StyleImage> StyleResolver::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue& value)

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

    r204455 r204566  
    461461    Ref<StyleImage> cachedOrPendingFromValue(CSSPropertyID, CSSImageValue&);
    462462    Ref<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
    463 #if ENABLE(CSS_IMAGE_SET)
    464463    RefPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, CSSImageSetValue&);
    465 #endif
    466464    RefPtr<StyleImage> cursorOrPendingFromValue(CSSPropertyID, CSSCursorImageValue&);
    467465

  • trunk/Source/WebCore/css/makeprop.pl

    r201559 r204566  
    660660  $setterContent .= $indent . "FillLayer* child = &styleResolver.style()->" . getLayersAccessorFunction($name) . "();\n";
    661661  $setterContent .= $indent . "FillLayer* previousChild = nullptr;\n";
    662   $setterContent .= $indent . "if (is<CSSValueList>(value)\n";
    663   $setterContent .= "#if ENABLE(CSS_IMAGE_SET)\n";
    664   $setterContent .= $indent . "&& !is<CSSImageSetValue>(value)\n";
    665   $setterContent .= "#endif\n";
    666   $setterContent .= $indent . ") {\n";
     662  $setterContent .= $indent . "if (is<CSSValueList>(value) && !is<CSSImageSetValue>(value)) {\n";
    667663  $setterContent .= $indent . "    // Walk each value and put it into a layer, creating new layers as needed.\n";
    668664  $setterContent .= $indent . "    for (auto& item : downcast<CSSValueList>(value)) {\n";

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

    r204564 r204566  
    4747PassRefPtr<CSSValue> StyleCachedImage::cssValue() const
    4848{
    49 #if ENABLE(CSS_IMAGE_SET)
    5049    if (m_cssImageSetValue)
    5150        return const_cast<CSSImageSetValue*>(m_cssImageSetValue);
    52 #endif
    5351    return CSSPrimitiveValue::create(m_image->url(), CSSPrimitiveValue::CSS_URI);
    5452}

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

    r197563 r204566  
    2929#include "CSSCursorImageValue.h"
    3030#include "CSSImageGeneratorValue.h"
     31#include "CSSImageSetValue.h"
    3132#include "CSSImageValue.h"
    3233#include "StyleImage.h"
    33 
    34 #if ENABLE(CSS_IMAGE_SET)
    35 #include "CSSImageSetValue.h"
    36 #endif
    3734
    3835namespace WebCore {
    … …  
    4946    CSSImageGeneratorValue* cssImageGeneratorValue() const { return is<CSSImageGeneratorValue>(m_value) ? static_cast<CSSImageGeneratorValue*>(m_value) : nullptr; }
    5047    CSSCursorImageValue* cssCursorImageValue() const { return is<CSSCursorImageValue>(m_value) ? downcast<CSSCursorImageValue>(m_value) : nullptr; }
    51 
    52 #if ENABLE(CSS_IMAGE_SET)
    5348    CSSImageSetValue* cssImageSetValue() const { return is<CSSImageSetValue>(m_value) ? downcast<CSSImageSetValue>(m_value) : nullptr; }
    54 #endif
    5549
    5650    void detachFromCSSValue() { m_value = nullptr; }

  • trunk/Source/WebCore/style/StylePendingResources.cpp

    r204560 r204566  
    6767        return cursorImageValue->cachedImage(document.cachedResourceLoader(), options);
    6868
    69 #if ENABLE(CSS_IMAGE_SET)
    7069    if (auto imageSetValue = pendingImage.cssImageSetValue())
    7170        return imageSetValue->bestFitImage(document.cachedResourceLoader(), options);
    72 #endif
    7371
    7472    return nullptr;

  • trunk/Source/cmake/OptionsEfl.cmake

    r204559 r204566  
    8686WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PUBLIC ON)
    8787WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
    88 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PUBLIC ON)
    8988WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
    9089WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PUBLIC OFF)

  • trunk/Source/cmake/OptionsGTK.cmake

    r203768 r204566  
    153153WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE ON)
    154154WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PRIVATE OFF)
    155 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
    156155WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
    157156WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)

  • trunk/Source/cmake/OptionsMac.cmake

    r203115 r204566  
    2121WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION PRIVATE OFF)
    2222WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
    23 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
    2423WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
    2524WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)

  • trunk/Source/cmake/OptionsWin.cmake

    r202848 r204566  
    1616WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PUBLIC OFF)
    1717WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
    18 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PUBLIC ON)
    1918WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
    2019WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)

  • trunk/Source/cmake/WebKitFeatures.cmake

    r203115 r204566  
    9393    WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_ORIENTATION "Toggle CSS image-orientation support" PRIVATE OFF)
    9494    WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" PRIVATE OFF)
    95     WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" PRIVATE OFF)
    9695    WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" PRIVATE OFF)
    9796    WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" PRIVATE OFF)
Note: See TracChangeset for help on using the changeset viewer.