<!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>[167854] trunk/Source/WebKit2</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/167854">167854</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-04-27 06:40:14 -0700 (Sun, 27 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move cross-port WebKit2 code to std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=129670
Reviewed by Darin Adler.
Replace uses of OwnPtr, PassOwnPtr in cross-port WebKit2 code with std::unique_ptr.
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createIndex):
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
* NetworkProcess/NetworkProcess.h:
(WebKit::NetworkProcess::addSupplement):
* NetworkProcess/SynchronousNetworkLoaderClient.cpp:
(WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
* NetworkProcess/SynchronousNetworkLoaderClient.h:
* Platform/IPC/Connection.cpp:
(IPC::Connection::dispatchWorkQueueMessageReceiverMessage):
* Platform/IPC/Connection.h:
* Platform/IPC/MessageReceiver.h:
* Platform/Module.h:
* Platform/WorkQueue.h:
* Platform/efl/ModuleEfl.cpp:
(WebKit::Module::load):
* Platform/mac/LayerHostingContext.mm:
* Shared/APIURL.h:
* Shared/Network/CustomProtocols/CustomProtocolManager.h:
* Shared/Plugins/NPRemoteObjectMap.cpp:
* Shared/ShareableBitmap.h:
* UIProcess/DrawingAreaProxyImpl.h:
* UIProcess/InspectorServer/WebSocketServer.cpp:
(WebKit::WebSocketServer::didAcceptConnection):
(WebKit::WebSocketServer::didCloseWebSocketServerConnection):
* UIProcess/InspectorServer/WebSocketServer.h:
* UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
(WebKit::connectionCallback):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::createDownloadProxy):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/Plugins/WebPluginSiteDataManager.cpp:
(WebKit::WebPluginSiteDataManager::getSitesWithData):
(WebKit::WebPluginSiteDataManager::clearSiteData):
(WebKit::WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins):
(WebKit::WebPluginSiteDataManager::didClearSiteDataForAllPlugins):
* UIProcess/Plugins/WebPluginSiteDataManager.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::callCallbackFunction):
(WebKit::StorageManager::getOriginsInternal):
* UIProcess/WebPageProxy.cpp:
(WebKit::ExceededDatabaseQuotaRecords::areBeingProcessed):
(WebKit::ExceededDatabaseQuotaRecords::createRecord):
(WebKit::ExceededDatabaseQuotaRecords::add):
(WebKit::ExceededDatabaseQuotaRecords::next):
(WebKit::WebPageProxy::handleMouseEvent):
(WebKit::WebPageProxy::handleWheelEvent):
(WebKit::WebPageProxy::processNextQueuedWheelEvent):
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::createDownloadProxy):
* UIProcess/WebProcessProxy.h:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::PluginDestructionProtector::PluginDestructionProtector):
* WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
(WebKit::NetscapePluginStream::deliverData):
* WebProcess/Plugins/Netscape/NetscapePluginStream.h:
* WebProcess/Plugins/PluginProcessConnectionManager.h:
* WebProcess/Plugins/PluginProxy.cpp:
(WebKit::PluginProxy::initialize):
(WebKit::PluginProxy::didCreatePluginInternal):
(WebKit::PluginProxy::didFailToCreatePluginInternal):
* WebProcess/Plugins/PluginProxy.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::createWebEvent):
(WebKit::PluginView::handleEvent):
* WebProcess/Plugins/PluginView.h:
* WebProcess/WebCoreSupport/WebPopupMenu.h:
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::EventDispatcher):
* WebProcess/WebPage/EventDispatcher.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::beginPrinting):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebProcess.h:
(WebKit::WebProcess::addSupplement):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLiteh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClientcpp">trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClienth">trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageReceiverh">trunk/Source/WebKit2/Platform/IPC/MessageReceiver.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformWorkQueueh">trunk/Source/WebKit2/Platform/WorkQueue.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformeflModuleEflcpp">trunk/Source/WebKit2/Platform/efl/ModuleEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacLayerHostingContextmm">trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIURLh">trunk/Source/WebKit2/Shared/APIURL.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh">trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNPRemoteObjectMapcpp">trunk/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableBitmaph">trunk/Source/WebKit2/Shared/ShareableBitmap.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDrawingAreaProxyImplh">trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServercpp">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServerh">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp">trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxyh">trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagerh">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamcpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamh">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxycpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProxyh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewh">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPopupMenuh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -1,3 +1,92 @@
</span><ins>+2014-04-27 Zan Dobersek <zdobersek@igalia.com>
+
+ Move cross-port WebKit2 code to std::unique_ptr
+ https://bugs.webkit.org/show_bug.cgi?id=129670
+
+ Reviewed by Darin Adler.
+
+ Replace uses of OwnPtr, PassOwnPtr in cross-port WebKit2 code with std::unique_ptr.
+
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createIndex):
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h:
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::addSupplement):
+ * NetworkProcess/SynchronousNetworkLoaderClient.cpp:
+ (WebKit::SynchronousNetworkLoaderClient::didReceiveBuffer):
+ * NetworkProcess/SynchronousNetworkLoaderClient.h:
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::dispatchWorkQueueMessageReceiverMessage):
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/MessageReceiver.h:
+ * Platform/Module.h:
+ * Platform/WorkQueue.h:
+ * Platform/efl/ModuleEfl.cpp:
+ (WebKit::Module::load):
+ * Platform/mac/LayerHostingContext.mm:
+ * Shared/APIURL.h:
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+ * Shared/Plugins/NPRemoteObjectMap.cpp:
+ * Shared/ShareableBitmap.h:
+ * UIProcess/DrawingAreaProxyImpl.h:
+ * UIProcess/InspectorServer/WebSocketServer.cpp:
+ (WebKit::WebSocketServer::didAcceptConnection):
+ (WebKit::WebSocketServer::didCloseWebSocketServerConnection):
+ * UIProcess/InspectorServer/WebSocketServer.h:
+ * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
+ (WebKit::connectionCallback):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::createDownloadProxy):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Notifications/WebNotificationManagerProxy.h:
+ * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+ (WebKit::WebPluginSiteDataManager::getSitesWithData):
+ (WebKit::WebPluginSiteDataManager::clearSiteData):
+ (WebKit::WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins):
+ (WebKit::WebPluginSiteDataManager::didClearSiteDataForAllPlugins):
+ * UIProcess/Plugins/WebPluginSiteDataManager.h:
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::callCallbackFunction):
+ (WebKit::StorageManager::getOriginsInternal):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::ExceededDatabaseQuotaRecords::areBeingProcessed):
+ (WebKit::ExceededDatabaseQuotaRecords::createRecord):
+ (WebKit::ExceededDatabaseQuotaRecords::add):
+ (WebKit::ExceededDatabaseQuotaRecords::next):
+ (WebKit::WebPageProxy::handleMouseEvent):
+ (WebKit::WebPageProxy::handleWheelEvent):
+ (WebKit::WebPageProxy::processNextQueuedWheelEvent):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::createDownloadProxy):
+ * UIProcess/WebProcessProxy.h:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::PluginDestructionProtector::PluginDestructionProtector):
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.cpp:
+ (WebKit::NetscapePluginStream::deliverData):
+ * WebProcess/Plugins/Netscape/NetscapePluginStream.h:
+ * WebProcess/Plugins/PluginProcessConnectionManager.h:
+ * WebProcess/Plugins/PluginProxy.cpp:
+ (WebKit::PluginProxy::initialize):
+ (WebKit::PluginProxy::didCreatePluginInternal):
+ (WebKit::PluginProxy::didFailToCreatePluginInternal):
+ * WebProcess/Plugins/PluginProxy.h:
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::createWebEvent):
+ (WebKit::PluginView::handleEvent):
+ * WebProcess/Plugins/PluginView.h:
+ * WebProcess/WebCoreSupport/WebPopupMenu.h:
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::EventDispatcher):
+ * WebProcess/WebPage/EventDispatcher.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::beginPrinting):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebProcess.h:
+ (WebKit::WebProcess::addSupplement):
+
</ins><span class="cx"> 2014-04-27 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Coalesce responses on network process side
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx">
</span><span class="cx"> m_cursors.set(cursor->identifier(), cursor);
</span><span class="cx">
</span><del>- OwnPtr<JSLockHolder> locker;
</del><ins>+ std::unique_ptr<JSLockHolder> locker;
</ins><span class="cx"> while (!cursor->currentKey().isNull) {
</span><span class="cx"> const IDBKeyData& key = cursor->currentKey();
</span><span class="cx"> const Vector<uint8_t>& valueBuffer = cursor->currentValueBuffer();
</span><span class="lines">@@ -638,12 +638,12 @@
</span><span class="cx"> if (!m_globalObject) {
</span><span class="cx"> ASSERT(!m_vm);
</span><span class="cx"> m_vm = VM::create();
</span><del>- locker = adoptPtr(new JSLockHolder(m_vm.get()));
</del><ins>+ locker = std::make_unique<JSLockHolder>(m_vm.get());
</ins><span class="cx"> m_globalObject.set(*m_vm, JSGlobalObject::create(*m_vm, JSGlobalObject::createStructure(*m_vm, jsNull())));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!locker)
</span><del>- locker = adoptPtr(new JSLockHolder(m_vm.get()));
</del><ins>+ locker = std::make_unique<JSLockHolder>(m_vm.get());
</ins><span class="cx">
</span><span class="cx"> Deprecated::ScriptValue value = deserializeIDBValueBuffer(m_globalObject->globalExec(), valueBuffer, true);
</span><span class="cx"> Vector<IDBKeyData> indexKeys;
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLiteh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "UniqueIDBDatabase.h"
</span><span class="cx"> #include "UniqueIDBDatabaseBackingStore.h"
</span><span class="cx"> #include <JavaScriptCore/Strong.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "MessageReceiverMap.h"
</span><span class="cx"> #include "NetworkResourceLoadScheduler.h"
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> template <typename T>
</span><span class="cx"> void addSupplement()
</span><span class="cx"> {
</span><del>- m_supplements.add(T::supplementName(), adoptPtr<NetworkProcessSupplement>(new T(this)));
</del><ins>+ m_supplements.add(T::supplementName(), std::make_unique<T>(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess*);
</span><span class="lines">@@ -134,7 +135,7 @@
</span><span class="cx"> bool m_hasSetCacheModel;
</span><span class="cx"> CacheModel m_cacheModel;
</span><span class="cx">
</span><del>- typedef HashMap<const char*, OwnPtr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
</del><ins>+ typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
</ins><span class="cx"> NetworkProcessSupplementMap m_supplements;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> // It's unclear if the potential complexities of that approach are worth it.
</span><span class="cx">
</span><span class="cx"> if (!m_responseData)
</span><del>- m_responseData = adoptPtr(new Vector<char>);
</del><ins>+ m_responseData = std::make_unique<Vector<char>>();
</ins><span class="cx">
</span><span class="cx"> m_responseData->append(buffer->data(), buffer->size());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessSynchronousNetworkLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -66,7 +67,7 @@
</span><span class="cx"> RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> m_delayedReply;
</span><span class="cx"> WebCore::ResourceResponse m_response;
</span><span class="cx"> WebCore::ResourceError m_error;
</span><del>- OwnPtr<Vector<char>> m_responseData;
</del><ins>+ std::unique_ptr<Vector<char>> m_responseData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Connection.h"
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -277,7 +278,7 @@
</span><span class="cx">
</span><span class="cx"> void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver* workQueueMessageReceiver, MessageDecoder* incomingMessageDecoder)
</span><span class="cx"> {
</span><del>- OwnPtr<MessageDecoder> decoder = adoptPtr(incomingMessageDecoder);
</del><ins>+ std::unique_ptr<MessageDecoder> decoder(incomingMessageDecoder);
</ins><span class="cx">
</span><span class="cx"> if (!decoder->isSyncMessage()) {
</span><span class="cx"> workQueueMessageReceiver->didReceiveMessage(this, *decoder);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if OS(DARWIN)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageReceiverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageReceiver.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageReceiver.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Platform/IPC/MessageReceiver.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #define MessageReceiver_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/WorkQueue.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/WorkQueue.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Platform/WorkQueue.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformeflModuleEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/efl/ModuleEfl.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/efl/ModuleEfl.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Platform/efl/ModuleEfl.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Module.h"
</span><span class="cx">
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacLayerHostingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Platform/mac/LayerHostingContext.mm 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "LayerHostingContext.h"
</span><span class="cx">
</span><del>-#import <wtf/OwnPtr.h>
</del><span class="cx"> #import <WebKitSystemInterface.h>
</span><span class="cx">
</span><span class="cx"> #if __has_include(<QuartzCore/QuartzCorePrivate.h>)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIURL.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIURL.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Shared/APIURL.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -29,8 +29,6 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include <WebCore/URL.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -40,6 +40,8 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx"> OBJC_CLASS WKCustomProtocol;
</span><ins>+#else
+#include "CustomProtocolManagerImpl.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -55,7 +57,6 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class ChildProcess;
</span><del>-class CustomProtocolManagerImpl;
</del><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> class CustomProtocolManager : public WebProcessSupplement, public NetworkProcessSupplement, public IPC::Connection::WorkQueueMessageReceiver {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNPRemoteObjectMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "NPObjectProxy.h"
</span><span class="cx"> #include "NPRuntimeUtilities.h"
</span><span class="cx"> #include "NPVariantData.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ShareableBitmap.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "SharedMemory.h"
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDrawingAreaProxyImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include "BackingStore.h"
</span><span class="cx"> #include "DrawingAreaProxy.h"
</span><span class="cx"> #include "LayerTreeContext.h"
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">
</span><span class="cx"> #include "WebSocketServerConnection.h"
</span><span class="cx"> #include <WebCore/SocketStreamHandle.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -78,20 +77,20 @@
</span><span class="cx"> m_bindAddress = String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebSocketServer::didAcceptConnection(PassOwnPtr<WebSocketServerConnection> connection)
</del><ins>+void WebSocketServer::didAcceptConnection(std::unique_ptr<WebSocketServerConnection> connection)
</ins><span class="cx"> {
</span><del>- m_connections.append(connection);
</del><ins>+ m_connections.append(std::move(connection));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebSocketServer::didCloseWebSocketServerConnection(WebSocketServerConnection* connection)
</span><span class="cx"> {
</span><del>- Deque<OwnPtr<WebSocketServerConnection> >::iterator end = m_connections.end();
- for (Deque<OwnPtr<WebSocketServerConnection> >::iterator it = m_connections.begin(); it != end; ++it) {
</del><ins>+ for (auto it = m_connections.begin(), end = m_connections.end(); it != end; ++it) {
</ins><span class="cx"> if (it->get() == connection) {
</span><span class="cx"> m_connections.remove(it);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="cx">
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Deque.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> WebSocketServerClient* client() const { return m_client; }
</span><del>- void didAcceptConnection(PassOwnPtr<WebSocketServerConnection>);
</del><ins>+ void didAcceptConnection(std::unique_ptr<WebSocketServerConnection>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void didCloseWebSocketServerConnection(WebSocketServerConnection*);
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> void platformClose();
</span><span class="cx">
</span><span class="cx"> ServerState m_state;
</span><del>- Deque<OwnPtr<WebSocketServerConnection> > m_connections;
</del><ins>+ Deque<std::unique_ptr<WebSocketServerConnection>> m_connections;
</ins><span class="cx"> WebSocketServerClient* m_client;
</span><span class="cx"> String m_bindAddress;
</span><span class="cx"> unsigned short m_port;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include <WebCore/SocketStreamHandle.h>
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -47,9 +46,9 @@
</span><span class="cx"> LOG(InspectorServer, "New Connection from %s:%d.", addressString.get(), g_inet_socket_address_get_port(G_INET_SOCKET_ADDRESS(socketAddress.get())));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- OwnPtr<WebSocketServerConnection> webSocketConnection = adoptPtr(new WebSocketServerConnection(server->client(), server));
</del><ins>+ auto webSocketConnection = std::make_unique<WebSocketServerConnection>(server->client(), server);
</ins><span class="cx"> webSocketConnection->setSocketHandle(SocketStreamHandle::create(connection, webSocketConnection.get()));
</span><del>- server->didAcceptConnection(webSocketConnection.release());
</del><ins>+ server->didAcceptConnection(std::move(webSocketConnection));
</ins><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> DownloadProxy* NetworkProcessProxy::createDownloadProxy()
</span><span class="cx"> {
</span><span class="cx"> if (!m_downloadProxyMap)
</span><del>- m_downloadProxyMap = adoptPtr(new DownloadProxyMap(this));
</del><ins>+ m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
</ins><span class="cx">
</span><span class="cx"> return m_downloadProxyMap->createDownloadProxy(m_webContext);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="lines">@@ -91,7 +92,7 @@
</span><span class="cx"> unsigned m_numPendingConnectionRequests;
</span><span class="cx"> Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
</span><span class="cx">
</span><del>- OwnPtr<DownloadProxyMap> m_downloadProxyMap;
</del><ins>+ std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNotificationsWebNotificationManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "WebNotificationProvider.h"
</span><span class="cx"> #include <WebCore/NotificationClient.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> ASSERT(!m_pendingGetSitesWithData.contains(callbackID));
</span><span class="cx">
</span><span class="cx"> GetSitesWithDataState* state = new GetSitesWithDataState(this, callbackID);
</span><del>- m_pendingGetSitesWithData.set(callbackID, adoptPtr(state));
</del><ins>+ m_pendingGetSitesWithData.set(callbackID, std::unique_ptr<GetSitesWithDataState>(state));
</ins><span class="cx"> state->getSitesWithDataForNextPlugin();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> ASSERT(!m_pendingClearSiteData.contains(callbackID));
</span><span class="cx">
</span><span class="cx"> ClearSiteDataState* state = new ClearSiteDataState(this, sitesVector, flags, maxAgeInSeconds, callbackID);
</span><del>- m_pendingClearSiteData.set(callbackID, adoptPtr(state));
</del><ins>+ m_pendingClearSiteData.set(callbackID, std::unique_ptr<ClearSiteDataState>(state));
</ins><span class="cx"> state->clearSiteDataForNextPlugin();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins(const Vector<String>& sites, uint64_t callbackID)
</span><span class="cx"> {
</span><del>- OwnPtr<GetSitesWithDataState> state = m_pendingGetSitesWithData.take(callbackID);
</del><ins>+ std::unique_ptr<GetSitesWithDataState> state = m_pendingGetSitesWithData.take(callbackID);
</ins><span class="cx"> ASSERT(state);
</span><span class="cx">
</span><span class="cx"> didGetSitesWithData(sites, callbackID);
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPluginSiteDataManager::didClearSiteDataForAllPlugins(uint64_t callbackID)
</span><span class="cx"> {
</span><del>- OwnPtr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID);
</del><ins>+ std::unique_ptr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID);
</ins><span class="cx"> ASSERT(state);
</span><span class="cx">
</span><span class="cx"> didClearSiteData(callbackID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "Arguments.h"
</span><span class="cx"> #include "GenericCallback.h"
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -69,10 +70,10 @@
</span><span class="cx"> void didClearSiteDataForAllPlugins(uint64_t callbackID);
</span><span class="cx">
</span><span class="cx"> class GetSitesWithDataState;
</span><del>- HashMap<uint64_t, OwnPtr<GetSitesWithDataState>> m_pendingGetSitesWithData;
</del><ins>+ HashMap<uint64_t, std::unique_ptr<GetSitesWithDataState>> m_pendingGetSitesWithData;
</ins><span class="cx">
</span><span class="cx"> class ClearSiteDataState;
</span><del>- HashMap<uint64_t, OwnPtr<ClearSiteDataState>> m_pendingClearSiteData;
</del><ins>+ HashMap<uint64_t, std::unique_ptr<ClearSiteDataState>> m_pendingClearSiteData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <WebCore/StorageMap.h>
</span><span class="cx"> #include <WebCore/TextEncoding.h>
</span><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -631,14 +632,14 @@
</span><span class="cx">
</span><span class="cx"> static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin>>* securityOriginsPtr)
</span><span class="cx"> {
</span><del>- OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(securityOriginsPtr);
</del><ins>+ std::unique_ptr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins(securityOriginsPtr);
</ins><span class="cx"> callbackFunction(*securityOrigins, context);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
</span><span class="cx"> {
</span><del>- OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(new Vector<RefPtr<WebCore::SecurityOrigin>>(m_localStorageDatabaseTracker->origins()));
- dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.leakPtr()));
</del><ins>+ auto securityOrigins = std::make_unique<Vector<RefPtr<WebCore::SecurityOrigin>>>(m_localStorageDatabaseTracker->origins());
+ dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.release()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StorageManager::getStorageDetailsByOriginInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<LocalStorageDetails>& storageDetails, void* context))
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -171,21 +171,21 @@
</span><span class="cx">
</span><span class="cx"> static ExceededDatabaseQuotaRecords& shared();
</span><span class="cx">
</span><del>- PassOwnPtr<Record> createRecord(uint64_t frameID, String originIdentifier,
</del><ins>+ std::unique_ptr<Record> createRecord(uint64_t frameID, String originIdentifier,
</ins><span class="cx"> String databaseName, String displayName, uint64_t currentQuota,
</span><span class="cx"> uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage,
</span><span class="cx"> PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply>);
</span><span class="cx">
</span><del>- void add(PassOwnPtr<Record>);
- bool areBeingProcessed() const { return m_currentRecord; }
</del><ins>+ void add(std::unique_ptr<Record>);
+ bool areBeingProcessed() const { return !!m_currentRecord; }
</ins><span class="cx"> Record* next();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ExceededDatabaseQuotaRecords() { }
</span><span class="cx"> ~ExceededDatabaseQuotaRecords() { }
</span><span class="cx">
</span><del>- Deque<OwnPtr<Record>> m_records;
- OwnPtr<Record> m_currentRecord;
</del><ins>+ Deque<std::unique_ptr<Record>> m_records;
+ std::unique_ptr<Record> m_currentRecord;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ExceededDatabaseQuotaRecords& ExceededDatabaseQuotaRecords::shared()
</span><span class="lines">@@ -194,12 +194,12 @@
</span><span class="cx"> return records;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ExceededDatabaseQuotaRecords::Record> ExceededDatabaseQuotaRecords::createRecord(
</del><ins>+std::unique_ptr<ExceededDatabaseQuotaRecords::Record> ExceededDatabaseQuotaRecords::createRecord(
</ins><span class="cx"> uint64_t frameID, String originIdentifier, String databaseName, String displayName,
</span><span class="cx"> uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage,
</span><span class="cx"> uint64_t expectedUsage, PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply> reply)
</span><span class="cx"> {
</span><del>- OwnPtr<Record> record = adoptPtr(new Record);
</del><ins>+ auto record = std::make_unique<Record>();
</ins><span class="cx"> record->frameID = frameID;
</span><span class="cx"> record->originIdentifier = originIdentifier;
</span><span class="cx"> record->databaseName = databaseName;
</span><span class="lines">@@ -209,17 +209,17 @@
</span><span class="cx"> record->currentDatabaseUsage = currentDatabaseUsage;
</span><span class="cx"> record->expectedUsage = expectedUsage;
</span><span class="cx"> record->reply = reply;
</span><del>- return record.release();
</del><ins>+ return std::move(record);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ExceededDatabaseQuotaRecords::add(PassOwnPtr<ExceededDatabaseQuotaRecords::Record> record)
</del><ins>+void ExceededDatabaseQuotaRecords::add(std::unique_ptr<ExceededDatabaseQuotaRecords::Record> record)
</ins><span class="cx"> {
</span><del>- m_records.append(record);
</del><ins>+ m_records.append(std::move(record));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceededDatabaseQuotaRecords::Record* ExceededDatabaseQuotaRecords::next()
</span><span class="cx"> {
</span><del>- m_currentRecord.clear();
</del><ins>+ m_currentRecord = nullptr;
</ins><span class="cx"> if (!m_records.isEmpty())
</span><span class="cx"> m_currentRecord = m_records.takeFirst();
</span><span class="cx"> return m_currentRecord.get();
</span><span class="lines">@@ -1264,7 +1264,7 @@
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> else {
</span><span class="cx"> if (m_processingMouseMoveEvent) {
</span><del>- m_nextMouseMoveEvent = adoptPtr(new NativeWebMouseEvent(event));
</del><ins>+ m_nextMouseMoveEvent = std::make_unique<NativeWebMouseEvent>(event);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1276,7 +1276,7 @@
</span><span class="cx"> // we fake a mouse up event by using this stored down event. This event gets cleared
</span><span class="cx"> // when the mouse up message is received from WebProcess.
</span><span class="cx"> if (event.type() == WebEvent::MouseDown)
</span><del>- m_currentlyProcessedMouseDownEvent = adoptPtr(new NativeWebMouseEvent(event));
</del><ins>+ m_currentlyProcessedMouseDownEvent = std::make_unique<NativeWebMouseEvent>(event);
</ins><span class="cx">
</span><span class="cx"> if (m_shouldSendEventsSynchronously) {
</span><span class="cx"> bool handled = false;
</span><span class="lines">@@ -1372,17 +1372,17 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- OwnPtr<Vector<NativeWebWheelEvent>> coalescedWheelEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
</del><ins>+ auto coalescedWheelEvent = std::make_unique<Vector<NativeWebWheelEvent>>();
</ins><span class="cx"> coalescedWheelEvent->append(event);
</span><del>- m_currentlyProcessedWheelEvents.append(coalescedWheelEvent.release());
</del><ins>+ m_currentlyProcessedWheelEvents.append(std::move(coalescedWheelEvent));
</ins><span class="cx"> sendWheelEvent(event);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::processNextQueuedWheelEvent()
</span><span class="cx"> {
</span><del>- OwnPtr<Vector<NativeWebWheelEvent>> nextCoalescedEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
</del><ins>+ auto nextCoalescedEvent = std::make_unique<Vector<NativeWebWheelEvent>>();
</ins><span class="cx"> WebWheelEvent nextWheelEvent = coalescedWheelEvent(m_wheelEventQueue, *nextCoalescedEvent.get());
</span><del>- m_currentlyProcessedWheelEvents.append(nextCoalescedEvent.release());
</del><ins>+ m_currentlyProcessedWheelEvents.append(std::move(nextCoalescedEvent));
</ins><span class="cx"> sendWheelEvent(nextWheelEvent);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3787,7 +3787,7 @@
</span><span class="cx"> case WebEvent::Wheel: {
</span><span class="cx"> MESSAGE_CHECK(!m_currentlyProcessedWheelEvents.isEmpty());
</span><span class="cx">
</span><del>- OwnPtr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
</del><ins>+ std::unique_ptr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
</ins><span class="cx">
</span><span class="cx"> // FIXME: Dispatch additional events to the didNotHandleWheelEvent client function.
</span><span class="cx"> if (!handled) {
</span><span class="lines">@@ -4301,10 +4301,10 @@
</span><span class="cx"> void WebPageProxy::exceededDatabaseQuota(uint64_t frameID, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply> reply)
</span><span class="cx"> {
</span><span class="cx"> ExceededDatabaseQuotaRecords& records = ExceededDatabaseQuotaRecords::shared();
</span><del>- OwnPtr<ExceededDatabaseQuotaRecords::Record> newRecord = records.createRecord(frameID,
</del><ins>+ std::unique_ptr<ExceededDatabaseQuotaRecords::Record> newRecord = records.createRecord(frameID,
</ins><span class="cx"> originIdentifier, databaseName, displayName, currentQuota, currentOriginUsage,
</span><span class="cx"> currentDatabaseUsage, expectedUsage, reply);
</span><del>- records.add(newRecord.release());
</del><ins>+ records.add(std::move(newRecord));
</ins><span class="cx">
</span><span class="cx"> if (records.areBeingProcessed())
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -68,10 +68,9 @@
</span><span class="cx"> #include <WebCore/TextChecking.h>
</span><span class="cx"> #include <WebCore/TextGranularity.h>
</span><span class="cx"> #include <WebCore/ViewState.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -1554,11 +1553,11 @@
</span><span class="cx">
</span><span class="cx"> Deque<NativeWebKeyboardEvent> m_keyEventQueue;
</span><span class="cx"> Deque<NativeWebWheelEvent> m_wheelEventQueue;
</span><del>- Deque<OwnPtr<Vector<NativeWebWheelEvent>>> m_currentlyProcessedWheelEvents;
</del><ins>+ Deque<std::unique_ptr<Vector<NativeWebWheelEvent>>> m_currentlyProcessedWheelEvents;
</ins><span class="cx">
</span><span class="cx"> bool m_processingMouseMoveEvent;
</span><del>- OwnPtr<NativeWebMouseEvent> m_nextMouseMoveEvent;
- OwnPtr<NativeWebMouseEvent> m_currentlyProcessedMouseDownEvent;
</del><ins>+ std::unique_ptr<NativeWebMouseEvent> m_nextMouseMoveEvent;
+ std::unique_ptr<NativeWebMouseEvent> m_currentlyProcessedMouseDownEvent;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> bool m_isTrackingTouchEvents;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (!m_downloadProxyMap)
</span><del>- m_downloadProxyMap = adoptPtr(new DownloadProxyMap(this));
</del><ins>+ m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
</ins><span class="cx">
</span><span class="cx"> return m_downloadProxyMap->createDownloadProxy(m_context.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include <WebCore/LinkHash.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -204,7 +205,7 @@
</span><span class="cx"> WebFrameProxyMap m_frameMap;
</span><span class="cx"> WebBackForwardListItemMap m_backForwardListItemMap;
</span><span class="cx">
</span><del>- OwnPtr<DownloadProxyMap> m_downloadProxyMap;
</del><ins>+ std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> CustomProtocolManagerProxy m_customProtocolManagerProxy;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/ProtectionSpace.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <utility>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -49,11 +50,11 @@
</span><span class="cx"> explicit PluginDestructionProtector(NetscapePlugin* plugin)
</span><span class="cx"> {
</span><span class="cx"> if (plugin)
</span><del>- m_protector = adoptPtr(new PluginController::PluginDestructionProtector(static_cast<Plugin*>(plugin)->controller()));
</del><ins>+ m_protector = std::make_unique<PluginController::PluginDestructionProtector>(static_cast<Plugin*>(plugin)->controller());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- OwnPtr<PluginController::PluginDestructionProtector> m_protector;
</del><ins>+ std::unique_ptr<PluginController::PluginDestructionProtector> m_protector;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static bool startsWithBlankLine(const char* bytes, unsigned length)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "NetscapePlugin.h"
</span><span class="cx"> #include <utility>
</span><del>-#include <wtf/PassOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -187,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_transferMode != NP_ASFILEONLY) {
</span><span class="cx"> if (!m_deliveryData)
</span><del>- m_deliveryData = adoptPtr(new Vector<uint8_t>);
</del><ins>+ m_deliveryData = std::make_unique<Vector<uint8_t>>();
</ins><span class="cx">
</span><span class="cx"> m_deliveryData->reserveCapacity(m_deliveryData->size() + length);
</span><span class="cx"> m_deliveryData->append(bytes, length);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePluginStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/npruntime_internal.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -106,7 +107,7 @@
</span><span class="cx"> CString m_headers;
</span><span class="cx">
</span><span class="cx"> RunLoop::Timer<NetscapePluginStream> m_deliveryDataTimer;
</span><del>- OwnPtr< Vector<uint8_t>> m_deliveryData;
</del><ins>+ std::unique_ptr<Vector<uint8_t>> m_deliveryData;
</ins><span class="cx"> bool m_stopStreamWhenDoneDelivering;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx"> PluginProcessConnection* getPluginProcessConnection(uint64_t pluginProcessToken);
</span><span class="cx"> void removePluginProcessConnection(PluginProcessConnection*);
</span><span class="cx">
</span><del>- void didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(IPC::Connection*, OwnPtr<IPC::MessageDecoder>&);
-
</del><span class="cx"> private:
</span><span class="cx"> PluginProcessConnectionManager();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> m_connection->addPluginProxy(this);
</span><span class="cx">
</span><span class="cx"> // Ask the plug-in process to create a plug-in.
</span><del>- m_pendingPluginCreationParameters = adoptPtr(new PluginCreationParameters);
</del><ins>+ m_pendingPluginCreationParameters = std::make_unique<PluginCreationParameters>();
</ins><span class="cx">
</span><span class="cx"> m_pendingPluginCreationParameters->pluginInstanceID = m_pluginInstanceID;
</span><span class="cx"> m_pendingPluginCreationParameters->windowNPObjectID = windowNPObjectID();
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> // Whether synchronously or asynchronously, this plug-in was created and we shouldn't need to remember
</span><span class="cx"> // anything about how.
</span><del>- m_pendingPluginCreationParameters.clear();
</del><ins>+ m_pendingPluginCreationParameters = nullptr;
</ins><span class="cx"> m_waitingOnAsynchronousInitialization = false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> // Whether synchronously or asynchronously, this plug-in failed to create and we shouldn't need to remember
</span><span class="cx"> // anything about how.
</span><del>- m_pendingPluginCreationParameters.clear();
</del><ins>+ m_pendingPluginCreationParameters = nullptr;
</ins><span class="cx"> m_waitingOnAsynchronousInitialization = false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProxy.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <WebCore/FindOptions.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <memory>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -215,7 +216,7 @@
</span><span class="cx"> // The client ID for the CA layer in the plug-in process. Will be 0 if the plug-in is not a CA plug-in.
</span><span class="cx"> uint32_t m_remoteLayerClientID;
</span><span class="cx">
</span><del>- OwnPtr<PluginCreationParameters> m_pendingPluginCreationParameters;
</del><ins>+ std::unique_ptr<PluginCreationParameters> m_pendingPluginCreationParameters;
</ins><span class="cx"> bool m_waitingOnAsynchronousInitialization;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx"> return m_plugin->getSelectionString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-OwnPtr<WebEvent> PluginView::createWebEvent(MouseEvent* event) const
</del><ins>+std::unique_ptr<WebEvent> PluginView::createWebEvent(MouseEvent* event) const
</ins><span class="cx"> {
</span><span class="cx"> WebEvent::Type type = WebEvent::NoType;
</span><span class="cx"> unsigned clickCount = 1;
</span><span class="lines">@@ -871,7 +871,7 @@
</span><span class="cx"> if (event->metaKey())
</span><span class="cx"> modifiers |= WebEvent::MetaKey;
</span><span class="cx">
</span><del>- return adoptPtr(new WebMouseEvent(type, button, m_plugin->convertToRootView(IntPoint(event->offsetX(), event->offsetY())), event->screenLocation(), 0, 0, 0, clickCount, static_cast<WebEvent::Modifiers>(modifiers), 0));
</del><ins>+ return std::make_unique<WebMouseEvent>(type, button, m_plugin->convertToRootView(IntPoint(event->offsetX(), event->offsetY())), event->screenLocation(), 0, 0, 0, clickCount, static_cast<WebEvent::Modifiers>(modifiers), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PluginView::handleEvent(Event* event)
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const WebEvent* currentEvent = WebPage::currentEvent();
</span><del>- OwnPtr<WebEvent> simulatedWebEvent;
</del><ins>+ std::unique_ptr<WebEvent> simulatedWebEvent;
</ins><span class="cx"> if (event->isMouseEvent() && toMouseEvent(event)->isSimulated()) {
</span><span class="cx"> simulatedWebEvent = createWebEvent(toMouseEvent(event));
</span><span class="cx"> currentEvent = simulatedWebEvent.get();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <WebCore/ViewState.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><span class="lines">@@ -223,7 +224,7 @@
</span><span class="cx"> virtual void didFinishLoad(WebFrame*);
</span><span class="cx"> virtual void didFailLoad(WebFrame*, bool wasCancelled);
</span><span class="cx">
</span><del>- OwnPtr<WebEvent> createWebEvent(WebCore::MouseEvent*) const;
</del><ins>+ std::unique_ptr<WebEvent> createWebEvent(WebCore::MouseEvent*) const;
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebCore::HTMLPlugInElement> m_pluginElement;
</span><span class="cx"> RefPtr<Plugin> m_plugin;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPopupMenuh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "WebPopupItem.h"
</span><span class="cx"> #include <WebCore/PopupMenu.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> EventDispatcher::EventDispatcher()
</span><span class="cx"> : m_queue(WorkQueue::create("com.apple.WebKit.EventDispatcher"))
</span><del>- , m_recentWheelEventDeltaTracker(adoptPtr(new WheelEventDeltaTracker))
</del><ins>+ , m_recentWheelEventDeltaTracker(std::make_unique<WheelEventDeltaTracker>())
</ins><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> , m_touchEventsLock(SPINLOCK_INITIALIZER)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/WheelEventDeltaTracker.h>
</span><span class="cx"> #include <WebEvent.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="lines">@@ -94,7 +95,7 @@
</span><span class="cx"> Mutex m_scrollingTreesMutex;
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebCore::ThreadedScrollingTree>> m_scrollingTrees;
</span><span class="cx"> #endif
</span><del>- OwnPtr<WebCore::WheelEventDeltaTracker> m_recentWheelEventDeltaTracker;
</del><ins>+ std::unique_ptr<WebCore::WheelEventDeltaTracker> m_recentWheelEventDeltaTracker;
</ins><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> SpinLock m_touchEventsLock;
</span><span class="cx"> HashMap<uint64_t, TouchEventQueue> m_touchEvents;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> pageClients.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
</span><span class="cx">
</span><del>- m_page = adoptPtr(new Page(pageClients));
</del><ins>+ m_page = std::make_unique<Page>(pageClients);
</ins><span class="cx">
</span><span class="cx"> m_drawingArea = DrawingArea::create(this, parameters);
</span><span class="cx"> m_drawingArea->setPaintingEnabled(false);
</span><span class="lines">@@ -3548,7 +3548,7 @@
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> if (!m_printContext)
</span><del>- m_printContext = adoptPtr(new PrintContext(coreFrame));
</del><ins>+ m_printContext = std::make_unique<PrintContext>(coreFrame);
</ins><span class="cx">
</span><span class="cx"> drawingArea()->setLayerTreeStateIsFrozen(true);
</span><span class="cx"> m_printContext->begin(printInfo.availablePaperWidth, printInfo.availablePaperHeight);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> #include <WebCore/ViewState.h>
</span><span class="cx"> #include <WebCore/ViewportConfiguration.h>
</span><span class="cx"> #include <WebCore/WebCoreKeyboardUIMode.h>
</span><ins>+#include <memory>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/OwnPtr.h>
</del><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -994,7 +994,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t m_pageID;
</span><span class="cx">
</span><del>- OwnPtr<WebCore::Page> m_page;
</del><ins>+ std::unique_ptr<WebCore::Page> m_page;
</ins><span class="cx"> RefPtr<WebFrame> m_mainFrame;
</span><span class="cx"> RefPtr<InjectedBundleBackForwardList> m_backForwardList;
</span><span class="cx">
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx"> GeolocationPermissionRequestManager m_geolocationPermissionRequestManager;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- OwnPtr<WebCore::PrintContext> m_printContext;
</del><ins>+ std::unique_ptr<WebCore::PrintContext> m_printContext;
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> RefPtr<WebPrintOperationGtk> m_printOperation;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (167853 => 167854)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-04-27 11:53:43 UTC (rev 167853)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-04-27 13:40:14 UTC (rev 167854)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> template <typename T>
</span><span class="cx"> void addSupplement()
</span><span class="cx"> {
</span><del>- m_supplements.add(T::supplementName(), adoptPtr<WebProcessSupplement>(new T(this)));
</del><ins>+ m_supplements.add(T::supplementName(), std::make_unique<T>(this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebConnectionToUIProcess* webConnectionToUIProcess() const { return m_webConnection.get(); }
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx">
</span><span class="cx"> HashMap<uint64_t, WebFrame*> m_frameMap;
</span><span class="cx">
</span><del>- typedef HashMap<const char*, OwnPtr<WebProcessSupplement>, PtrHash<const char*>> WebProcessSupplementMap;
</del><ins>+ typedef HashMap<const char*, std::unique_ptr<WebProcessSupplement>, PtrHash<const char*>> WebProcessSupplementMap;
</ins><span class="cx"> WebProcessSupplementMap m_supplements;
</span><span class="cx">
</span><span class="cx"> TextCheckerState m_textCheckerState;
</span></span></pre>
</div>
</div>
</body>
</html>