<!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>[159613] 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/159613">159613</a></dd>
<dt>Author</dt> <dd>jae.park@company100.net</dd>
<dt>Date</dt> <dd>2013-11-20 23:52:15 -0800 (Wed, 20 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CoordinatedGraphics] Use std::unique_ptrs rather than OwnPtrs
https://bugs.webkit.org/show_bug.cgi?id=124692

Reviewed by Noam Rosenthal.

No new tests, covered by existing ones.

* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::TiledBackingStore):
* platform/graphics/TiledBackingStore.h:
* platform/graphics/TiledBackingStoreBackend.h:
* platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
(WebCore::CoordinatedGraphicsLayer::createBackingStore):
* platform/graphics/texmap/coordinated/CoordinatedTile.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp">trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingStoreh">trunk/Source/WebCore/platform/graphics/TiledBackingStore.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsTiledBackingStoreBackendh">trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedTileh">trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedTile.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159612 => 159613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-21 07:46:13 UTC (rev 159612)
+++ trunk/Source/WebCore/ChangeLog        2013-11-21 07:52:15 UTC (rev 159613)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-11-20  Jae Hyun Park  &lt;jae.park@company100.net&gt;
+
+        [CoordinatedGraphics] Use std::unique_ptrs rather than OwnPtrs
+        https://bugs.webkit.org/show_bug.cgi?id=124692
+
+        Reviewed by Noam Rosenthal.
+
+        No new tests, covered by existing ones.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::TiledBackingStore):
+        * platform/graphics/TiledBackingStore.h:
+        * platform/graphics/TiledBackingStoreBackend.h:
+        * platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp:
+        (WebCore::CoordinatedGraphicsLayer::createBackingStore):
+        * platform/graphics/texmap/coordinated/CoordinatedTile.h:
+
</ins><span class="cx"> 2013-11-20  Brady Eidson  &lt;beidson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Add more infrastructure for ServerConnection communication between Web and Database processes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (159612 => 159613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp        2013-11-21 07:46:13 UTC (rev 159612)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp        2013-11-21 07:52:15 UTC (rev 159613)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">     return IntPoint(rect.maxX() - 1, rect.maxY() - 1);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client, PassOwnPtr&lt;TiledBackingStoreBackend&gt; backend)
</del><ins>+TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client, std::unique_ptr&lt;TiledBackingStoreBackend&gt; backend)
</ins><span class="cx">     : m_client(client)
</span><del>-    , m_backend(backend)
</del><ins>+    , m_backend(std::move(backend))
</ins><span class="cx">     , m_tileBufferUpdateTimer(this, &amp;TiledBackingStore::tileBufferUpdateTimerFired)
</span><span class="cx">     , m_backingStoreUpdateTimer(this, &amp;TiledBackingStore::backingStoreUpdateTimerFired)
</span><span class="cx">     , m_tileSize(defaultTileDimension, defaultTileDimension)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (159612 => 159613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h        2013-11-21 07:46:13 UTC (rev 159612)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h        2013-11-21 07:52:15 UTC (rev 159613)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> class TiledBackingStore {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(TiledBackingStore); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    TiledBackingStore(TiledBackingStoreClient*, PassOwnPtr&lt;TiledBackingStoreBackend&gt; = TiledBackingStoreBackend::create());
</del><ins>+    TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr&lt;TiledBackingStoreBackend&gt; = std::make_unique&lt;TiledBackingStoreBackend&gt;());
</ins><span class="cx">     ~TiledBackingStore();
</span><span class="cx"> 
</span><span class="cx">     TiledBackingStoreClient* client() { return m_client; }
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     TiledBackingStoreClient* m_client;
</span><del>-    OwnPtr&lt;TiledBackingStoreBackend&gt; m_backend;
</del><ins>+    std::unique_ptr&lt;TiledBackingStoreBackend&gt; m_backend;
</ins><span class="cx"> 
</span><span class="cx">     typedef HashMap&lt;Tile::Coordinate, RefPtr&lt;Tile&gt; &gt; TileMap;
</span><span class="cx">     TileMap m_tiles;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStoreBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h (159612 => 159613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h        2013-11-21 07:46:13 UTC (rev 159612)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStoreBackend.h        2013-11-21 07:52:15 UTC (rev 159613)
</span><span class="lines">@@ -28,18 +28,13 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><span class="cx"> class TiledBackingStore;
</span><del>-class TiledBackingStoreBackend;
</del><span class="cx"> 
</span><span class="cx"> class TiledBackingStoreBackend {
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    static PassOwnPtr&lt;TiledBackingStoreBackend&gt; create() { return adoptPtr(new TiledBackingStoreBackend); }
</del><span class="cx">     virtual ~TiledBackingStoreBackend() { }
</span><span class="cx">     virtual PassRefPtr&lt;Tile&gt; createTile(TiledBackingStore*, const Tile::Coordinate&amp;);
</span><span class="cx">     virtual void paintCheckerPattern(GraphicsContext*, const FloatRect&amp;);
</span><del>-
-protected:
-    TiledBackingStoreBackend() { }
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedGraphicsLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp (159612 => 159613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp        2013-11-21 07:46:13 UTC (rev 159612)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp        2013-11-21 07:52:15 UTC (rev 159613)
</span><span class="lines">@@ -893,7 +893,7 @@
</span><span class="cx"> 
</span><span class="cx"> void CoordinatedGraphicsLayer::createBackingStore()
</span><span class="cx"> {
</span><del>-    m_mainBackingStore = std::make_unique&lt;TiledBackingStore&gt;(this, CoordinatedTileBackend::create(this));
</del><ins>+    m_mainBackingStore = std::make_unique&lt;TiledBackingStore&gt;(this, std::make_unique&lt;CoordinatedTileBackend&gt;(this));
</ins><span class="cx">     m_mainBackingStore-&gt;setSupportsAlpha(!contentsOpaque());
</span><span class="cx">     m_mainBackingStore-&gt;setContentsScale(effectiveContentsScale());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstexmapcoordinatedCoordinatedTileh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedTile.h (159612 => 159613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedTile.h        2013-11-21 07:46:13 UTC (rev 159612)
+++ trunk/Source/WebCore/platform/graphics/texmap/coordinated/CoordinatedTile.h        2013-11-21 07:52:15 UTC (rev 159613)
</span><span class="lines">@@ -81,12 +81,11 @@
</span><span class="cx"> 
</span><span class="cx"> class CoordinatedTileBackend : public TiledBackingStoreBackend {
</span><span class="cx"> public:
</span><del>-    static PassOwnPtr&lt;TiledBackingStoreBackend&gt; create(CoordinatedTileClient* client) { return adoptPtr(new CoordinatedTileBackend(client)); }
</del><ins>+    explicit CoordinatedTileBackend(CoordinatedTileClient*);
</ins><span class="cx">     PassRefPtr&lt;Tile&gt; createTile(TiledBackingStore*, const Tile::Coordinate&amp;);
</span><span class="cx">     void paintCheckerPattern(GraphicsContext*, const FloatRect&amp;);
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    explicit CoordinatedTileBackend(CoordinatedTileClient*);
</del><span class="cx">     CoordinatedTileClient* m_client;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>