<!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>[178951] 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/178951">178951</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 14:21:08 -0800 (Thu, 22 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Have Counter::create() return a Ref&lt;Counter&gt;
https://bugs.webkit.org/show_bug.cgi?id=140777

Reviewed by Andreas Kling.

Have Counter::create() return a Ref&lt;Counter&gt; instead of a PassRefPtr.

The CSSPrimitiveValue class needed some updates as well to support
constructing a CSSPrimitiveValue object from a Ref&lt;&gt;.

* css/CSSPrimitiveValue.cpp:
(WebCore::CSSPrimitiveValue::init):
* css/CSSPrimitiveValue.h:
(WebCore::CSSPrimitiveValue::create):
(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
* css/Counter.h:
(WebCore::Counter::create):
(WebCore::Counter::cloneForCSSOM):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValuecpp">trunk/Source/WebCore/css/CSSPrimitiveValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueh">trunk/Source/WebCore/css/CSSPrimitiveValue.h</a></li>
<li><a href="#trunkSourceWebCorecssCounterh">trunk/Source/WebCore/css/Counter.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178950 => 178951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-01-22 22:20:57 UTC (rev 178950)
+++ trunk/Source/WebCore/ChangeLog        2015-01-22 22:21:08 UTC (rev 178951)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-01-22  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Have Counter::create() return a Ref&lt;Counter&gt;
+        https://bugs.webkit.org/show_bug.cgi?id=140777
+
+        Reviewed by Andreas Kling.
+
+        Have Counter::create() return a Ref&lt;Counter&gt; instead of a PassRefPtr.
+
+        The CSSPrimitiveValue class needed some updates as well to support
+        constructing a CSSPrimitiveValue object from a Ref&lt;&gt;.
+
+        * css/CSSPrimitiveValue.cpp:
+        (WebCore::CSSPrimitiveValue::init):
+        * css/CSSPrimitiveValue.h:
+        (WebCore::CSSPrimitiveValue::create):
+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+        * css/Counter.h:
+        (WebCore::Counter::create):
+        (WebCore::Counter::cloneForCSSOM):
+
+2015-01-22  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Drop the legacy FeatureCounter class
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=140749
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (178950 => 178951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.cpp        2015-01-22 22:20:57 UTC (rev 178950)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.cpp        2015-01-22 22:21:08 UTC (rev 178951)
</span><span class="lines">@@ -376,11 +376,11 @@
</span><span class="cx">     m_value.pair = Pair::create(create(lengthSize.width(), style), create(lengthSize.height(), style)).leakRef();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void CSSPrimitiveValue::init(PassRefPtr&lt;Counter&gt; c)
</del><ins>+void CSSPrimitiveValue::init(Ref&lt;Counter&gt;&amp;&amp; counter)
</ins><span class="cx"> {
</span><span class="cx">     m_primitiveUnitType = CSS_COUNTER;
</span><span class="cx">     m_hasCachedCSSText = false;
</span><del>-    m_value.counter = c.leakRef();
</del><ins>+    m_value.counter = &amp;counter.leakRef();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CSSPrimitiveValue::init(PassRefPtr&lt;Rect&gt; r)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValue.h (178950 => 178951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValue.h        2015-01-22 22:20:57 UTC (rev 178950)
+++ trunk/Source/WebCore/css/CSSPrimitiveValue.h        2015-01-22 22:21:08 UTC (rev 178951)
</span><span class="lines">@@ -232,11 +232,16 @@
</span><span class="cx">     static Ref&lt;CSSPrimitiveValue&gt; create(const Length&amp; value, const RenderStyle* style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
</span><span class="cx">     static Ref&lt;CSSPrimitiveValue&gt; create(const LengthSize&amp; value, const RenderStyle* style) { return adoptRef(*new CSSPrimitiveValue(value, style)); }
</span><span class="cx"> 
</span><del>-    template&lt;typename T&gt; static Ref&lt;CSSPrimitiveValue&gt; create(T value)
</del><ins>+    template&lt;typename T&gt; static Ref&lt;CSSPrimitiveValue&gt; create(const T&amp; value)
</ins><span class="cx">     {
</span><span class="cx">         return adoptRef(*new CSSPrimitiveValue(value));
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    template&lt;typename T&gt; static Ref&lt;CSSPrimitiveValue&gt; create(T&amp;&amp; value)
+    {
+        return adoptRef(*new CSSPrimitiveValue(WTF::move(value)));
+    }
+
</ins><span class="cx">     // This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE.
</span><span class="cx">     // The basic idea is that a stylesheet can use the value __qem (for quirky em) instead of em.
</span><span class="cx">     // When the quirky value is used, if you're in quirks mode, the margin will collapse away
</span><span class="lines">@@ -376,19 +381,25 @@
</span><span class="cx">         init(PassRefPtr&lt;T&gt;(val));
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    template&lt;typename T&gt; CSSPrimitiveValue(PassRefPtr&lt;T&gt; val)
</del><ins>+    template&lt;typename T&gt; CSSPrimitiveValue(PassRefPtr&lt;T&gt; value)
</ins><span class="cx">         : CSSValue(PrimitiveClass)
</span><span class="cx">     {
</span><del>-        init(val);
</del><ins>+        init(value);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    template&lt;typename T&gt; CSSPrimitiveValue(Ref&lt;T&gt;&amp;&amp; value)
+        : CSSValue(PrimitiveClass)
+    {
+        init(WTF::move(value));
+    }
+
</ins><span class="cx">     static void create(int); // compile-time guard
</span><span class="cx">     static void create(unsigned); // compile-time guard
</span><span class="cx">     template&lt;typename T&gt; operator T*(); // compile-time guard
</span><span class="cx"> 
</span><span class="cx">     void init(const Length&amp;);
</span><span class="cx">     void init(const LengthSize&amp;, const RenderStyle*);
</span><del>-    void init(PassRefPtr&lt;Counter&gt;);
</del><ins>+    void init(Ref&lt;Counter&gt;&amp;&amp;);
</ins><span class="cx">     void init(PassRefPtr&lt;Rect&gt;);
</span><span class="cx">     void init(PassRefPtr&lt;Pair&gt;);
</span><span class="cx">     void init(PassRefPtr&lt;Quad&gt;);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCounterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/Counter.h (178950 => 178951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/Counter.h        2015-01-22 22:20:57 UTC (rev 178950)
+++ trunk/Source/WebCore/css/Counter.h        2015-01-22 22:21:08 UTC (rev 178951)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> 
</span><span class="cx"> class Counter : public RefCounted&lt;Counter&gt; {
</span><span class="cx"> public:
</span><del>-    static PassRefPtr&lt;Counter&gt; create(PassRefPtr&lt;CSSPrimitiveValue&gt; identifier, PassRefPtr&lt;CSSPrimitiveValue&gt; listStyle, PassRefPtr&lt;CSSPrimitiveValue&gt; separator)
</del><ins>+    static Ref&lt;Counter&gt; create(PassRefPtr&lt;CSSPrimitiveValue&gt; identifier, PassRefPtr&lt;CSSPrimitiveValue&gt; listStyle, PassRefPtr&lt;CSSPrimitiveValue&gt; separator)
</ins><span class="cx">     {
</span><del>-        return adoptRef(new Counter(identifier, listStyle, separator));
</del><ins>+        return adoptRef(*new Counter(identifier, listStyle, separator));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     String identifier() const { return m_identifier ? m_identifier-&gt;getStringValue() : String(); }
</span><span class="lines">@@ -50,11 +50,11 @@
</span><span class="cx">             &amp;&amp; separator() == other.separator();
</span><span class="cx">     }
</span><span class="cx">     
</span><del>-    PassRefPtr&lt;Counter&gt; cloneForCSSOM() const
</del><ins>+    Ref&lt;Counter&gt; cloneForCSSOM() const
</ins><span class="cx">     {
</span><del>-        return create(m_identifier ? m_identifier-&gt;cloneForCSSOM() : 0
-            , m_listStyle ? m_listStyle-&gt;cloneForCSSOM() : 0
-            , m_separator ? m_separator-&gt;cloneForCSSOM() : 0);
</del><ins>+        return create(m_identifier ? m_identifier-&gt;cloneForCSSOM() : nullptr
+            , m_listStyle ? m_listStyle-&gt;cloneForCSSOM() : nullptr
+            , m_separator ? m_separator-&gt;cloneForCSSOM() : nullptr);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>

</body>
</html>