<!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>[160843] 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/160843">160843</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-19 10:25:17 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Compile fix for VS2013 when using ACCELERATED_COMPOSITING.
https://bugs.webkit.org/show_bug.cgi?id=124866
Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-19
Reviewed by Darin Adler.
* platform/graphics/TiledBackingStore.cpp:
(WebCore::TiledBackingStore::TiledBackingStore):
* platform/graphics/TiledBackingStore.h:
Added constructor overload to avoid compile errors
from using MSVC's make_unique as a default parameter.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160842 => 160843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-19 18:14:32 UTC (rev 160842)
+++ trunk/Source/WebCore/ChangeLog 2013-12-19 18:25:17 UTC (rev 160843)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-19 Alex Christensen <achristensen@webkit.org>
+
+ [WinCairo] Compile fix for VS2013 when using ACCELERATED_COMPOSITING.
+ https://bugs.webkit.org/show_bug.cgi?id=124866
+
+ Reviewed by Darin Adler.
+
+ * platform/graphics/TiledBackingStore.cpp:
+ (WebCore::TiledBackingStore::TiledBackingStore):
+ * platform/graphics/TiledBackingStore.h:
+ Added constructor overload to avoid compile errors
+ from using MSVC's make_unique as a default parameter.
+
</ins><span class="cx"> 2013-12-19 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Upstream WebCore/loader changes
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp (160842 => 160843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2013-12-19 18:14:32 UTC (rev 160842)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.cpp 2013-12-19 18:25:17 UTC (rev 160843)
</span><span class="lines">@@ -35,6 +35,22 @@
</span><span class="cx"> return IntPoint(rect.maxX() - 1, rect.maxY() - 1);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client)
+ : m_client(client)
+ , m_backend(std::make_unique<TiledBackingStoreBackend>())
+ , m_tileBufferUpdateTimer(this, &TiledBackingStore::tileBufferUpdateTimerFired)
+ , m_backingStoreUpdateTimer(this, &TiledBackingStore::backingStoreUpdateTimerFired)
+ , m_tileSize(defaultTileDimension, defaultTileDimension)
+ , m_coverAreaMultiplier(2.0f)
+ , m_contentsScale(1.f)
+ , m_pendingScale(0)
+ , m_commitTileUpdatesOnIdleEventLoop(false)
+ , m_contentsFrozen(false)
+ , m_supportsAlpha(false)
+ , m_pendingTileCreation(false)
+{
+}
+
</ins><span class="cx"> TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client, std::unique_ptr<TiledBackingStoreBackend> backend)
</span><span class="cx"> : m_client(client)
</span><span class="cx"> , m_backend(std::move(backend))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsTiledBackingStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/TiledBackingStore.h (160842 => 160843)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2013-12-19 18:14:32 UTC (rev 160842)
+++ trunk/Source/WebCore/platform/graphics/TiledBackingStore.h 2013-12-19 18:25:17 UTC (rev 160843)
</span><span class="lines">@@ -41,7 +41,8 @@
</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*, std::unique_ptr<TiledBackingStoreBackend> = std::make_unique<TiledBackingStoreBackend>());
</del><ins>+ TiledBackingStore(TiledBackingStoreClient*);
+ TiledBackingStore(TiledBackingStoreClient*, std::unique_ptr<TiledBackingStoreBackend>);
</ins><span class="cx"> ~TiledBackingStore();
</span><span class="cx">
</span><span class="cx"> TiledBackingStoreClient* client() { return m_client; }
</span></span></pre>
</div>
</div>
</body>
</html>