<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[204566] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/204566">204566</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-08-17 12:56:28 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFeatureDefinesh">trunk/Source/WTF/wtf/FeatureDefines.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSCursorImageValuecpp">trunk/Source/WebCore/css/CSSCursorImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValuecpp">trunk/Source/WebCore/css/CSSImageSetValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValueh">trunk/Source/WebCore/css/CSSImageSetValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSParserh">trunk/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSToStyleMapcpp">trunk/Source/WebCore/css/CSSToStyleMap.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValuecpp">trunk/Source/WebCore/css/CSSValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueh">trunk/Source/WebCore/css/CSSValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleCachedImagecpp">trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStylePendingImageh">trunk/Source/WebCore/rendering/style/StylePendingImage.h</a></li>
<li><a href="#trunkSourceWebCorestyleStylePendingResourcescpp">trunk/Source/WebCore/style/StylePendingResources.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWincmake">trunk/Source/cmake/OptionsWin.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-08-17 Antti Koivisto <antti@apple.com>
+
+ Remove CSS_IMAGE_SET feature define
+ https://bugs.webkit.org/show_bug.cgi?id=160944
+
+ Reviewed by Dean Jackson.
+
+ * wtf/FeatureDefines.h:
+
</ins><span class="cx"> 2016-08-16 Keith Miller <keith_miller@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable WebAssembly in the build.
</span></span></pre></div>
<a id="trunkSourceWTFwtfFeatureDefinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FeatureDefines.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -66,10 +66,6 @@
</span><span class="cx"> #define ENABLE_CONTEXT_MENUS 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_CSS_IMAGE_SET)
-#define ENABLE_CSS_IMAGE_SET 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CURSOR_SUPPORT)
</span><span class="cx"> #define ENABLE_CURSOR_SUPPORT 0
</span><span class="cx"> #endif
</span><span class="lines">@@ -181,10 +177,6 @@
</span><span class="cx"> #define ENABLE_CONTENT_EXTENSIONS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_CSS_IMAGE_SET)
-#define ENABLE_CSS_IMAGE_SET 1
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_DASHBOARD_SUPPORT)
</span><span class="cx"> #define ENABLE_DASHBOARD_SUPPORT 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -412,10 +404,6 @@
</span><span class="cx"> #define ENABLE_CSS_IMAGE_RESOLUTION 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(ENABLE_CSS_IMAGE_SET)
-#define ENABLE_CSS_IMAGE_SET 0
-#endif
-
</del><span class="cx"> #if !defined(ENABLE_CURSOR_SUPPORT)
</span><span class="cx"> #define ENABLE_CURSOR_SUPPORT 1
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,65 @@
</span><span class="cx"> 2016-08-17 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><ins>+ 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 <antti@apple.com>
+
</ins><span class="cx"> Try to fix CMake build.
</span><span class="cx">
</span><span class="cx"> * rendering/style/StyleCachedImage.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSCursorImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSCursorImageValue.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,10 +38,6 @@
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> CSSCursorImageValue::CSSCursorImageValue(Ref<CSSValue>&& imageValue, bool hasHotSpot, const IntPoint& hotSpot)
</span><span class="lines">@@ -118,10 +114,8 @@
</span><span class="cx">
</span><span class="cx"> StyleImage* CSSCursorImageValue::cachedImage(CachedResourceLoader& loader, const ResourceLoaderOptions& options)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> if (is<CSSImageSetValue>(m_imageValue.get()))
</span><span class="cx"> return downcast<CSSImageSetValue>(m_imageValue.get()).bestFitImage(loader, options);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> auto* cursorElement = loader.document() ? updateCursorElement(*loader.document()) : nullptr;
</span><span class="cx">
</span><span class="lines">@@ -152,13 +146,9 @@
</span><span class="cx">
</span><span class="cx"> StyleImage* CSSCursorImageValue::cachedOrPendingImage(const Document& document)
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> // Need to delegate completely so that changes in device scale factor can be handled appropriately.
</span><span class="cx"> if (is<CSSImageSetValue>(m_imageValue.get()))
</span><span class="cx"> return downcast<CSSImageSetValue>(m_imageValue.get()).cachedOrPendingImageSet(document);
</span><del>-#else
- UNUSED_PARAM(document);
-#endif
</del><span class="cx">
</span><span class="cx"> if (!m_image)
</span><span class="cx"> m_image = StylePendingImage::create(this);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CSSImageSetValue.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-
</del><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CachedImage.h"
</span><span class="lines">@@ -204,5 +202,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // ENABLE(CSS_IMAGE_SET)
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef CSSImageSetValue_h
</span><span class="cx"> #define CSSImageSetValue_h
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-
</del><span class="cx"> #include "CSSValueList.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -90,6 +88,4 @@
</span><span class="cx">
</span><span class="cx"> SPECIALIZE_TYPE_TRAITS_CSS_VALUE(CSSImageSetValue, isImageSetValue())
</span><span class="cx">
</span><del>-#endif // ENABLE(CSS_IMAGE_SET)
-
</del><span class="cx"> #endif // CSSImageSetValue_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "CSSFontValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSGradientValue.h"
</span><ins>+#include "CSSImageSetValue.h"
</ins><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSInheritedValue.h"
</span><span class="cx"> #include "CSSInitialValue.h"
</span><span class="lines">@@ -116,10 +117,6 @@
</span><span class="cx"> #include "CSSGridTemplateAreasValue.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> #include "LengthRepeat.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1878,12 +1875,10 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> static bool isImageSetFunctionValue(const CSSParserValue& value)
</span><span class="cx"> {
</span><span class="cx"> return value.unit == CSSParserValue::Function && (equalLettersIgnoringASCIICase(value.function->name, "image-set(") || equalLettersIgnoringASCIICase(value.function->name, "-webkit-image-set("));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool CSSParser::parseValue(CSSPropertyID propId, bool important)
</span><span class="cx"> {
</span><span class="lines">@@ -2100,7 +2095,7 @@
</span><span class="cx"> String uri = value->string;
</span><span class="cx"> if (!uri.isNull())
</span><span class="cx"> image = CSSImageValue::create(completeURL(uri));
</span><del>-#if ENABLE(CSS_IMAGE_SET) && ENABLE(MOUSE_CURSOR_SCALE)
</del><ins>+#if ENABLE(MOUSE_CURSOR_SCALE)
</ins><span class="cx"> } else if (isImageSetFunctionValue(*value)) {
</span><span class="cx"> image = parseImageSet();
</span><span class="cx"> if (!image)
</span><span class="lines">@@ -2232,15 +2227,12 @@
</span><span class="cx"> m_valueList->next();
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><del>- }
-#if ENABLE(CSS_IMAGE_SET)
- else if (isImageSetFunctionValue(valueWithCalculation.value())) {
</del><ins>+ } else if (isImageSetFunctionValue(valueWithCalculation.value())) {
</ins><span class="cx"> parsedValue = parseImageSet();
</span><span class="cx"> if (!parsedValue)
</span><span class="cx"> return false;
</span><span class="cx"> m_valueList->next();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case CSSPropertyWebkitTextStrokeWidth:
</span><span class="lines">@@ -4288,12 +4280,10 @@
</span><span class="cx"> parsedValue = parseCounterContent(*args, true);
</span><span class="cx"> if (!parsedValue)
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> } else if (isImageSetFunctionValue(*value)) {
</span><span class="cx"> parsedValue = parseImageSet();
</span><span class="cx"> if (!parsedValue)
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> } else if (isGeneratedImageValue(*value)) {
</span><span class="cx"> if (!parseGeneratedImage(*m_valueList, parsedValue))
</span><span class="cx"> return false;
</span><span class="lines">@@ -4386,13 +4376,11 @@
</span><span class="cx"> if (isGeneratedImageValue(*valueList.current()))
</span><span class="cx"> return parseGeneratedImage(valueList, value);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> if (isImageSetFunctionValue(*valueList.current())) {
</span><span class="cx"> value = parseImageSet();
</span><span class="cx"> if (value)
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -8345,7 +8333,6 @@
</span><span class="cx"> context.commitImage(WTFMove(value));
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> } else if (isImageSetFunctionValue(*currentValue)) {
</span><span class="cx"> RefPtr<CSSValue> value = parseImageSet();
</span><span class="cx"> if (value)
</span><span class="lines">@@ -8352,7 +8339,6 @@
</span><span class="cx"> context.commitImage(value.releaseNonNull());
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx"> } else if (currentValue->id == CSSValueNone)
</span><span class="cx"> context.commitImage(CSSValuePool::singleton().createIdentifierValue(CSSValueNone));
</span><span class="cx"> }
</span><span class="lines">@@ -9704,7 +9690,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> RefPtr<CSSImageSetValue> CSSParser::parseImageSet()
</span><span class="cx"> {
</span><span class="cx"> CSSParserValue& value = *m_valueList->current();
</span><span class="lines">@@ -9756,7 +9741,6 @@
</span><span class="cx">
</span><span class="cx"> return WTFMove(imageSet);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> class TransformOperationInfo {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> class CSSBasicShapePath;
</span><span class="cx"> class CSSBasicShapePolygon;
</span><span class="cx"> class CSSGridLineNamesValue;
</span><ins>+class CSSImageSetValue;
</ins><span class="cx"> class CSSVariableDependentValue;
</span><span class="cx"> class Document;
</span><span class="cx"> class Element;
</span><span class="lines">@@ -86,10 +87,6 @@
</span><span class="cx"> class StyledElement;
</span><span class="cx"> class WebKitCSSTransformValue;
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-class CSSImageSetValue;
-#endif
-
</del><span class="cx"> class CSSParser {
</span><span class="cx"> friend inline int cssyylex(void*, CSSParser*);
</span><span class="cx">
</span><span class="lines">@@ -334,9 +331,7 @@
</span><span class="cx"> RefPtr<CSSValueList> parseImageResolution();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> RefPtr<CSSImageSetValue> parseImageSet();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> bool parseFilterImage(CSSParserValueList&, RefPtr<CSSValue>&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSToStyleMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSToStyleMap.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -567,11 +567,7 @@
</span><span class="cx"> imageProperty = property;
</span><span class="cx">
</span><span class="cx"> for (auto& current : borderImage) {
</span><del>- if (is<CSSImageValue>(current.get()) || is<CSSImageGeneratorValue>(current.get())
-#if ENABLE(CSS_IMAGE_SET)
- || is<CSSImageSetValue>(current.get())
-#endif
- )
</del><ins>+ if (is<CSSImageValue>(current.get()) || is<CSSImageGeneratorValue>(current.get()) || is<CSSImageSetValue>(current.get()))
</ins><span class="cx"> image.setImage(styleImage(imageProperty, current.get()));
</span><span class="cx"> else if (is<CSSBorderImageSliceValue>(current.get()))
</span><span class="cx"> mapNinePieceImageSlice(current, image);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -150,10 +150,8 @@
</span><span class="cx"> return downcast<CSSCrossfadeValue>(*this).traverseSubresources(handler);
</span><span class="cx"> if (is<CSSFilterImageValue>(*this))
</span><span class="cx"> return downcast<CSSFilterImageValue>(*this).traverseSubresources(handler);
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> if (is<CSSImageSetValue>(*this))
</span><span class="cx"> return downcast<CSSImageSetValue>(*this).traverseSubresources(handler);
</span><del>-#endif
</del><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -238,10 +236,8 @@
</span><span class="cx"> return compareCSSValues<CSSLineBoxContainValue>(*this, other);
</span><span class="cx"> case CalculationClass:
</span><span class="cx"> return compareCSSValues<CSSCalcValue>(*this, other);
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> case ImageSetClass:
</span><span class="cx"> return compareCSSValues<CSSImageSetValue>(*this, other);
</span><del>-#endif
</del><span class="cx"> case WebKitCSSFilterClass:
</span><span class="cx"> return compareCSSValues<WebKitCSSFilterValue>(*this, other);
</span><span class="cx"> case SVGColorClass:
</span><span class="lines">@@ -346,10 +342,8 @@
</span><span class="cx"> return downcast<CSSLineBoxContainValue>(*this).customCSSText();
</span><span class="cx"> case CalculationClass:
</span><span class="cx"> return downcast<CSSCalcValue>(*this).customCSSText();
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> case ImageSetClass:
</span><span class="cx"> return downcast<CSSImageSetValue>(*this).customCSSText();
</span><del>-#endif
</del><span class="cx"> case WebKitCSSFilterClass:
</span><span class="cx"> return downcast<WebKitCSSFilterValue>(*this).customCSSText();
</span><span class="cx"> case SVGColorClass:
</span><span class="lines">@@ -479,11 +473,9 @@
</span><span class="cx"> case CalculationClass:
</span><span class="cx"> delete downcast<CSSCalcValue>(this);
</span><span class="cx"> return;
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> case ImageSetClass:
</span><span class="cx"> delete downcast<CSSImageSetValue>(this);
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx"> case FilterImageClass:
</span><span class="cx"> delete downcast<CSSFilterImageValue>(this);
</span><span class="cx"> return;
</span><span class="lines">@@ -531,10 +523,8 @@
</span><span class="cx"> return downcast<WebKitCSSFilterValue>(*this).cloneForCSSOM();
</span><span class="cx"> case WebKitCSSTransformClass:
</span><span class="cx"> return downcast<WebKitCSSTransformValue>(*this).cloneForCSSOM();
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> case ImageSetClass:
</span><span class="cx"> return downcast<CSSImageSetValue>(*this).cloneForCSSOM();
</span><del>-#endif
</del><span class="cx"> case SVGColorClass:
</span><span class="cx"> return downcast<SVGColor>(*this).cloneForCSSOM();
</span><span class="cx"> case SVGPaintClass:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValue.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,9 +88,7 @@
</span><span class="cx"> bool isImageGeneratorValue() const { return m_classType >= CanvasClass && m_classType <= RadialGradientClass; }
</span><span class="cx"> bool isGradientValue() const { return m_classType >= LinearGradientClass && m_classType <= RadialGradientClass; }
</span><span class="cx"> bool isNamedImageValue() const { return m_classType == NamedImageClass; }
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> bool isImageSetValue() const { return m_classType == ImageSetClass; }
</span><del>-#endif
</del><span class="cx"> bool isImageValue() const { return m_classType == ImageClass; }
</span><span class="cx"> bool isImplicitInitialValue() const;
</span><span class="cx"> bool isInheritedValue() const { return m_classType == InheritedClass; }
</span><span class="lines">@@ -200,9 +198,7 @@
</span><span class="cx">
</span><span class="cx"> // List class types must appear after ValueListClass.
</span><span class="cx"> ValueListClass,
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> ImageSetClass,
</span><del>-#endif
</del><span class="cx"> WebKitCSSFilterClass,
</span><span class="cx"> WebKitCSSTransformClass,
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -730,11 +730,7 @@
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> static inline bool isImageShape(const CSSValue& value)
</span><span class="cx"> {
</span><del>- return is<CSSImageValue>(value)
-#if ENABLE(CSS_IMAGE_SET)
- || is<CSSImageSetValue>(value)
-#endif
- || is<CSSImageGeneratorValue>(value);
</del><ins>+ return is<CSSImageValue>(value) || is<CSSImageSetValue>(value) || is<CSSImageGeneratorValue>(value);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline PassRefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(StyleResolver& styleResolver, CSSValue& value)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1312,11 +1312,9 @@
</span><span class="cx"> else
</span><span class="cx"> styleResolver.style()->setContent(StyleGeneratedImage::create(downcast<CSSImageGeneratorValue>(item.get())), didSet);
</span><span class="cx"> didSet = true;
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> } else if (is<CSSImageSetValue>(item.get())) {
</span><span class="cx"> styleResolver.style()->setContent(styleResolver.setOrPendingFromValue(CSSPropertyContent, downcast<CSSImageSetValue>(item.get())), didSet);
</span><span class="cx"> didSet = true;
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (is<CSSImageValue>(item.get())) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "CSSFontValue.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><ins>+#include "CSSImageSetValue.h"
</ins><span class="cx"> #include "CSSInheritedValue.h"
</span><span class="cx"> #include "CSSInitialValue.h"
</span><span class="cx"> #include "CSSKeyframeRule.h"
</span><span class="lines">@@ -152,10 +153,6 @@
</span><span class="cx"> #include "CSSGridTemplateAreasValue.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
</del><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> #include "DashboardRegion.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -1715,10 +1712,8 @@
</span><span class="cx"> return generatedOrPendingFromValue(property, downcast<CSSImageGeneratorValue>(value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> if (is<CSSImageSetValue>(value))
</span><span class="cx"> return setOrPendingFromValue(property, downcast<CSSImageSetValue>(value));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (is<CSSCursorImageValue>(value))
</span><span class="cx"> return cursorOrPendingFromValue(property, downcast<CSSCursorImageValue>(value));
</span><span class="lines">@@ -1748,7 +1743,6 @@
</span><span class="cx"> return StyleGeneratedImage::create(value);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> RefPtr<StyleImage> StyleResolver::setOrPendingFromValue(CSSPropertyID property, CSSImageSetValue& value)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<StyleImage> image = value.cachedOrPendingImageSet(document());
</span><span class="lines">@@ -1756,7 +1750,6 @@
</span><span class="cx"> m_state.ensurePendingResources().pendingImages.set(property, &value);
</span><span class="cx"> return image;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> RefPtr<StyleImage> StyleResolver::cursorOrPendingFromValue(CSSPropertyID property, CSSCursorImageValue& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -460,9 +460,7 @@
</span><span class="cx"> RefPtr<StyleImage> styleImage(CSSPropertyID, CSSValue&);
</span><span class="cx"> Ref<StyleImage> cachedOrPendingFromValue(CSSPropertyID, CSSImageValue&);
</span><span class="cx"> Ref<StyleImage> generatedOrPendingFromValue(CSSPropertyID, CSSImageGeneratorValue&);
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> RefPtr<StyleImage> setOrPendingFromValue(CSSPropertyID, CSSImageSetValue&);
</span><del>-#endif
</del><span class="cx"> RefPtr<StyleImage> cursorOrPendingFromValue(CSSPropertyID, CSSCursorImageValue&);
</span><span class="cx">
</span><span class="cx"> bool applyPropertyToRegularStyle() const { return m_state.applyPropertyToRegularStyle(); }
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -659,11 +659,7 @@
</span><span class="cx"> my $setterContent = "";
</span><span class="cx"> $setterContent .= $indent . "FillLayer* child = &styleResolver.style()->" . getLayersAccessorFunction($name) . "();\n";
</span><span class="cx"> $setterContent .= $indent . "FillLayer* previousChild = nullptr;\n";
</span><del>- $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";
</del><ins>+ $setterContent .= $indent . "if (is<CSSValueList>(value) && !is<CSSImageSetValue>(value)) {\n";
</ins><span class="cx"> $setterContent .= $indent . " // Walk each value and put it into a layer, creating new layers as needed.\n";
</span><span class="cx"> $setterContent .= $indent . " for (auto& item : downcast<CSSValueList>(value)) {\n";
</span><span class="cx"> $setterContent .= $indent . " if (!child) {\n";
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleCachedImage.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,10 +46,8 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<CSSValue> StyleCachedImage::cssValue() const
</span><span class="cx"> {
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> if (m_cssImageSetValue)
</span><span class="cx"> return const_cast<CSSImageSetValue*>(m_cssImageSetValue);
</span><del>-#endif
</del><span class="cx"> return CSSPrimitiveValue::create(m_image->url(), CSSPrimitiveValue::CSS_URI);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStylePendingImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StylePendingImage.h (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -28,13 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSCursorImageValue.h"
</span><span class="cx"> #include "CSSImageGeneratorValue.h"
</span><ins>+#include "CSSImageSetValue.h"
</ins><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "StyleImage.h"
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
-#include "CSSImageSetValue.h"
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> // StylePendingImage is a placeholder StyleImage that is entered into the RenderStyle during
</span><span class="lines">@@ -48,10 +45,7 @@
</span><span class="cx"> CSSImageValue* cssImageValue() const { return is<CSSImageValue>(m_value) ? downcast<CSSImageValue>(m_value) : nullptr; }
</span><span class="cx"> CSSImageGeneratorValue* cssImageGeneratorValue() const { return is<CSSImageGeneratorValue>(m_value) ? static_cast<CSSImageGeneratorValue*>(m_value) : nullptr; }
</span><span class="cx"> CSSCursorImageValue* cssCursorImageValue() const { return is<CSSCursorImageValue>(m_value) ? downcast<CSSCursorImageValue>(m_value) : nullptr; }
</span><del>-
-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> CSSImageSetValue* cssImageSetValue() const { return is<CSSImageSetValue>(m_value) ? downcast<CSSImageSetValue>(m_value) : nullptr; }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void detachFromCSSValue() { m_value = nullptr; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStylePendingResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StylePendingResources.cpp (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -66,10 +66,8 @@
</span><span class="cx"> if (auto cursorImageValue = pendingImage.cssCursorImageValue())
</span><span class="cx"> return cursorImageValue->cachedImage(document.cachedResourceLoader(), options);
</span><span class="cx">
</span><del>-#if ENABLE(CSS_IMAGE_SET)
</del><span class="cx"> if (auto imageSetValue = pendingImage.cssImageSetValue())
</span><span class="cx"> return imageSetValue->bestFitImage(document.cachedResourceLoader(), options);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -85,7 +85,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS3_TEXT PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_DEVICE_ADAPTATION PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -152,7 +152,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_3D_TRANSFORMS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCESSIBILITY PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CANVAS_PATH PRIVATE OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_ORIENTATION PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_RESOLUTION PRIVATE OFF)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SCROLL_SNAP PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PRIVATE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWin.cmake (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -15,7 +15,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_BOX_DECORATION_BREAK PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_COMPOSITING PUBLIC OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_GRID_LAYOUT PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SHAPES PUBLIC ON)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (204565 => 204566)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -92,7 +92,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_GRID_LAYOUT "Toggle CSS Grid Layout support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_ORIENTATION "Toggle CSS image-orientation support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_RESOLUTION "Toggle CSS image-resolution support" PRIVATE OFF)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_CSS_IMAGE_SET "Toggle CSS image-set support" PRIVATE OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_REGIONS "Toggle CSS regions support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SCROLL_SNAP "Toggle CSS snap scroll support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_CSS_SELECTORS_LEVEL4 "Toggle CSS Selectors Level 4 support" PRIVATE OFF)
</span></span></pre>
</div>
</div>
</body>
</html>