Title: [208169] trunk/Source/WebCore
- Revision
- 208169
- Author
- [email protected]
- Date
- 2016-10-31 12:38:58 -0700 (Mon, 31 Oct 2016)
Log Message
[CSS Parser] Support -webkit-named-image
https://bugs.webkit.org/show_bug.cgi?id=164235
Reviewed by Dean Jackson.
* css/CSSValueKeywords.in:
* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::consumeWebkitNamedImage):
(WebCore::CSSPropertyParserHelpers::consumeGeneratedImage):
(WebCore::CSSPropertyParserHelpers::isGeneratedImage):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208168 => 208169)
--- trunk/Source/WebCore/ChangeLog 2016-10-31 19:15:52 UTC (rev 208168)
+++ trunk/Source/WebCore/ChangeLog 2016-10-31 19:38:58 UTC (rev 208169)
@@ -1,3 +1,16 @@
+2016-10-31 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Support -webkit-named-image
+ https://bugs.webkit.org/show_bug.cgi?id=164235
+
+ Reviewed by Dean Jackson.
+
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSPropertyParserHelpers.cpp:
+ (WebCore::CSSPropertyParserHelpers::consumeWebkitNamedImage):
+ (WebCore::CSSPropertyParserHelpers::consumeGeneratedImage):
+ (WebCore::CSSPropertyParserHelpers::isGeneratedImage):
+
2016-10-28 Brent Fulgham <[email protected]>
Do a better job of protecting Frame objects in the context of _javascript_ calls
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (208168 => 208169)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-10-31 19:15:52 UTC (rev 208168)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-10-31 19:38:58 UTC (rev 208169)
@@ -1156,7 +1156,6 @@
radial-gradient
repeating-linear-gradient
repeating-radial-gradient
-paint
-webkit-canvas
-webkit-cross-fade
-webkit-gradient
@@ -1165,6 +1164,7 @@
-webkit-repeating-linear-gradient
-webkit-repeating-radial-gradient
-webkit-image-set
+-webkit-named-image
// deprecated gradients
from
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (208168 => 208169)
--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-10-31 19:15:52 UTC (rev 208168)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-10-31 19:38:58 UTC (rev 208169)
@@ -36,6 +36,7 @@
#include "CSSGradientValue.h"
#include "CSSImageSetValue.h"
#include "CSSImageValue.h"
+#include "CSSNamedImageValue.h"
#include "CSSParserIdioms.h"
#include "CSSValuePool.h"
#include "Pair.h"
@@ -1075,6 +1076,16 @@
return nullptr;
return CSSCanvasValue::create(canvasName);
}
+
+static RefPtr<CSSValue> consumeWebkitNamedImage(CSSParserTokenRange& args)
+{
+ if (args.peek().type() != IdentToken)
+ return nullptr;
+ auto imageName = args.consumeIncludingWhitespace().value().toString();
+ if (!args.atEnd())
+ return nullptr;
+ return CSSNamedImageValue::create(imageName);
+}
static RefPtr<CSSValue> consumeGeneratedImage(CSSParserTokenRange& range, CSSParserContext context)
{
@@ -1104,6 +1115,8 @@
result = consumeCrossFade(args, context, id == CSSValueWebkitCrossFade);
else if (id == CSSValueWebkitCanvas)
result = consumeWebkitCanvas(args);
+ else if (id == CSSValueWebkitNamedImage)
+ result = consumeWebkitNamedImage(args);
if (!result || !args.atEnd())
return nullptr;
@@ -1148,7 +1161,7 @@
|| id == CSSValueWebkitLinearGradient || id == CSSValueWebkitRadialGradient
|| id == CSSValueWebkitRepeatingLinearGradient || id == CSSValueWebkitRepeatingRadialGradient
|| id == CSSValueWebkitGradient || id == CSSValueWebkitCrossFade || id == CSSValueWebkitCanvas
- || id == CSSValuePaint;
+ || id == CSSValueCrossFade || id == CSSValueWebkitNamedImage;
}
RefPtr<CSSValue> consumeImage(CSSParserTokenRange& range, CSSParserContext context, ConsumeGeneratedImage generatedImage)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
