<!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>[209006] trunk/Source/WebCore</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/209006">209006</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-28 12:28:15 -0800 (Mon, 28 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Filters and Reflections Fixes
https://bugs.webkit.org/show_bug.cgi?id=165103
Reviewed by Zalan Bujtas.
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeReflect):
Support the "none" keyword for box-reflect.
* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::isValidPrimitiveFilterFunction):
(WebCore::CSSPropertyParserHelpers::consumeFilterFunction):
Don't rely on range checking, since invert isn't grouped with the other
function values. Actually check every keyword.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserHelperscpp">trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209005 => 209006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-28 20:27:39 UTC (rev 209005)
+++ trunk/Source/WebCore/ChangeLog 2016-11-28 20:28:15 UTC (rev 209006)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-28 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Filters and Reflections Fixes
+ https://bugs.webkit.org/show_bug.cgi?id=165103
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeReflect):
+ Support the "none" keyword for box-reflect.
+
+ * css/parser/CSSPropertyParserHelpers.cpp:
+ (WebCore::CSSPropertyParserHelpers::isValidPrimitiveFilterFunction):
+ (WebCore::CSSPropertyParserHelpers::consumeFilterFunction):
+ Don't rely on range checking, since invert isn't grouped with the other
+ function values. Actually check every keyword.
+
</ins><span class="cx"> 2016-11-28 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> ImageData does not match specification
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209005 => 209006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-28 20:27:39 UTC (rev 209005)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-28 20:28:15 UTC (rev 209006)
</span><span class="lines">@@ -2620,6 +2620,9 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<CSSValue> consumeReflect(CSSParserTokenRange& range, const CSSParserContext& context)
</span><span class="cx"> {
</span><ins>+ if (range.peek().id() == CSSValueNone)
+ return consumeIdent(range);
+
</ins><span class="cx"> RefPtr<CSSPrimitiveValue> direction = consumeIdent<CSSValueAbove, CSSValueBelow, CSSValueLeft, CSSValueRight>(range);
</span><span class="cx"> if (!direction)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (209005 => 209006)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-11-28 20:27:39 UTC (rev 209005)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-11-28 20:28:15 UTC (rev 209006)
</span><span class="lines">@@ -1182,14 +1182,33 @@
</span><span class="cx"> || id == CSSValueWebkitGradient || id == CSSValueWebkitCrossFade || id == CSSValueWebkitCanvas
</span><span class="cx"> || id == CSSValueCrossFade || id == CSSValueWebkitNamedImage || id == CSSValueWebkitFilter || id == CSSValueFilter;
</span><span class="cx"> }
</span><ins>+
+static bool isValidPrimitiveFilterFunction(CSSValueID filterFunction)
+{
+ switch (filterFunction) {
+ case CSSValueBlur:
+ case CSSValueBrightness:
+ case CSSValueContrast:
+ case CSSValueDropShadow:
+ case CSSValueGrayscale:
+ case CSSValueHueRotate:
+ case CSSValueInvert:
+ case CSSValueOpacity:
+ case CSSValueSaturate:
+ case CSSValueSepia:
+ return true;
+ default:
+ return false;
+ }
+}
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSFunctionValue> consumeFilterFunction(CSSParserTokenRange& range, const CSSParserContext& context)
</span><span class="cx"> {
</span><span class="cx"> CSSValueID filterType = range.peek().functionId();
</span><del>- if (filterType < CSSValueInvert || filterType > CSSValueDropShadow)
</del><ins>+ if (!isValidPrimitiveFilterFunction(filterType))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> CSSParserTokenRange args = consumeFunction(range);
</span><del>- auto filterValue = CSSFunctionValue::create(filterType);
</del><ins>+ RefPtr<CSSFunctionValue> filterValue = CSSFunctionValue::create(filterType);
</ins><span class="cx"> RefPtr<CSSValue> parsedValue;
</span><span class="cx">
</span><span class="cx"> if (filterType == CSSValueDropShadow)
</span><span class="lines">@@ -1196,7 +1215,7 @@
</span><span class="cx"> parsedValue = consumeSingleShadow(args, context.mode, false, false);
</span><span class="cx"> else {
</span><span class="cx"> if (args.atEnd())
</span><del>- return filterValue.ptr();
</del><ins>+ return filterValue;
</ins><span class="cx"> if (filterType == CSSValueBrightness) {
</span><span class="cx"> parsedValue = consumePercent(args, ValueRangeAll);
</span><span class="cx"> if (!parsedValue)
</span><span class="lines">@@ -1219,8 +1238,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (!parsedValue || !args.atEnd())
</span><span class="cx"> return nullptr;
</span><del>- filterValue->append(*parsedValue);
- return filterValue.ptr();
</del><ins>+ filterValue->append(parsedValue.releaseNonNull());
+ return filterValue;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValue> consumeFilter(CSSParserTokenRange& range, const CSSParserContext& context)
</span></span></pre>
</div>
</div>
</body>
</html>