<!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>[209788] 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/209788">209788</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-13 19:24:42 -0800 (Tue, 13 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Make CSSFunctionValue derive from CSSValueList
https://bugs.webkit.org/show_bug.cgi?id=165832
Reviewed by Dean Jackson.
With the old parser gone, we can now shrink CSSFunctionValue a bit by
having it derive from CSSValueList instead of having an extra member
that holds a value list of arguments. This is similar to the trick
already employed by WebkitCSSTransformValue.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::specifiedValueForGridTrackSize):
* css/CSSFunctionValue.cpp:
(WebCore::CSSFunctionValue::customCSSText):
(WebCore::CSSFunctionValue::CSSFunctionValue): Deleted.
(WebCore::CSSFunctionValue::equals): Deleted.
(WebCore::CSSFunctionValue::append): Deleted.
* css/CSSFunctionValue.h:
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertScrollSnapPoints):
(WebCore::StyleBuilderConverter::createGridTrackSize):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::createFilterOperations):
* css/parser/CSSPropertyParser.cpp:
(WebCore::isGridTrackFixedSized):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFunctionValuecpp">trunk/Source/WebCore/css/CSSFunctionValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFunctionValueh">trunk/Source/WebCore/css/CSSFunctionValue.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/ChangeLog 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-12-13 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Make CSSFunctionValue derive from CSSValueList
+ https://bugs.webkit.org/show_bug.cgi?id=165832
+
+ Reviewed by Dean Jackson.
+
+ With the old parser gone, we can now shrink CSSFunctionValue a bit by
+ having it derive from CSSValueList instead of having an extra member
+ that holds a value list of arguments. This is similar to the trick
+ already employed by WebkitCSSTransformValue.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::specifiedValueForGridTrackSize):
+ * css/CSSFunctionValue.cpp:
+ (WebCore::CSSFunctionValue::customCSSText):
+ (WebCore::CSSFunctionValue::CSSFunctionValue): Deleted.
+ (WebCore::CSSFunctionValue::equals): Deleted.
+ (WebCore::CSSFunctionValue::append): Deleted.
+ * css/CSSFunctionValue.h:
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertScrollSnapPoints):
+ (WebCore::StyleBuilderConverter::createGridTrackSize):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::createFilterOperations):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::isGridTrackFixedSized):
+
</ins><span class="cx"> 2016-12-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Make Document a FrameDestructionObserver
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -1006,9 +1006,9 @@
</span><span class="cx"> case LengthTrackSizing:
</span><span class="cx"> return specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style);
</span><span class="cx"> case FitContentTrackSizing: {
</span><del>- auto fitContentTrackSize = CSSValueList::createCommaSeparated();
</del><ins>+ auto fitContentTrackSize = CSSFunctionValue::create(CSSValueFitContent);
</ins><span class="cx"> fitContentTrackSize->append(zoomAdjustedPixelValueForLength(trackSize.fitContentTrackBreadth().length(), style));
</span><del>- return CSSFunctionValue::create(CSSValueFitContent, WTFMove(fitContentTrackSize));
</del><ins>+ return WTFMove(fitContentTrackSize);
</ins><span class="cx"> }
</span><span class="cx"> default:
</span><span class="cx"> ASSERT(trackSize.type() == MinMaxTrackSizing);
</span><span class="lines">@@ -1015,10 +1015,10 @@
</span><span class="cx"> if (trackSize.minTrackBreadth().isAuto() && trackSize.maxTrackBreadth().isFlex())
</span><span class="cx"> return CSSValuePool::singleton().createValue(trackSize.maxTrackBreadth().flex(), CSSPrimitiveValue::CSS_FR);
</span><span class="cx">
</span><del>- auto minMaxTrackBreadths = CSSValueList::createCommaSeparated();
</del><ins>+ auto minMaxTrackBreadths = CSSFunctionValue::create(CSSValueMinmax);
</ins><span class="cx"> minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.minTrackBreadth(), style));
</span><span class="cx"> minMaxTrackBreadths->append(specifiedValueForGridTrackBreadth(trackSize.maxTrackBreadth(), style));
</span><del>- return CSSFunctionValue::create(CSSValueMinmax, WTFMove(minMaxTrackBreadths));
</del><ins>+ return WTFMove(minMaxTrackBreadths);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFunctionValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFunctionValue.cpp (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFunctionValue.cpp 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/css/CSSFunctionValue.cpp 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -26,47 +26,18 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx">
</span><del>-#include "CSSValueList.h"
</del><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
-CSSFunctionValue::CSSFunctionValue(CSSValueID name, Ref<CSSValueList>&& args)
- : CSSValue(FunctionClass)
- , m_name(name)
- , m_args(WTFMove(args))
-{
-}
-
-CSSFunctionValue::CSSFunctionValue(CSSValueID name)
- : CSSValue(FunctionClass)
- , m_name(name)
-{
-}
</del><span class="cx">
</span><span class="cx"> String CSSFunctionValue::customCSSText() const
</span><span class="cx"> {
</span><span class="cx"> StringBuilder result;
</span><del>- if (m_name != CSSValueInvalid) {
- result.append(getValueName(m_name));
- result.append('(');
- }
- if (m_args)
- result.append(m_args->cssText());
</del><ins>+ result.append(getValueName(m_name));
+ result.append('(');
+ result.append(CSSValueList::customCSSText());
</ins><span class="cx"> result.append(')');
</span><span class="cx"> return result.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSFunctionValue::equals(const CSSFunctionValue& other) const
-{
- return m_name == other.m_name && compareCSSValuePtr(m_args, other.m_args);
</del><span class="cx"> }
</span><del>-
-void CSSFunctionValue::append(Ref<CSSValue>&& value)
-{
- if (!m_args)
- m_args = CSSValueList::createCommaSeparated();
- m_args->append(WTFMove(value));
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssCSSFunctionValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFunctionValue.h (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFunctionValue.h 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/css/CSSFunctionValue.h 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -25,21 +25,13 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><del>-#include "CSSValue.h"
</del><span class="cx"> #include "CSSValueKeywords.h"
</span><ins>+#include "CSSValueList.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class CSSValueList;
-
-// FIXME-NEWPARSER: This can just *be* a CSSValueList subclass.
-class CSSFunctionValue final : public CSSValue {
</del><ins>+class CSSFunctionValue final : public CSSValueList {
</ins><span class="cx"> public:
</span><del>- static Ref<CSSFunctionValue> create(CSSValueID name, Ref<CSSValueList>&& args)
- {
- return adoptRef(*new CSSFunctionValue(name, WTFMove(args)));
- }
-
</del><span class="cx"> static Ref<CSSFunctionValue> create(CSSValueID name)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CSSFunctionValue(name));
</span><span class="lines">@@ -47,19 +39,18 @@
</span><span class="cx">
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><del>- bool equals(const CSSFunctionValue&) const;
-
</del><span class="cx"> CSSValueID name() const { return m_name; }
</span><del>- CSSValueList* arguments() const { return m_args.get(); }
</del><span class="cx">
</span><del>- void append(Ref<CSSValue>&&);
</del><ins>+ bool equals(const CSSFunctionValue& other) const { return m_name == other.m_name && CSSValueList::equals(other); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSFunctionValue(CSSValueID, Ref<CSSValueList>&&);
- CSSFunctionValue(CSSValueID);
</del><ins>+ CSSFunctionValue(CSSValueID name)
+ : CSSValueList(FunctionClass, CommaSeparator)
+ , m_name(name)
+ {
+ }
</ins><span class="cx">
</span><span class="cx"> CSSValueID m_name { CSSValueInvalid };
</span><del>- RefPtr<CSSValueList> m_args;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -818,7 +818,7 @@
</span><span class="cx"> for (auto& currentValue : downcast<CSSValueList>(value)) {
</span><span class="cx"> if (is<CSSFunctionValue>(currentValue.get())) {
</span><span class="cx"> auto& functionValue = downcast<CSSFunctionValue>(currentValue.get());
</span><del>- points->repeatOffset = parseSnapCoordinate(styleResolver, *functionValue.arguments()->item(0));
</del><ins>+ points->repeatOffset = parseSnapCoordinate(styleResolver, *functionValue.item(0));
</ins><span class="cx"> points->hasRepeat = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -914,14 +914,14 @@
</span><span class="cx"> return GridTrackSize(createGridTrackBreadth(downcast<CSSPrimitiveValue>(value), styleResolver));
</span><span class="cx">
</span><span class="cx"> ASSERT(is<CSSFunctionValue>(value));
</span><del>- CSSValueList& arguments = *downcast<CSSFunctionValue>(value).arguments();
</del><ins>+ const auto& function = downcast<CSSFunctionValue>(value);
</ins><span class="cx">
</span><del>- if (arguments.length() == 1)
- return GridTrackSize(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*arguments.itemWithoutBoundsCheck(0)), styleResolver), FitContentTrackSizing);
</del><ins>+ if (function.length() == 1)
+ return GridTrackSize(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(0)), styleResolver), FitContentTrackSizing);
</ins><span class="cx">
</span><del>- ASSERT_WITH_SECURITY_IMPLICATION(arguments.length() == 2);
- GridLength minTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*arguments.itemWithoutBoundsCheck(0)), styleResolver));
- GridLength maxTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*arguments.itemWithoutBoundsCheck(1)), styleResolver));
</del><ins>+ ASSERT_WITH_SECURITY_IMPLICATION(function.length() == 2);
+ GridLength minTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(0)), styleResolver));
+ GridLength maxTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(1)), styleResolver));
</ins><span class="cx"> return GridTrackSize(minTrackBreadth, maxTrackBreadth);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -1924,15 +1924,14 @@
</span><span class="cx">
</span><span class="cx"> auto& filterValue = downcast<CSSFunctionValue>(currentValue.get());
</span><span class="cx"> FilterOperation::OperationType operationType = filterOperationForType(filterValue.name());
</span><del>- auto args = filterValue.arguments();
</del><span class="cx">
</span><span class="cx"> // Check that all parameters are primitive values, with the
</span><span class="cx"> // exception of drop shadow which has a CSSShadowValue parameter.
</span><span class="cx"> const CSSPrimitiveValue* firstValue = nullptr;
</span><del>- if (args && operationType != FilterOperation::DROP_SHADOW) {
</del><ins>+ if (operationType != FilterOperation::DROP_SHADOW) {
</ins><span class="cx"> bool haveNonPrimitiveValue = false;
</span><del>- for (unsigned j = 0; j < args->length(); ++j) {
- if (!is<CSSPrimitiveValue>(*args->itemWithoutBoundsCheck(j))) {
</del><ins>+ for (unsigned j = 0; j < filterValue.length(); ++j) {
+ if (!is<CSSPrimitiveValue>(*filterValue.itemWithoutBoundsCheck(j))) {
</ins><span class="cx"> haveNonPrimitiveValue = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1939,8 +1938,8 @@
</span><span class="cx"> }
</span><span class="cx"> if (haveNonPrimitiveValue)
</span><span class="cx"> continue;
</span><del>- if (args->length())
- firstValue = downcast<CSSPrimitiveValue>(args->itemWithoutBoundsCheck(0));
</del><ins>+ if (filterValue.length())
+ firstValue = downcast<CSSPrimitiveValue>(filterValue.itemWithoutBoundsCheck(0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (operationType) {
</span><span class="lines">@@ -1948,7 +1947,7 @@
</span><span class="cx"> case FilterOperation::SEPIA:
</span><span class="cx"> case FilterOperation::SATURATE: {
</span><span class="cx"> double amount = 1;
</span><del>- if (args && args->length() == 1) {
</del><ins>+ if (filterValue.length() == 1) {
</ins><span class="cx"> amount = firstValue->doubleValue();
</span><span class="cx"> if (firstValue->isPercentage())
</span><span class="cx"> amount /= 100;
</span><span class="lines">@@ -1959,7 +1958,7 @@
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::HUE_ROTATE: {
</span><span class="cx"> double angle = 0;
</span><del>- if (args && args->length() == 1)
</del><ins>+ if (filterValue.length() == 1)
</ins><span class="cx"> angle = firstValue->computeDegrees();
</span><span class="cx">
</span><span class="cx"> operations.operations().append(BasicColorMatrixFilterOperation::create(angle, operationType));
</span><span class="lines">@@ -1970,7 +1969,7 @@
</span><span class="cx"> case FilterOperation::CONTRAST:
</span><span class="cx"> case FilterOperation::OPACITY: {
</span><span class="cx"> double amount = (operationType == FilterOperation::BRIGHTNESS) ? 0 : 1;
</span><del>- if (args && args->length() == 1) {
</del><ins>+ if (filterValue.length() == 1) {
</ins><span class="cx"> amount = firstValue->doubleValue();
</span><span class="cx"> if (firstValue->isPercentage())
</span><span class="cx"> amount /= 100;
</span><span class="lines">@@ -1981,7 +1980,7 @@
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::BLUR: {
</span><span class="cx"> Length stdDeviation = Length(0, Fixed);
</span><del>- if (args && args->length() >= 1)
</del><ins>+ if (filterValue.length() >= 1)
</ins><span class="cx"> stdDeviation = convertToFloatLength(firstValue, state.cssToLengthConversionData());
</span><span class="cx"> if (stdDeviation.isUndefined())
</span><span class="cx"> return false;
</span><span class="lines">@@ -1990,14 +1989,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case FilterOperation::DROP_SHADOW: {
</span><del>- if (args && args->length() != 1)
</del><ins>+ if (filterValue.length() != 1)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- auto& cssValue = *args->itemWithoutBoundsCheck(0);
</del><ins>+ const auto* cssValue = filterValue.itemWithoutBoundsCheck(0);
</ins><span class="cx"> if (!is<CSSShadowValue>(cssValue))
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- auto& item = downcast<CSSShadowValue>(cssValue);
</del><ins>+ const auto& item = downcast<CSSShadowValue>(*cssValue);
</ins><span class="cx"> int x = item.x->computeLength<int>(state.cssToLengthConversionData());
</span><span class="cx"> int y = item.y->computeLength<int>(state.cssToLengthConversionData());
</span><span class="cx"> IntPoint location(x, y);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209787 => 209788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-14 02:39:57 UTC (rev 209787)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-14 03:24:42 UTC (rev 209788)
</span><span class="lines">@@ -3096,11 +3096,11 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(value.isFunctionValue());
</span><span class="cx"> auto& function = downcast<CSSFunctionValue>(value);
</span><del>- if (function.name() == CSSValueFitContent || function.arguments() == nullptr || function.arguments()->length() < 2)
</del><ins>+ if (function.name() == CSSValueFitContent || function.length() < 2)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- CSSValue* minPrimitiveValue = downcast<CSSPrimitiveValue>(function.arguments()->item(0));
- CSSValue* maxPrimitiveValue = downcast<CSSPrimitiveValue>(function.arguments()->item(1));
</del><ins>+ const CSSValue* minPrimitiveValue = downcast<CSSPrimitiveValue>(function.item(0));
+ const CSSValue* maxPrimitiveValue = downcast<CSSPrimitiveValue>(function.item(1));
</ins><span class="cx"> return isGridTrackFixedSized(*minPrimitiveValue) || isGridTrackFixedSized(*maxPrimitiveValue);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>