<!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>[197072] releases/WebKitGTK/webkit-2.12/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/197072">197072</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-25 01:43:54 -0800 (Thu, 25 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196851">r196851</a> - Use more concrete types for parsing positions
https://bugs.webkit.org/show_bug.cgi?id=154481
Reviewed by Dean Jackson.
Use CSSPrimitiveValues for position-parsing functions where possible, to avoid
the need to downcast<> the values returned by the parsing functions.
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
(WebCore::CSSParser::parsePositionX):
(WebCore::CSSParser::parsePositionY):
(WebCore::CSSParser::parse4ValuesFillPosition):
(WebCore::CSSParser::parse3ValuesFillPosition):
(WebCore::CSSParser::parseFillPosition):
(WebCore::CSSParser::parse2ValuesFillPosition):
(WebCore::CSSParser::parseFillProperty):
(WebCore::CSSParser::parseTransformOriginShorthand):
(WebCore::CSSParser::parseBasicShapeCircle):
(WebCore::CSSParser::parseBasicShapeEllipse):
(WebCore::CSSParser::parseDeprecatedRadialGradient):
(WebCore::CSSParser::parseRadialGradient):
(WebCore::CSSParser::parseTransformOrigin):
(WebCore::CSSParser::parsePerspectiveOrigin):
* css/CSSParser.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorecssCSSParsercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorecssCSSParserh">releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (197071 => 197072)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-25 09:40:22 UTC (rev 197071)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-02-25 09:43:54 UTC (rev 197072)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-02-19 Simon Fraser <simon.fraser@apple.com>
+
+ Use more concrete types for parsing positions
+ https://bugs.webkit.org/show_bug.cgi?id=154481
+
+ Reviewed by Dean Jackson.
+
+ Use CSSPrimitiveValues for position-parsing functions where possible, to avoid
+ the need to downcast<> the values returned by the parsing functions.
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parsePositionX):
+ (WebCore::CSSParser::parsePositionY):
+ (WebCore::CSSParser::parse4ValuesFillPosition):
+ (WebCore::CSSParser::parse3ValuesFillPosition):
+ (WebCore::CSSParser::parseFillPosition):
+ (WebCore::CSSParser::parse2ValuesFillPosition):
+ (WebCore::CSSParser::parseFillProperty):
+ (WebCore::CSSParser::parseTransformOriginShorthand):
+ (WebCore::CSSParser::parseBasicShapeCircle):
+ (WebCore::CSSParser::parseBasicShapeEllipse):
+ (WebCore::CSSParser::parseDeprecatedRadialGradient):
+ (WebCore::CSSParser::parseRadialGradient):
+ (WebCore::CSSParser::parseTransformOrigin):
+ (WebCore::CSSParser::parsePerspectiveOrigin):
+ * css/CSSParser.h:
+
</ins><span class="cx"> 2016-02-18 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> JSObject::getPropertySlot - index-as-propertyname, override on prototype, & shadow
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.cpp (197071 => 197072)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.cpp 2016-02-25 09:40:22 UTC (rev 197071)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.cpp 2016-02-25 09:43:54 UTC (rev 197072)
</span><span class="lines">@@ -2697,8 +2697,8 @@
</span><span class="cx"> case CSSPropertyTransformOriginX:
</span><span class="cx"> case CSSPropertyTransformOriginY:
</span><span class="cx"> case CSSPropertyTransformOriginZ: {
</span><del>- RefPtr<CSSValue> val1;
- RefPtr<CSSValue> val2;
</del><ins>+ RefPtr<CSSPrimitiveValue> val1;
+ RefPtr<CSSPrimitiveValue> val2;
</ins><span class="cx"> RefPtr<CSSValue> val3;
</span><span class="cx"> CSSPropertyID propId1, propId2, propId3;
</span><span class="cx"> if (parseTransformOrigin(propId, propId1, propId2, propId3, val1, val2, val3)) {
</span><span class="lines">@@ -2729,8 +2729,8 @@
</span><span class="cx"> case CSSPropertyPerspectiveOrigin:
</span><span class="cx"> case CSSPropertyPerspectiveOriginX:
</span><span class="cx"> case CSSPropertyPerspectiveOriginY: {
</span><del>- RefPtr<CSSValue> val1;
- RefPtr<CSSValue> val2;
</del><ins>+ RefPtr<CSSPrimitiveValue> val1;
+ RefPtr<CSSPrimitiveValue> val2;
</ins><span class="cx"> CSSPropertyID propId1, propId2;
</span><span class="cx"> if (parsePerspectiveOrigin(propId, propId1, propId2, val1, val2)) {
</span><span class="cx"> addProperty(propId1, val1.release(), important);
</span><span class="lines">@@ -4384,7 +4384,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> CSSParser::parsePositionX(CSSParserValueList& valueList)
</del><ins>+RefPtr<CSSPrimitiveValue> CSSParser::parsePositionX(CSSParserValueList& valueList)
</ins><span class="cx"> {
</span><span class="cx"> int id = valueList.current()->id;
</span><span class="cx"> if (id == CSSValueLeft || id == CSSValueRight || id == CSSValueCenter) {
</span><span class="lines">@@ -4401,7 +4401,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<CSSValue> CSSParser::parsePositionY(CSSParserValueList& valueList)
</del><ins>+RefPtr<CSSPrimitiveValue> CSSParser::parsePositionY(CSSParserValueList& valueList)
</ins><span class="cx"> {
</span><span class="cx"> int id = valueList.current()->id;
</span><span class="cx"> if (id == CSSValueTop || id == CSSValueBottom || id == CSSValueCenter) {
</span><span class="lines">@@ -4481,7 +4481,7 @@
</span><span class="cx"> return value == CSSValueLeft || value == CSSValueTop || value == CSSValueBottom || value == CSSValueRight || value == CSSValueCenter;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParser::parse4ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2, RefPtr<CSSPrimitiveValue>&& parsedValue1, RefPtr<CSSPrimitiveValue>&& parsedValue2)
</del><ins>+void CSSParser::parse4ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2, RefPtr<CSSPrimitiveValue>&& parsedValue1, RefPtr<CSSPrimitiveValue>&& parsedValue2)
</ins><span class="cx"> {
</span><span class="cx"> // [ left | right ] [ <percentage] | <length> ] && [ top | bottom ] [ <percentage> | <length> ]
</span><span class="cx"> // In the case of 4 values <position> requires the second value to be a length or a percentage.
</span><span class="lines">@@ -4529,7 +4529,7 @@
</span><span class="cx">
</span><span class="cx"> valueList.next();
</span><span class="cx"> }
</span><del>-void CSSParser::parse3ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2, RefPtr<CSSPrimitiveValue>&& parsedValue1, RefPtr<CSSPrimitiveValue>&& parsedValue2)
</del><ins>+void CSSParser::parse3ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2, RefPtr<CSSPrimitiveValue>&& parsedValue1, RefPtr<CSSPrimitiveValue>&& parsedValue2)
</ins><span class="cx"> {
</span><span class="cx"> unsigned cumulativeFlags = 0;
</span><span class="cx"> FillPositionFlag value3Flag = InvalidFillPosition;
</span><span class="lines">@@ -4612,8 +4612,8 @@
</span><span class="cx"> value1.swap(value2);
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><del>- CSSPrimitiveValue& first = downcast<CSSPrimitiveValue>(*value1);
- CSSPrimitiveValue& second = downcast<CSSPrimitiveValue>(*value2);
</del><ins>+ CSSPrimitiveValue& first = *value1;
+ CSSPrimitiveValue& second = *value2;
</ins><span class="cx"> ident1 = first.getPairValue()->first()->getValueID();
</span><span class="cx"> ident2 = second.getPairValue()->first()->getValueID();
</span><span class="cx"> ASSERT(ident1 == CSSValueLeft || ident1 == CSSValueRight);
</span><span class="lines">@@ -4629,7 +4629,7 @@
</span><span class="cx"> return validateUnit(valueWithCalculation, FPercent | FLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParser::parseFillPosition(CSSParserValueList& valueList, RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2)
</del><ins>+void CSSParser::parseFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2)
</ins><span class="cx"> {
</span><span class="cx"> unsigned numberOfValues = 0;
</span><span class="cx"> for (unsigned i = valueList.currentIndex(); i < valueList.size(); ++i, ++numberOfValues) {
</span><span class="lines">@@ -4676,8 +4676,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<CSSPrimitiveValue> parsedValue1 = downcast<CSSPrimitiveValue>(value1.get());
- RefPtr<CSSPrimitiveValue> parsedValue2 = downcast<CSSPrimitiveValue>(value2.get());
</del><ins>+ RefPtr<CSSPrimitiveValue> parsedValue1 = value1;
+ RefPtr<CSSPrimitiveValue> parsedValue2 = value2;
</ins><span class="cx">
</span><span class="cx"> value1 = nullptr;
</span><span class="cx"> value2 = nullptr;
</span><span class="lines">@@ -4692,7 +4692,7 @@
</span><span class="cx"> parse4ValuesFillPosition(valueList, value1, value2, WTFMove(parsedValue1), WTFMove(parsedValue2));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CSSParser::parse2ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2)
</del><ins>+void CSSParser::parse2ValuesFillPosition(CSSParserValueList& valueList, RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2)
</ins><span class="cx"> {
</span><span class="cx"> CSSParserValue* value = valueList.current();
</span><span class="cx">
</span><span class="lines">@@ -4903,10 +4903,15 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyBackgroundPosition:
</span><del>- case CSSPropertyWebkitMaskPosition:
- parseFillPosition(*m_valueList, currValue, currValue2);
</del><ins>+ case CSSPropertyWebkitMaskPosition: {
+ RefPtr<CSSPrimitiveValue> value1;
+ RefPtr<CSSPrimitiveValue> value2;
+ parseFillPosition(*m_valueList, value1, value2);
+ currValue = value1;
+ currValue2 = value2;
</ins><span class="cx"> // parseFillPosition advances the m_valueList pointer.
</span><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> case CSSPropertyBackgroundPositionX:
</span><span class="cx"> case CSSPropertyWebkitMaskPositionX: {
</span><span class="cx"> currValue = parsePositionX(*m_valueList);
</span><span class="lines">@@ -5165,7 +5170,7 @@
</span><span class="cx"> return keys;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseTransformOriginShorthand(RefPtr<CSSValue>& value1, RefPtr<CSSValue>& value2, RefPtr<CSSValue>& value3)
</del><ins>+bool CSSParser::parseTransformOriginShorthand(RefPtr<CSSPrimitiveValue>& value1, RefPtr<CSSPrimitiveValue>& value2, RefPtr<CSSValue>& value3)
</ins><span class="cx"> {
</span><span class="cx"> parse2ValuesFillPosition(*m_valueList, value1, value2);
</span><span class="cx">
</span><span class="lines">@@ -6530,12 +6535,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (argument->id == CSSValueAt && args.next()) {
</span><del>- RefPtr<CSSValue> centerX;
- RefPtr<CSSValue> centerY;
</del><ins>+ RefPtr<CSSPrimitiveValue> centerX;
+ RefPtr<CSSPrimitiveValue> centerY;
</ins><span class="cx"> parseFillPosition(args, centerX, centerY);
</span><span class="cx"> if (centerX && centerY && !args.current()) {
</span><del>- shape->setCenterX(downcast<CSSPrimitiveValue>(centerX.get()));
- shape->setCenterY(downcast<CSSPrimitiveValue>(centerY.get()));
</del><ins>+ shape->setCenterX(centerX);
+ shape->setCenterY(centerY);
</ins><span class="cx"> } else
</span><span class="cx"> return nullptr;
</span><span class="cx"> } else
</span><span class="lines">@@ -6577,14 +6582,14 @@
</span><span class="cx"> if (argument->id != CSSValueAt || !args.next()) // expecting ellipse(.. at <position>)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<CSSValue> centerX;
- RefPtr<CSSValue> centerY;
</del><ins>+ RefPtr<CSSPrimitiveValue> centerX;
+ RefPtr<CSSPrimitiveValue> centerY;
</ins><span class="cx"> parseFillPosition(args, centerX, centerY);
</span><span class="cx"> if (!centerX || !centerY || args.current())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- shape->setCenterX(downcast<CSSPrimitiveValue>(centerX.get()));
- shape->setCenterY(downcast<CSSPrimitiveValue>(centerY.get()));
</del><ins>+ shape->setCenterX(centerX);
+ shape->setCenterY(centerY);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return shape;
</span><span class="lines">@@ -8965,8 +8970,8 @@
</span><span class="cx"> bool expectComma = false;
</span><span class="cx">
</span><span class="cx"> // Optional background-position
</span><del>- RefPtr<CSSValue> centerX;
- RefPtr<CSSValue> centerY;
</del><ins>+ RefPtr<CSSPrimitiveValue> centerX;
+ RefPtr<CSSPrimitiveValue> centerY;
</ins><span class="cx"> // parse2ValuesFillPosition advances the args next pointer.
</span><span class="cx"> parse2ValuesFillPosition(*args, centerX, centerY);
</span><span class="cx"> argument = args->current();
</span><span class="lines">@@ -8983,11 +8988,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result->setFirstX(downcast<CSSPrimitiveValue>(centerX.get()));
- result->setSecondX(downcast<CSSPrimitiveValue>(centerX.get()));
</del><ins>+ result->setFirstX(centerX);
+ result->setSecondX(centerX);
</ins><span class="cx"> // CSS3 radial gradients always share the same start and end point.
</span><del>- result->setFirstY(downcast<CSSPrimitiveValue>(centerY.get()));
- result->setSecondY(downcast<CSSPrimitiveValue>(centerY.get()));
</del><ins>+ result->setFirstY(centerY);
+ result->setSecondY(centerY);
</ins><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> shapeValue;
</span><span class="cx"> RefPtr<CSSPrimitiveValue> sizeValue;
</span><span class="lines">@@ -9236,8 +9241,8 @@
</span><span class="cx">
</span><span class="cx"> // Second part of grammar, the center-position clause:
</span><span class="cx"> // at <position>
</span><del>- RefPtr<CSSValue> centerX;
- RefPtr<CSSValue> centerY;
</del><ins>+ RefPtr<CSSPrimitiveValue> centerX;
+ RefPtr<CSSPrimitiveValue> centerY;
</ins><span class="cx"> if (argument->unit == CSSPrimitiveValue::CSS_IDENT && equalLettersIgnoringASCIICase(*argument, "at")) {
</span><span class="cx"> argument = args->next();
</span><span class="cx"> if (!argument)
</span><span class="lines">@@ -9251,11 +9256,11 @@
</span><span class="cx"> if (!argument)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- result->setFirstX(downcast<CSSPrimitiveValue>(centerX.get()));
- result->setFirstY(downcast<CSSPrimitiveValue>(centerY.get()));
</del><ins>+ result->setFirstX(centerX);
+ result->setFirstY(centerY);
</ins><span class="cx"> // Right now, CSS radial gradients have the same start and end centers.
</span><del>- result->setSecondX(downcast<CSSPrimitiveValue>(centerX.get()));
- result->setSecondY(downcast<CSSPrimitiveValue>(centerY.get()));
</del><ins>+ result->setSecondX(centerX);
+ result->setSecondY(centerY);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (shapeValue || sizeValue || horizontalSize || centerX || centerY)
</span><span class="lines">@@ -10199,7 +10204,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-bool CSSParser::parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSValue>& value, RefPtr<CSSValue>& value2, RefPtr<CSSValue>& value3)
</del><ins>+bool CSSParser::parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSPrimitiveValue>& value, RefPtr<CSSPrimitiveValue>& value2, RefPtr<CSSValue>& value3)
</ins><span class="cx"> {
</span><span class="cx"> propId1 = propId;
</span><span class="cx"> propId2 = propId;
</span><span class="lines">@@ -10244,7 +10249,7 @@
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSValue>& value, RefPtr<CSSValue>& value2)
</del><ins>+bool CSSParser::parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSPrimitiveValue>& value, RefPtr<CSSPrimitiveValue>& value2)
</ins><span class="cx"> {
</span><span class="cx"> propId1 = propId;
</span><span class="cx"> propId2 = propId;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.h (197071 => 197072)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.h 2016-02-25 09:40:22 UTC (rev 197071)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/css/CSSParser.h 2016-02-25 09:43:54 UTC (rev 197072)
</span><span class="lines">@@ -166,13 +166,13 @@
</span><span class="cx"> enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
</span><span class="cx"> enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKeyword = 1 };
</span><span class="cx"> RefPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSParserValueList&, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillPositionParsingMode = ResolveValuesAsPercent);
</span><del>- RefPtr<CSSValue> parsePositionX(CSSParserValueList&);
- RefPtr<CSSValue> parsePositionY(CSSParserValueList&);
- void parse2ValuesFillPosition(CSSParserValueList&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
</del><ins>+ RefPtr<CSSPrimitiveValue> parsePositionX(CSSParserValueList&);
+ RefPtr<CSSPrimitiveValue> parsePositionY(CSSParserValueList&);
+ void parse2ValuesFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&);
</ins><span class="cx"> bool isPotentialPositionValue(CSSParserValue&);
</span><del>- void parseFillPosition(CSSParserValueList&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
- void parse3ValuesFillPosition(CSSParserValueList&, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSPrimitiveValue>&&, RefPtr<CSSPrimitiveValue>&&);
- void parse4ValuesFillPosition(CSSParserValueList&, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSPrimitiveValue>&&, RefPtr<CSSPrimitiveValue>&&);
</del><ins>+ void parseFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&);
+ void parse3ValuesFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&&, RefPtr<CSSPrimitiveValue>&&);
+ void parse4ValuesFillPosition(CSSParserValueList&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&&, RefPtr<CSSPrimitiveValue>&&);
</ins><span class="cx">
</span><span class="cx"> void parseFillRepeat(RefPtr<CSSValue>&, RefPtr<CSSValue>&);
</span><span class="cx"> RefPtr<CSSValue> parseFillSize(CSSPropertyID, bool &allowComma);
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> static Vector<double> parseKeyframeSelector(const String&);
</span><span class="cx">
</span><del>- bool parseTransformOriginShorthand(RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
</del><ins>+ bool parseTransformOriginShorthand(RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSValue>&);
</ins><span class="cx"> bool parseCubicBezierTimingFunctionValue(CSSParserValueList& args, double& result);
</span><span class="cx"> bool parseAnimationProperty(CSSPropertyID, RefPtr<CSSValue>&, AnimationParseContext&);
</span><span class="cx"> bool parseTransitionShorthand(CSSPropertyID, bool important);
</span><span class="lines">@@ -324,8 +324,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList> parseTransform();
</span><span class="cx"> RefPtr<CSSValue> parseTransformValue(CSSParserValue&);
</span><del>- bool parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSValue>&, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
- bool parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSValue>&, RefPtr<CSSValue>&);
</del><ins>+ bool parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSValue>&);
+ bool parsePerspectiveOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, RefPtr<CSSPrimitiveValue>&, RefPtr<CSSPrimitiveValue>&);
</ins><span class="cx">
</span><span class="cx"> bool parseTextEmphasisStyle(bool important);
</span><span class="cx"> bool parseTextEmphasisPosition(bool important);
</span></span></pre>
</div>
</div>
</body>
</html>