<!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>[178108] 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/178108">178108</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-07 23:55:44 -0800 (Wed, 07 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move -webkit-tap-highlight-color / -webkit-overflow-scrolling / -webkit-touch-callout to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=140219

Reviewed by Darin Adler.

Move -webkit-tap-highlight-color / -webkit-overflow-scrolling /
-webkit-touch-callout to the new StyleBuilder.

* css/CSSGradientValue.cpp:
(WebCore::CSSGradientValue::gradientWithStylesResolved):
* css/CSSPropertyNames.in:
* css/SVGCSSStyleSelector.cpp:
(WebCore::StyleResolver::applySVGProperty):
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertTouchCallout):
(WebCore::StyleBuilderConverter::convertTapHighlightColor):
(WebCore::StyleBuilderConverter::convertOverflowScrolling):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
(WebCore::StyleResolver::colorFromPrimitiveValueIsDerivedFromElement):
(WebCore::StyleResolver::colorFromPrimitiveValue):
(WebCore::StyleResolver::createFilterOperations):
* css/StyleResolver.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSGradientValuecpp">trunk/Source/WebCore/css/CSSGradientValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssSVGCSSStyleSelectorcpp">trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp</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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/ChangeLog        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-01-07  Chris Dumez  &lt;cdumez@apple.com&gt;
+
+        Move -webkit-tap-highlight-color / -webkit-overflow-scrolling / -webkit-touch-callout to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=140219
+
+        Reviewed by Darin Adler.
+
+        Move -webkit-tap-highlight-color / -webkit-overflow-scrolling /
+        -webkit-touch-callout to the new StyleBuilder.
+
+        * css/CSSGradientValue.cpp:
+        (WebCore::CSSGradientValue::gradientWithStylesResolved):
+        * css/CSSPropertyNames.in:
+        * css/SVGCSSStyleSelector.cpp:
+        (WebCore::StyleResolver::applySVGProperty):
+        * css/StyleBuilderConverter.h:
+        (WebCore::StyleBuilderConverter::convertTouchCallout):
+        (WebCore::StyleBuilderConverter::convertTapHighlightColor):
+        (WebCore::StyleBuilderConverter::convertOverflowScrolling):
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::applyProperty):
+        (WebCore::StyleResolver::colorFromPrimitiveValueIsDerivedFromElement):
+        (WebCore::StyleResolver::colorFromPrimitiveValue):
+        (WebCore::StyleResolver::createFilterOperations):
+        * css/StyleResolver.h:
+
</ins><span class="cx"> 2015-01-07  Brian J. Burg  &lt;burg@cs.washington.edu&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Editing Inline Styles Not Working
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSGradientValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSGradientValue.cpp (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSGradientValue.cpp        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/CSSGradientValue.cpp        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> {
</span><span class="cx">     bool derived = false;
</span><span class="cx">     for (auto&amp; stop : m_stops) {
</span><del>-        if (!stop.isMidpoint &amp;&amp; styleResolver-&gt;colorFromPrimitiveValueIsDerivedFromElement(stop.m_color.get())) {
</del><ins>+        if (!stop.isMidpoint &amp;&amp; styleResolver-&gt;colorFromPrimitiveValueIsDerivedFromElement(*stop.m_color)) {
</ins><span class="cx">             stop.m_colorIsDerivedFromElement = true;
</span><span class="cx">             derived = true;
</span><span class="cx">             break;
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> 
</span><span class="cx">     for (auto&amp; stop : result-&gt;m_stops) {
</span><span class="cx">         if (!stop.isMidpoint)
</span><del>-            stop.m_resolvedColor = styleResolver-&gt;colorFromPrimitiveValue(stop.m_color.get());
</del><ins>+            stop.m_resolvedColor = styleResolver-&gt;colorFromPrimitiveValue(*stop.m_color);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return result.release();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -579,14 +579,14 @@
</span><span class="cx"> user-zoom [LegacyStyleBuilder]
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_TOUCH_EVENTS) &amp;&amp; ENABLE_TOUCH_EVENTS
</span><del>--webkit-tap-highlight-color [Inherited, LegacyStyleBuilder]
</del><ins>+-webkit-tap-highlight-color [Inherited, Converter=TapHighlightColor]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_DASHBOARD_SUPPORT) &amp;&amp; ENABLE_DASHBOARD_SUPPORT
</span><span class="cx"> -webkit-dashboard-region [NameForMethods=DashboardRegions, Custom=Value]
</span><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) &amp;&amp; ENABLE_ACCELERATED_OVERFLOW_SCROLLING
</span><del>--webkit-overflow-scrolling [Inherited, LegacyStyleBuilder]
</del><ins>+-webkit-overflow-scrolling [Inherited, NameForMethods=UseTouchOverflowScrolling, Converter=OverflowScrolling]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(WTF_PLATFORM_IOS) &amp;&amp; WTF_PLATFORM_IOS
</span><del>--webkit-touch-callout [Inherited, LegacyStyleBuilder]
</del><ins>+-webkit-touch-callout [Inherited, NameForMethods=TouchCalloutEnabled, Converter=TouchCallout]
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssSVGCSSStyleSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx">             int blur = item.blur ? item.blur-&gt;computeLength&lt;int&gt;(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f)) : 0;
</span><span class="cx">             Color color;
</span><span class="cx">             if (item.color)
</span><del>-                color = colorFromPrimitiveValue(item.color.get());
</del><ins>+                color = colorFromPrimitiveValue(*item.color);
</ins><span class="cx"> 
</span><span class="cx">             // -webkit-svg-shadow does should not have a spread or style
</span><span class="cx">             ASSERT(!item.spread);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -101,6 +101,15 @@
</span><span class="cx">     static bool convertMarqueeIncrement(StyleResolver&amp;, CSSValue&amp;, Length&amp;);
</span><span class="cx">     static bool convertFilterOperations(StyleResolver&amp;, CSSValue&amp;, FilterOperations&amp;);
</span><span class="cx">     static bool convertMaskImageOperations(StyleResolver&amp;, CSSValue&amp;, Vector&lt;RefPtr&lt;MaskImageOperation&gt;&gt;&amp;);
</span><ins>+#if PLATFORM(IOS)
+    static bool convertTouchCallout(StyleResolver&amp;, CSSValue&amp;);
+#endif
+#if ENABLE(TOUCH_EVENTS)
+    static Color convertTapHighlightColor(StyleResolver&amp;, CSSValue&amp;);
+#endif
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
+    static bool convertOverflowScrolling(StyleResolver&amp;, CSSValue&amp;);
+#endif
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     friend class StyleBuilderCustom;
</span><span class="lines">@@ -1046,6 +1055,27 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+#if PLATFORM(IOS)
+inline bool StyleBuilderConverter::convertTouchCallout(StyleResolver&amp;, CSSValue&amp; value)
+{
+    return !equalIgnoringCase(downcast&lt;CSSPrimitiveValue&gt;(value).getStringValue(), &quot;none&quot;);
+}
+#endif
+
+#if ENABLE(TOUCH_EVENTS)
+inline Color StyleBuilderConverter::convertTapHighlightColor(StyleResolver&amp; styleResolver, CSSValue&amp; value)
+{
+    return styleResolver.colorFromPrimitiveValue(downcast&lt;CSSPrimitiveValue&gt;(value));
+}
+#endif
+
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
+inline bool StyleBuilderConverter::convertOverflowScrolling(StyleResolver&amp;, CSSValue&amp; value)
+{
+    return downcast&lt;CSSPrimitiveValue&gt;(value).getValueID() == CSSValueTouch;
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -794,7 +794,7 @@
</span><span class="cx">         ShadowStyle shadowStyle = shadowValue.style &amp;&amp; shadowValue.style-&gt;getValueID() == CSSValueInset ? Inset : Normal;
</span><span class="cx">         Color color;
</span><span class="cx">         if (shadowValue.color)
</span><del>-            color = styleResolver.colorFromPrimitiveValue(shadowValue.color.get());
</del><ins>+            color = styleResolver.colorFromPrimitiveValue(*shadowValue.color);
</ins><span class="cx">         else
</span><span class="cx">             color = styleResolver.style()-&gt;color();
</span><span class="cx">         auto shadowData = std::make_unique&lt;ShadowData&gt;(IntPoint(x, y), blur, spread, shadowStyle, id == CSSPropertyWebkitBoxShadow, color.isValid() ? color : Color::transparent);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/StyleResolver.cpp        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -2031,36 +2031,6 @@
</span><span class="cx">         return;
</span><span class="cx">     case CSSPropertyUnicodeRange: // Only used in @font-face rules.
</span><span class="cx">         return;
</span><del>-#if PLATFORM(IOS)
-    case CSSPropertyWebkitTouchCallout: {
-        HANDLE_INHERIT_AND_INITIAL(touchCalloutEnabled, TouchCalloutEnabled);
-        if (!primitiveValue)
-            break;
-
-        state.style()-&gt;setTouchCalloutEnabled(primitiveValue-&gt;getStringValue().lower() != &quot;none&quot;);
-        return;
-    }
-#endif
-#if ENABLE(TOUCH_EVENTS)
-    case CSSPropertyWebkitTapHighlightColor: {
-        HANDLE_INHERIT_AND_INITIAL(tapHighlightColor, TapHighlightColor);
-        if (!primitiveValue)
-            break;
-
-        Color col = colorFromPrimitiveValue(primitiveValue);
-        state.style()-&gt;setTapHighlightColor(col);
-        return;
-    }
-#endif
-#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
-    case CSSPropertyWebkitOverflowScrolling: {
-        HANDLE_INHERIT_AND_INITIAL(useTouchOverflowScrolling, UseTouchOverflowScrolling);
-        if (!primitiveValue)
-            break;
-        state.style()-&gt;setUseTouchOverflowScrolling(primitiveValue-&gt;getValueID() == CSSValueTouch);
-        return;
-    }
-#endif
</del><span class="cx">     case CSSPropertyInvalid:
</span><span class="cx">         return;
</span><span class="cx">     case CSSPropertyFontStretch:
</span><span class="lines">@@ -2295,6 +2265,15 @@
</span><span class="cx"> #if ENABLE(CURSOR_VISIBILITY)
</span><span class="cx">     case CSSPropertyWebkitCursorVisibility:
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(IOS)
+    case CSSPropertyWebkitTouchCallout:
+#endif
+#if ENABLE(TOUCH_EVENTS)
+    case CSSPropertyWebkitTapHighlightColor:
+#endif
+#if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
+    case CSSPropertyWebkitOverflowScrolling:
+#endif
</ins><span class="cx">     case CSSPropertyAlignContent:
</span><span class="cx">     case CSSPropertyAlignItems:
</span><span class="cx">     case CSSPropertyAlignSelf:
</span><span class="lines">@@ -2617,9 +2596,9 @@
</span><span class="cx">     return RenderTheme::defaultTheme()-&gt;systemColor(cssValueId);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool StyleResolver::colorFromPrimitiveValueIsDerivedFromElement(CSSPrimitiveValue* value)
</del><ins>+bool StyleResolver::colorFromPrimitiveValueIsDerivedFromElement(CSSPrimitiveValue&amp; value)
</ins><span class="cx"> {
</span><del>-    int ident = value-&gt;getValueID();
</del><ins>+    int ident = value.getValueID();
</ins><span class="cx">     switch (ident) {
</span><span class="cx">     case CSSValueWebkitText:
</span><span class="cx">     case CSSValueWebkitLink:
</span><span class="lines">@@ -2631,13 +2610,13 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-Color StyleResolver::colorFromPrimitiveValue(CSSPrimitiveValue* value, bool forVisitedLink) const
</del><ins>+Color StyleResolver::colorFromPrimitiveValue(CSSPrimitiveValue&amp; value, bool forVisitedLink) const
</ins><span class="cx"> {
</span><del>-    if (value-&gt;isRGBColor())
-        return Color(value-&gt;getRGBA32Value());
</del><ins>+    if (value.isRGBColor())
+        return Color(value.getRGBA32Value());
</ins><span class="cx"> 
</span><span class="cx">     const State&amp; state = m_state;
</span><del>-    CSSValueID ident = value-&gt;getValueID();
</del><ins>+    CSSValueID ident = value.getValueID();
</ins><span class="cx">     switch (ident) {
</span><span class="cx">     case 0:
</span><span class="cx">         return Color();
</span><span class="lines">@@ -2856,7 +2835,7 @@
</span><span class="cx">             int blur = item.blur ? item.blur-&gt;computeLength&lt;int&gt;(state.cssToLengthConversionData()) : 0;
</span><span class="cx">             Color color;
</span><span class="cx">             if (item.color)
</span><del>-                color = colorFromPrimitiveValue(item.color.get());
</del><ins>+                color = colorFromPrimitiveValue(*item.color);
</ins><span class="cx"> 
</span><span class="cx">             operations.operations().append(DropShadowFilterOperation::create(location, blur, color.isValid() ? color : Color::transparent));
</span><span class="cx">             break;
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/StyleResolver.h        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -209,8 +209,8 @@
</span><span class="cx">     bool useSVGZoomRules();
</span><span class="cx">     bool useSVGZoomRulesForLength();
</span><span class="cx"> 
</span><del>-    static bool colorFromPrimitiveValueIsDerivedFromElement(CSSPrimitiveValue*);
-    Color colorFromPrimitiveValue(CSSPrimitiveValue*, bool forVisitedLink = false) const;
</del><ins>+    static bool colorFromPrimitiveValueIsDerivedFromElement(CSSPrimitiveValue&amp;);
+    Color colorFromPrimitiveValue(CSSPrimitiveValue&amp;, bool forVisitedLink = false) const;
</ins><span class="cx"> 
</span><span class="cx">     bool hasSelectorForId(const AtomicString&amp;) const;
</span><span class="cx">     bool hasSelectorForClass(const AtomicString&amp;) const;
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (178107 => 178108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl        2015-01-08 07:33:19 UTC (rev 178107)
+++ trunk/Source/WebCore/css/makeprop.pl        2015-01-08 07:55:44 UTC (rev 178108)
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">   my $primitiveValue = shift;
</span><span class="cx">   my $forVisitedLink = @_ ? shift : NOT_FOR_VISITED_LINK;
</span><span class="cx"> 
</span><del>-  return &quot;styleResolver.colorFromPrimitiveValue(&amp;&quot; . $primitiveValue . &quot;, /* forVisitedLink */ &quot; . ($forVisitedLink ? &quot;true&quot; : &quot;false&quot;) . &quot;)&quot;;
</del><ins>+  return &quot;styleResolver.colorFromPrimitiveValue(&quot; . $primitiveValue . &quot;, /* forVisitedLink */ &quot; . ($forVisitedLink ? &quot;true&quot; : &quot;false&quot;) . &quot;)&quot;;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> use constant {
</span></span></pre>
</div>
</div>

</body>
</html>