Attachment 230243 Details for Bug 129670 – Patch for landing

[patch] Patch for landing

bug-129670-20140426062914.patch (text/plain), 46.94 KB, created by Zan Dobersek on 2014-04-26 06:29:38 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Zan Dobersek

Created: 2014-04-26 06:29:38 PDT

Size: 46.94 KB

patch

obsolete

>Index: Source/WebKit2/ChangeLog
>===================================================================
>--- Source/WebKit2/ChangeLog	(revision 167842)
>+++ Source/WebKit2/ChangeLog	(working copy)
>@@ -1,3 +1,92 @@
>+2014-04-25  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):
>+
> 2014-04-25  Dan Bernstein  <mitz@apple.com>
> 
>         [Cocoa] Synthesized getter for WKNavigationAction's _userInitiated property has the wrong name
>Index: Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp
>===================================================================
>--- Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp	(revision 167842)
>+++ Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp	(working copy)
>@@ -630,7 +630,7 @@ bool UniqueIDBDatabaseBackingStoreSQLite
> 
>     m_cursors.set(cursor->identifier(), cursor);
> 
>-    OwnPtr<JSLockHolder> locker;
>+    std::unique_ptr<JSLockHolder> locker;
>     while (!cursor->currentKey().isNull) {
>         const IDBKeyData& key = cursor->currentKey();
>         const Vector<uint8_t>& valueBuffer = cursor->currentValueBuffer();
>@@ -638,12 +638,12 @@ bool UniqueIDBDatabaseBackingStoreSQLite
>         if (!m_globalObject) {
>             ASSERT(!m_vm);
>             m_vm = VM::create();
>-            locker = adoptPtr(new JSLockHolder(m_vm.get()));
>+            locker = std::make_unique<JSLockHolder>(m_vm.get());
>             m_globalObject.set(*m_vm, JSGlobalObject::create(*m_vm, JSGlobalObject::createStructure(*m_vm, jsNull())));
>         }
> 
>         if (!locker)
>-            locker = adoptPtr(new JSLockHolder(m_vm.get()));
>+            locker = std::make_unique<JSLockHolder>(m_vm.get());
> 
>         Deprecated::ScriptValue value = deserializeIDBValueBuffer(m_globalObject->globalExec(), valueBuffer, true);
>         Vector<IDBKeyData> indexKeys;
>Index: Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h
>===================================================================
>--- Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h	(revision 167842)
>+++ Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.h	(working copy)
>@@ -31,7 +31,6 @@
> #include "UniqueIDBDatabase.h" 
> #include "UniqueIDBDatabaseBackingStore.h"
> #include <JavaScriptCore/Strong.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/text/WTFString.h>
> 
>Index: Source/WebKit2/NetworkProcess/NetworkProcess.h
>===================================================================
>--- Source/WebKit2/NetworkProcess/NetworkProcess.h	(revision 167842)
>+++ Source/WebKit2/NetworkProcess/NetworkProcess.h	(working copy)
>@@ -34,6 +34,7 @@
> #include "MessageReceiverMap.h"
> #include "NetworkResourceLoadScheduler.h"
> #include <WebCore/SessionID.h>
>+#include <memory>
> #include <wtf/Forward.h>
> #include <wtf/NeverDestroyed.h>
> 
>@@ -63,7 +64,7 @@ public:
>     template <typename T>
>     void addSupplement()
>     {
>-        m_supplements.add(T::supplementName(), adoptPtr<NetworkProcessSupplement>(new T(this)));
>+        m_supplements.add(T::supplementName(), std::make_unique<T>(this));
>     }
> 
>     void removeNetworkConnectionToWebProcess(NetworkConnectionToWebProcess*);
>@@ -134,7 +135,7 @@ private:
>     bool m_hasSetCacheModel;
>     CacheModel m_cacheModel;
> 
>-    typedef HashMap<const char*, OwnPtr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
>+    typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
>     NetworkProcessSupplementMap m_supplements;
> 
> #if PLATFORM(COCOA)
>Index: Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp
>===================================================================
>--- Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp	(revision 167842)
>+++ Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp	(working copy)
>@@ -88,7 +88,7 @@ void SynchronousNetworkLoaderClient::did
>     // It's unclear if the potential complexities of that approach are worth it.
>     
>     if (!m_responseData)
>-        m_responseData = adoptPtr(new Vector<char>);
>+        m_responseData = std::make_unique<Vector<char>>();
> 
>     m_responseData->append(buffer->data(), buffer->size());
> }
>Index: Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h
>===================================================================
>--- Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h	(revision 167842)
>+++ Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h	(working copy)
>@@ -31,6 +31,7 @@
> #include <WebCore/ResourceError.h>
> #include <WebCore/ResourceRequest.h>
> #include <WebCore/ResourceResponse.h>
>+#include <memory>
> #include <wtf/RefCounted.h>
> 
> #if ENABLE(NETWORK_PROCESS)
>@@ -66,7 +67,7 @@ private:
>     RefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply> m_delayedReply;
>     WebCore::ResourceResponse m_response;
>     WebCore::ResourceError m_error;
>-    OwnPtr<Vector<char>> m_responseData;
>+    std::unique_ptr<Vector<char>> m_responseData;
> };
> 
> } // namespace WebKit
>Index: Source/WebKit2/Platform/WorkQueue.h
>===================================================================
>--- Source/WebKit2/Platform/WorkQueue.h	(revision 167842)
>+++ Source/WebKit2/Platform/WorkQueue.h	(working copy)
>@@ -36,7 +36,6 @@
> #include <wtf/Forward.h>
> #include <wtf/Functional.h>
> #include <wtf/HashMap.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/RefCounted.h>
> #include <wtf/Threading.h>
> #include <wtf/Vector.h>
>Index: Source/WebKit2/Platform/IPC/Connection.cpp
>===================================================================
>--- Source/WebKit2/Platform/IPC/Connection.cpp	(revision 167842)
>+++ Source/WebKit2/Platform/IPC/Connection.cpp	(working copy)
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "Connection.h"
> 
>+#include <memory>
> #include <wtf/CurrentTime.h>
> #include <wtf/HashSet.h>
> #include <wtf/NeverDestroyed.h>
>@@ -277,7 +278,7 @@ void Connection::removeWorkQueueMessageR
> 
> void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver* workQueueMessageReceiver, MessageDecoder* incomingMessageDecoder)
> {
>-    OwnPtr<MessageDecoder> decoder = adoptPtr(incomingMessageDecoder);
>+    std::unique_ptr<MessageDecoder> decoder(incomingMessageDecoder);
> 
>     if (!decoder->isSyncMessage()) {
>         workQueueMessageReceiver->didReceiveMessage(this, *decoder);
>Index: Source/WebKit2/Platform/IPC/Connection.h
>===================================================================
>--- Source/WebKit2/Platform/IPC/Connection.h	(revision 167842)
>+++ Source/WebKit2/Platform/IPC/Connection.h	(working copy)
>@@ -38,7 +38,6 @@
> #include <wtf/Deque.h>
> #include <wtf/Forward.h>
> #include <wtf/PassRefPtr.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/text/CString.h>
> 
> #if OS(DARWIN)
>Index: Source/WebKit2/Platform/IPC/MessageReceiver.h
>===================================================================
>--- Source/WebKit2/Platform/IPC/MessageReceiver.h	(revision 167842)
>+++ Source/WebKit2/Platform/IPC/MessageReceiver.h	(working copy)
>@@ -27,7 +27,6 @@
> #define MessageReceiver_h
> 
> #include <wtf/Assertions.h>
>-#include <wtf/OwnPtr.h>
> 
> namespace IPC {
> 
>Index: Source/WebKit2/Platform/efl/ModuleEfl.cpp
>===================================================================
>--- Source/WebKit2/Platform/efl/ModuleEfl.cpp	(revision 167842)
>+++ Source/WebKit2/Platform/efl/ModuleEfl.cpp	(working copy)
>@@ -20,8 +20,6 @@
> #include "config.h"
> #include "Module.h"
> 
>-#include <wtf/OwnPtr.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/text/CString.h>
> 
> namespace WebKit {
>Index: Source/WebKit2/Platform/mac/LayerHostingContext.mm
>===================================================================
>--- Source/WebKit2/Platform/mac/LayerHostingContext.mm	(revision 167842)
>+++ Source/WebKit2/Platform/mac/LayerHostingContext.mm	(working copy)
>@@ -26,7 +26,6 @@
> #import "config.h"
> #import "LayerHostingContext.h"
> 
>-#import <wtf/OwnPtr.h>
> #import <WebKitSystemInterface.h>
> 
> #if __has_include(<QuartzCore/QuartzCorePrivate.h>)
>Index: Source/WebKit2/Shared/APIURL.h
>===================================================================
>--- Source/WebKit2/Shared/APIURL.h	(revision 167842)
>+++ Source/WebKit2/Shared/APIURL.h	(working copy)
>@@ -29,8 +29,6 @@
> #include "APIObject.h"
> #include "WebCoreArgumentCoders.h"
> #include <WebCore/URL.h>
>-#include <wtf/OwnPtr.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/text/WTFString.h>
> 
>Index: Source/WebKit2/Shared/ShareableBitmap.h
>===================================================================
>--- Source/WebKit2/Shared/ShareableBitmap.h	(revision 167842)
>+++ Source/WebKit2/Shared/ShareableBitmap.h	(working copy)
>@@ -28,7 +28,6 @@
> 
> #include "SharedMemory.h"
> #include <WebCore/IntRect.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/RefCounted.h>
> #include <wtf/RefPtr.h>
>Index: Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h
>===================================================================
>--- Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h	(revision 167842)
>+++ Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h	(working copy)
>@@ -40,6 +40,8 @@
> #include <wtf/RetainPtr.h>
> #include <wtf/Threading.h>
> OBJC_CLASS WKCustomProtocol;
>+#else
>+#include "CustomProtocolManagerImpl.h"
> #endif
> 
> 
>@@ -55,7 +57,6 @@ class ResourceResponse;
> namespace WebKit {
> 
> class ChildProcess;
>-class CustomProtocolManagerImpl;
> struct NetworkProcessCreationParameters;
> 
> class CustomProtocolManager : public WebProcessSupplement, public NetworkProcessSupplement, public IPC::Connection::WorkQueueMessageReceiver {
>Index: Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp
>===================================================================
>--- Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp	(revision 167842)
>+++ Source/WebKit2/Shared/Plugins/NPRemoteObjectMap.cpp	(working copy)
>@@ -32,7 +32,6 @@
> #include "NPObjectProxy.h"
> #include "NPRuntimeUtilities.h"
> #include "NPVariantData.h"
>-#include <wtf/OwnPtr.h>
> 
> namespace WebKit {
> 
>Index: Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h
>===================================================================
>--- Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/DrawingAreaProxyImpl.h	(working copy)
>@@ -29,7 +29,6 @@
> #include "BackingStore.h"
> #include "DrawingAreaProxy.h"
> #include "LayerTreeContext.h"
>-#include <wtf/OwnPtr.h>
> #include <wtf/RunLoop.h>
> 
> namespace WebCore {
>Index: Source/WebKit2/UIProcess/WebPageProxy.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/WebPageProxy.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/WebPageProxy.cpp	(working copy)
>@@ -171,21 +171,21 @@ public:
> 
>     static ExceededDatabaseQuotaRecords& shared();
> 
>-    PassOwnPtr<Record> createRecord(uint64_t frameID, String originIdentifier,
>+    std::unique_ptr<Record> createRecord(uint64_t frameID, String originIdentifier,
>         String databaseName, String displayName, uint64_t currentQuota,
>         uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, 
>         PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply>);
> 
>-    void add(PassOwnPtr<Record>);
>-    bool areBeingProcessed() const { return m_currentRecord; }
>+    void add(std::unique_ptr<Record>);
>+    bool areBeingProcessed() const { return !!m_currentRecord; }
>     Record* next();
> 
> private:
>     ExceededDatabaseQuotaRecords() { }
>     ~ExceededDatabaseQuotaRecords() { }
> 
>-    Deque<OwnPtr<Record>> m_records;
>-    OwnPtr<Record> m_currentRecord;
>+    Deque<std::unique_ptr<Record>> m_records;
>+    std::unique_ptr<Record> m_currentRecord;
> };
> 
> ExceededDatabaseQuotaRecords& ExceededDatabaseQuotaRecords::shared()
>@@ -194,12 +194,12 @@ ExceededDatabaseQuotaRecords& ExceededDa
>     return records;
> }
> 
>-PassOwnPtr<ExceededDatabaseQuotaRecords::Record> ExceededDatabaseQuotaRecords::createRecord(
>+std::unique_ptr<ExceededDatabaseQuotaRecords::Record> ExceededDatabaseQuotaRecords::createRecord(
>     uint64_t frameID, String originIdentifier, String databaseName, String displayName,
>     uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage,
>     uint64_t expectedUsage, PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply> reply)
> {
>-    OwnPtr<Record> record = adoptPtr(new Record);
>+    auto record = std::make_unique<Record>();
>     record->frameID = frameID;
>     record->originIdentifier = originIdentifier;
>     record->databaseName = databaseName;
>@@ -209,17 +209,17 @@ PassOwnPtr<ExceededDatabaseQuotaRecords:
>     record->currentDatabaseUsage = currentDatabaseUsage;
>     record->expectedUsage = expectedUsage;
>     record->reply = reply;
>-    return record.release();
>+    return std::move(record);
> }
> 
>-void ExceededDatabaseQuotaRecords::add(PassOwnPtr<ExceededDatabaseQuotaRecords::Record> record)
>+void ExceededDatabaseQuotaRecords::add(std::unique_ptr<ExceededDatabaseQuotaRecords::Record> record)
> {
>-    m_records.append(record);
>+    m_records.append(std::move(record));
> }
> 
> ExceededDatabaseQuotaRecords::Record* ExceededDatabaseQuotaRecords::next()
> {
>-    m_currentRecord.clear();
>+    m_currentRecord = nullptr;
>     if (!m_records.isEmpty())
>         m_currentRecord = m_records.takeFirst();
>     return m_currentRecord.get();
>@@ -1264,7 +1264,7 @@ void WebPageProxy::handleMouseEvent(cons
>         m_process->responsivenessTimer()->start();
>     else {
>         if (m_processingMouseMoveEvent) {
>-            m_nextMouseMoveEvent = adoptPtr(new NativeWebMouseEvent(event));
>+            m_nextMouseMoveEvent = std::make_unique<NativeWebMouseEvent>(event);
>             return;
>         }
> 
>@@ -1276,7 +1276,7 @@ void WebPageProxy::handleMouseEvent(cons
>     // we fake a mouse up event by using this stored down event. This event gets cleared
>     // when the mouse up message is received from WebProcess.
>     if (event.type() == WebEvent::MouseDown)
>-        m_currentlyProcessedMouseDownEvent = adoptPtr(new NativeWebMouseEvent(event));
>+        m_currentlyProcessedMouseDownEvent = std::make_unique<NativeWebMouseEvent>(event);
> 
>     if (m_shouldSendEventsSynchronously) {
>         bool handled = false;
>@@ -1372,17 +1372,17 @@ void WebPageProxy::handleWheelEvent(cons
>         return;
>     }
> 
>-    OwnPtr<Vector<NativeWebWheelEvent>> coalescedWheelEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
>+    auto coalescedWheelEvent = std::make_unique<Vector<NativeWebWheelEvent>>();
>     coalescedWheelEvent->append(event);
>-    m_currentlyProcessedWheelEvents.append(coalescedWheelEvent.release());
>+    m_currentlyProcessedWheelEvents.append(std::move(coalescedWheelEvent));
>     sendWheelEvent(event);
> }
> 
> void WebPageProxy::processNextQueuedWheelEvent()
> {
>-    OwnPtr<Vector<NativeWebWheelEvent>> nextCoalescedEvent = adoptPtr(new Vector<NativeWebWheelEvent>);
>+    auto nextCoalescedEvent = std::make_unique<Vector<NativeWebWheelEvent>>();
>     WebWheelEvent nextWheelEvent = coalescedWheelEvent(m_wheelEventQueue, *nextCoalescedEvent.get());
>-    m_currentlyProcessedWheelEvents.append(nextCoalescedEvent.release());
>+    m_currentlyProcessedWheelEvents.append(std::move(nextCoalescedEvent));
>     sendWheelEvent(nextWheelEvent);
> }
> 
>@@ -3787,7 +3787,7 @@ void WebPageProxy::didReceiveEvent(uint3
>     case WebEvent::Wheel: {
>         MESSAGE_CHECK(!m_currentlyProcessedWheelEvents.isEmpty());
> 
>-        OwnPtr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
>+        std::unique_ptr<Vector<NativeWebWheelEvent>> oldestCoalescedEvent = m_currentlyProcessedWheelEvents.takeFirst();
> 
>         // FIXME: Dispatch additional events to the didNotHandleWheelEvent client function.
>         if (!handled) {
>@@ -4301,10 +4301,10 @@ void WebPageProxy::didReceiveAuthenticat
> 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)
> {
>     ExceededDatabaseQuotaRecords& records = ExceededDatabaseQuotaRecords::shared();
>-    OwnPtr<ExceededDatabaseQuotaRecords::Record> newRecord =  records.createRecord(frameID,
>+    std::unique_ptr<ExceededDatabaseQuotaRecords::Record> newRecord = records.createRecord(frameID,
>         originIdentifier, databaseName, displayName, currentQuota, currentOriginUsage,
>         currentDatabaseUsage, expectedUsage, reply);
>-    records.add(newRecord.release());
>+    records.add(std::move(newRecord));
> 
>     if (records.areBeingProcessed())
>         return;
>Index: Source/WebKit2/UIProcess/WebPageProxy.h
>===================================================================
>--- Source/WebKit2/UIProcess/WebPageProxy.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/WebPageProxy.h	(working copy)
>@@ -68,10 +68,9 @@
> #include <WebCore/TextChecking.h>
> #include <WebCore/TextGranularity.h>
> #include <WebCore/ViewState.h>
>+#include <memory>
> #include <wtf/HashMap.h>
> #include <wtf/HashSet.h>
>-#include <wtf/OwnPtr.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/Ref.h>
> #include <wtf/RefPtr.h>
>@@ -1554,11 +1553,11 @@ private:
> 
>     Deque<NativeWebKeyboardEvent> m_keyEventQueue;
>     Deque<NativeWebWheelEvent> m_wheelEventQueue;
>-    Deque<OwnPtr<Vector<NativeWebWheelEvent>>> m_currentlyProcessedWheelEvents;
>+    Deque<std::unique_ptr<Vector<NativeWebWheelEvent>>> m_currentlyProcessedWheelEvents;
> 
>     bool m_processingMouseMoveEvent;
>-    OwnPtr<NativeWebMouseEvent> m_nextMouseMoveEvent;
>-    OwnPtr<NativeWebMouseEvent> m_currentlyProcessedMouseDownEvent;
>+    std::unique_ptr<NativeWebMouseEvent> m_nextMouseMoveEvent;
>+    std::unique_ptr<NativeWebMouseEvent> m_currentlyProcessedMouseDownEvent;
> 
> #if ENABLE(TOUCH_EVENTS)
>     bool m_isTrackingTouchEvents;
>Index: Source/WebKit2/UIProcess/WebProcessProxy.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/WebProcessProxy.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/WebProcessProxy.cpp	(working copy)
>@@ -545,7 +545,7 @@ DownloadProxy* WebProcessProxy::createDo
> #endif
> 
>     if (!m_downloadProxyMap)
>-        m_downloadProxyMap = adoptPtr(new DownloadProxyMap(this));
>+        m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
> 
>     return m_downloadProxyMap->createDownloadProxy(m_context.get());
> }
>Index: Source/WebKit2/UIProcess/WebProcessProxy.h
>===================================================================
>--- Source/WebKit2/UIProcess/WebProcessProxy.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/WebProcessProxy.h	(working copy)
>@@ -37,6 +37,7 @@
> #include "WebPageProxy.h"
> #include "WebProcessProxyMessages.h"
> #include <WebCore/LinkHash.h>
>+#include <memory>
> #include <wtf/Forward.h>
> #include <wtf/HashMap.h>
> #include <wtf/PassRefPtr.h>
>@@ -204,7 +205,7 @@ private:
>     WebFrameProxyMap m_frameMap;
>     WebBackForwardListItemMap m_backForwardListItemMap;
> 
>-    OwnPtr<DownloadProxyMap> m_downloadProxyMap;
>+    std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
> 
> #if ENABLE(CUSTOM_PROTOCOLS)
>     CustomProtocolManagerProxy m_customProtocolManagerProxy;
>Index: Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.cpp	(working copy)
>@@ -32,7 +32,6 @@
> 
> #include "WebSocketServerConnection.h"
> #include <WebCore/SocketStreamHandle.h>
>-#include <wtf/PassOwnPtr.h>
> 
> using namespace WebCore;
> 
>@@ -78,20 +77,20 @@ void WebSocketServer::close()
>     m_bindAddress = String();
> }
> 
>-void WebSocketServer::didAcceptConnection(PassOwnPtr<WebSocketServerConnection> connection)
>+void WebSocketServer::didAcceptConnection(std::unique_ptr<WebSocketServerConnection> connection)
> {
>-    m_connections.append(connection);
>+    m_connections.append(std::move(connection));
> }
> 
> void WebSocketServer::didCloseWebSocketServerConnection(WebSocketServerConnection* connection)
> {
>-    Deque<OwnPtr<WebSocketServerConnection> >::iterator end = m_connections.end();
>-    for (Deque<OwnPtr<WebSocketServerConnection> >::iterator it = m_connections.begin(); it != end; ++it) {
>+    for (auto it = m_connections.begin(), end = m_connections.end(); it != end; ++it) {
>         if (it->get() == connection) {
>             m_connections.remove(it);
>             return;
>         }
>     }
>+
>     ASSERT_NOT_REACHED();
> }
> 
>Index: Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h
>===================================================================
>--- Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h	(working copy)
>@@ -29,8 +29,8 @@
> 
> #if ENABLE(INSPECTOR_SERVER)
> 
>+#include <memory>
> #include <wtf/Deque.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/text/WTFString.h>
> 
> #if USE(SOUP)
>@@ -61,7 +61,7 @@ public:
>     void close();
> 
>     WebSocketServerClient* client() const { return m_client; }
>-    void didAcceptConnection(PassOwnPtr<WebSocketServerConnection>);
>+    void didAcceptConnection(std::unique_ptr<WebSocketServerConnection>);
> 
> private:
>     void didCloseWebSocketServerConnection(WebSocketServerConnection*);
>@@ -71,7 +71,7 @@ private:
>     void platformClose();
> 
>     ServerState m_state;
>-    Deque<OwnPtr<WebSocketServerConnection> > m_connections;
>+    Deque<std::unique_ptr<WebSocketServerConnection>> m_connections;
>     WebSocketServerClient* m_client;
>     String m_bindAddress;
>     unsigned short m_port;
>Index: Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp	(working copy)
>@@ -31,7 +31,6 @@
> #include <WebCore/SocketStreamHandle.h>
> #include <gio/gio.h>
> #include <glib.h>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/gobject/GUniquePtr.h>
> #include <wtf/text/CString.h>
> 
>@@ -47,9 +46,9 @@ static gboolean connectionCallback(GSock
>     LOG(InspectorServer, "New Connection from %s:%d.", addressString.get(), g_inet_socket_address_get_port(G_INET_SOCKET_ADDRESS(socketAddress.get())));
> #endif
> 
>-    OwnPtr<WebSocketServerConnection> webSocketConnection = adoptPtr(new WebSocketServerConnection(server->client(), server));
>+    auto webSocketConnection = std::make_unique<WebSocketServerConnection>(server->client(), server);
>     webSocketConnection->setSocketHandle(SocketStreamHandle::create(connection, webSocketConnection.get()));
>-    server->didAcceptConnection(webSocketConnection.release());
>+    server->didAcceptConnection(std::move(webSocketConnection));
> 
>     return TRUE;
> }
>Index: Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp	(working copy)
>@@ -100,7 +100,7 @@ void NetworkProcessProxy::getNetworkProc
> DownloadProxy* NetworkProcessProxy::createDownloadProxy()
> {
>     if (!m_downloadProxyMap)
>-        m_downloadProxyMap = adoptPtr(new DownloadProxyMap(this));
>+        m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
> 
>     return m_downloadProxyMap->createDownloadProxy(m_webContext);
> }
>Index: Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h
>===================================================================
>--- Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h	(working copy)
>@@ -31,6 +31,7 @@
> #include "ChildProcessProxy.h"
> #include "ProcessLauncher.h"
> #include "WebProcessProxyMessages.h"
>+#include <memory>
> #include <wtf/Deque.h>
> 
> #if ENABLE(CUSTOM_PROTOCOLS)
>@@ -91,7 +92,7 @@ private:
>     unsigned m_numPendingConnectionRequests;
>     Deque<RefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>> m_pendingConnectionReplies;
> 
>-    OwnPtr<DownloadProxyMap> m_downloadProxyMap;
>+    std::unique_ptr<DownloadProxyMap> m_downloadProxyMap;
> 
> #if ENABLE(CUSTOM_PROTOCOLS)
>     CustomProtocolManagerProxy m_customProtocolManagerProxy;
>Index: Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
>===================================================================
>--- Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h	(working copy)
>@@ -32,7 +32,6 @@
> #include "WebNotificationProvider.h"
> #include <WebCore/NotificationClient.h>
> #include <wtf/HashMap.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/text/StringHash.h>
> 
>Index: Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp	(working copy)
>@@ -153,7 +153,7 @@ void WebPluginSiteDataManager::getSitesW
>     ASSERT(!m_pendingGetSitesWithData.contains(callbackID));
> 
>     GetSitesWithDataState* state = new GetSitesWithDataState(this, callbackID);
>-    m_pendingGetSitesWithData.set(callbackID, adoptPtr(state));
>+    m_pendingGetSitesWithData.set(callbackID, std::unique_ptr<GetSitesWithDataState>(state));
>     state->getSitesWithDataForNextPlugin();
> }
> 
>@@ -197,7 +197,7 @@ void WebPluginSiteDataManager::clearSite
>     ASSERT(!m_pendingClearSiteData.contains(callbackID));
> 
>     ClearSiteDataState* state = new ClearSiteDataState(this, sitesVector, flags, maxAgeInSeconds, callbackID);
>-    m_pendingClearSiteData.set(callbackID, adoptPtr(state));
>+    m_pendingClearSiteData.set(callbackID, std::unique_ptr<ClearSiteDataState>(state));
>     state->clearSiteDataForNextPlugin();
> }
> 
>@@ -222,7 +222,7 @@ void WebPluginSiteDataManager::didGetSit
> 
> void WebPluginSiteDataManager::didGetSitesWithDataForAllPlugins(const Vector<String>& sites, uint64_t callbackID)
> {
>-    OwnPtr<GetSitesWithDataState> state = m_pendingGetSitesWithData.take(callbackID);
>+    std::unique_ptr<GetSitesWithDataState> state = m_pendingGetSitesWithData.take(callbackID);
>     ASSERT(state);
> 
>     didGetSitesWithData(sites, callbackID);
>@@ -238,7 +238,7 @@ void WebPluginSiteDataManager::didClearS
> 
> void WebPluginSiteDataManager::didClearSiteDataForAllPlugins(uint64_t callbackID)
> {
>-    OwnPtr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID);
>+    std::unique_ptr<ClearSiteDataState> state = m_pendingClearSiteData.take(callbackID);
>     ASSERT(state);
> 
>     didClearSiteData(callbackID);
>Index: Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
>===================================================================
>--- Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h	(revision 167842)
>+++ Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h	(working copy)
>@@ -31,6 +31,7 @@
> #include "APIObject.h"
> #include "Arguments.h"
> #include "GenericCallback.h"
>+#include <memory>
> #include <wtf/HashMap.h>
> #include <wtf/PassRefPtr.h>
> 
>@@ -69,10 +70,10 @@ private:
>     void didClearSiteDataForAllPlugins(uint64_t callbackID);
> 
>     class GetSitesWithDataState;
>-    HashMap<uint64_t, OwnPtr<GetSitesWithDataState>> m_pendingGetSitesWithData;
>+    HashMap<uint64_t, std::unique_ptr<GetSitesWithDataState>> m_pendingGetSitesWithData;
> 
>     class ClearSiteDataState;
>-    HashMap<uint64_t, OwnPtr<ClearSiteDataState>> m_pendingClearSiteData;
>+    HashMap<uint64_t, std::unique_ptr<ClearSiteDataState>> m_pendingClearSiteData;
> };
> 
> } // namespace WebKit
>Index: Source/WebKit2/UIProcess/Storage/StorageManager.cpp
>===================================================================
>--- Source/WebKit2/UIProcess/Storage/StorageManager.cpp	(revision 167842)
>+++ Source/WebKit2/UIProcess/Storage/StorageManager.cpp	(working copy)
>@@ -37,6 +37,7 @@
> #include <WebCore/SecurityOriginHash.h>
> #include <WebCore/StorageMap.h>
> #include <WebCore/TextEncoding.h>
>+#include <memory>
> 
> using namespace WebCore;
> 
>@@ -631,14 +632,14 @@ StorageManager::LocalStorageNamespace* S
> 
> static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin>>* securityOriginsPtr)
> {
>-    OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(securityOriginsPtr);
>+    std::unique_ptr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins(securityOriginsPtr);
>     callbackFunction(*securityOrigins, context);
> }
> 
> void StorageManager::getOriginsInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context))
> {
>-    OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(new Vector<RefPtr<WebCore::SecurityOrigin>>(m_localStorageDatabaseTracker->origins()));
>-    dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.leakPtr()));
>+    auto securityOrigins = std::make_unique<Vector<RefPtr<WebCore::SecurityOrigin>>>(m_localStorageDatabaseTracker->origins());
>+    dispatcher->dispatch(bind(callCallbackFunction, context, callbackFunction, securityOrigins.release()));
> }
> 
> void StorageManager::getStorageDetailsByOriginInternal(FunctionDispatcher* dispatcher, void* context, void (*callbackFunction)(const Vector<LocalStorageDetails>& storageDetails, void* context))
>Index: Source/WebKit2/WebProcess/WebProcess.h
>===================================================================
>--- Source/WebKit2/WebProcess/WebProcess.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/WebProcess.h	(working copy)
>@@ -99,7 +99,7 @@ public:
>     template <typename T>
>     void addSupplement()
>     {
>-        m_supplements.add(T::supplementName(), adoptPtr<WebProcessSupplement>(new T(this)));
>+        m_supplements.add(T::supplementName(), std::make_unique<T>(this));
>     }
> 
>     WebConnectionToUIProcess* webConnectionToUIProcess() const { return m_webConnection.get(); }
>@@ -302,7 +302,7 @@ private:
> 
>     HashMap<uint64_t, WebFrame*> m_frameMap;
> 
>-    typedef HashMap<const char*, OwnPtr<WebProcessSupplement>, PtrHash<const char*>> WebProcessSupplementMap;
>+    typedef HashMap<const char*, std::unique_ptr<WebProcessSupplement>, PtrHash<const char*>> WebProcessSupplementMap;
>     WebProcessSupplementMap m_supplements;
> 
>     TextCheckerState m_textCheckerState;
>Index: Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h	(working copy)
>@@ -52,8 +52,6 @@ public:
>     PluginProcessConnection* getPluginProcessConnection(uint64_t pluginProcessToken);
>     void removePluginProcessConnection(PluginProcessConnection*);
> 
>-    void didReceivePluginProcessConnectionManagerMessageOnConnectionWorkQueue(IPC::Connection*, OwnPtr<IPC::MessageDecoder>&);
>-
> private:
>     PluginProcessConnectionManager();
> 
>Index: Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/PluginProxy.cpp	(working copy)
>@@ -96,7 +96,7 @@ bool PluginProxy::initialize(const Param
>     m_connection->addPluginProxy(this);
> 
>     // Ask the plug-in process to create a plug-in.
>-    m_pendingPluginCreationParameters = adoptPtr(new PluginCreationParameters);
>+    m_pendingPluginCreationParameters = std::make_unique<PluginCreationParameters>();
> 
>     m_pendingPluginCreationParameters->pluginInstanceID = m_pluginInstanceID;
>     m_pendingPluginCreationParameters->windowNPObjectID = windowNPObjectID();
>@@ -170,7 +170,7 @@ void PluginProxy::didCreatePluginInterna
> 
>     // Whether synchronously or asynchronously, this plug-in was created and we shouldn't need to remember
>     // anything about how.
>-    m_pendingPluginCreationParameters.clear();
>+    m_pendingPluginCreationParameters = nullptr;
>     m_waitingOnAsynchronousInitialization = false;
> }
> 
>@@ -184,7 +184,7 @@ void PluginProxy::didFailToCreatePluginI
> 
>     // Whether synchronously or asynchronously, this plug-in failed to create and we shouldn't need to remember
>     // anything about how.
>-    m_pendingPluginCreationParameters.clear();
>+    m_pendingPluginCreationParameters = nullptr;
>     m_waitingOnAsynchronousInitialization = false;
> }
> 
>Index: Source/WebKit2/WebProcess/Plugins/PluginProxy.h
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/PluginProxy.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/PluginProxy.h	(working copy)
>@@ -35,6 +35,7 @@
> #include <WebCore/FindOptions.h>
> #include <WebCore/IntRect.h>
> #include <WebCore/SecurityOrigin.h>
>+#include <memory>
> 
> #if PLATFORM(COCOA)
> #include <wtf/RetainPtr.h>
>@@ -215,7 +216,7 @@ private:
>     // 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.
>     uint32_t m_remoteLayerClientID;
>     
>-    OwnPtr<PluginCreationParameters> m_pendingPluginCreationParameters;
>+    std::unique_ptr<PluginCreationParameters> m_pendingPluginCreationParameters;
>     bool m_waitingOnAsynchronousInitialization;
> 
> #if PLATFORM(COCOA)
>Index: Source/WebKit2/WebProcess/Plugins/PluginView.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/PluginView.cpp	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/PluginView.cpp	(working copy)
>@@ -829,7 +829,7 @@ String PluginView::getSelectionString()
>     return m_plugin->getSelectionString();
> }
> 
>-OwnPtr<WebEvent> PluginView::createWebEvent(MouseEvent* event) const
>+std::unique_ptr<WebEvent> PluginView::createWebEvent(MouseEvent* event) const
> {
>     WebEvent::Type type = WebEvent::NoType;
>     unsigned clickCount = 1;
>@@ -871,7 +871,7 @@ OwnPtr<WebEvent> PluginView::createWebEv
>     if (event->metaKey())
>         modifiers |= WebEvent::MetaKey;
> 
>-    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));
>+    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);
> }
> 
> void PluginView::handleEvent(Event* event)
>@@ -880,7 +880,7 @@ void PluginView::handleEvent(Event* even
>         return;
> 
>     const WebEvent* currentEvent = WebPage::currentEvent();
>-    OwnPtr<WebEvent> simulatedWebEvent;
>+    std::unique_ptr<WebEvent> simulatedWebEvent;
>     if (event->isMouseEvent() && toMouseEvent(event)->isSimulated()) {
>         simulatedWebEvent = createWebEvent(toMouseEvent(event));
>         currentEvent = simulatedWebEvent.get();
>Index: Source/WebKit2/WebProcess/Plugins/PluginView.h
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/PluginView.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/PluginView.h	(working copy)
>@@ -39,6 +39,7 @@
> #include <WebCore/ResourceResponse.h>
> #include <WebCore/Timer.h>
> #include <WebCore/ViewState.h>
>+#include <memory>
> #include <wtf/Deque.h>
> #include <wtf/RunLoop.h>
> 
>@@ -223,7 +224,7 @@ private:
>     virtual void didFinishLoad(WebFrame*);
>     virtual void didFailLoad(WebFrame*, bool wasCancelled);
> 
>-    OwnPtr<WebEvent> createWebEvent(WebCore::MouseEvent*) const;
>+    std::unique_ptr<WebEvent> createWebEvent(WebCore::MouseEvent*) const;
> 
>     RefPtr<WebCore::HTMLPlugInElement> m_pluginElement;
>     RefPtr<Plugin> m_plugin;
>Index: Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp	(working copy)
>@@ -36,6 +36,7 @@
> #include <WebCore/NotImplemented.h>
> #include <WebCore/ProtectionSpace.h>
> #include <WebCore/SharedBuffer.h>
>+#include <memory>
> #include <utility>
> #include <wtf/text/StringBuilder.h>
> 
>@@ -49,11 +50,11 @@ public:
>     explicit PluginDestructionProtector(NetscapePlugin* plugin)
>     {
>         if (plugin)
>-            m_protector = adoptPtr(new PluginController::PluginDestructionProtector(static_cast<Plugin*>(plugin)->controller()));
>+            m_protector = std::make_unique<PluginController::PluginDestructionProtector>(static_cast<Plugin*>(plugin)->controller());
>     }
>     
> private:
>-    OwnPtr<PluginController::PluginDestructionProtector> m_protector;
>+    std::unique_ptr<PluginController::PluginDestructionProtector> m_protector;
> };
> 
> static bool startsWithBlankLine(const char* bytes, unsigned length)
>Index: Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp	(working copy)
>@@ -30,7 +30,6 @@
> 
> #include "NetscapePlugin.h"
> #include <utility>
>-#include <wtf/PassOwnPtr.h>
> #include <wtf/Vector.h>
> 
> using namespace WebCore;
>@@ -187,7 +186,7 @@ void NetscapePluginStream::deliverData(c
> 
>     if (m_transferMode != NP_ASFILEONLY) {
>         if (!m_deliveryData)
>-            m_deliveryData = adoptPtr(new Vector<uint8_t>);
>+            m_deliveryData = std::make_unique<Vector<uint8_t>>();
> 
>         m_deliveryData->reserveCapacity(m_deliveryData->size() + length);
>         m_deliveryData->append(bytes, length);
>Index: Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h
>===================================================================
>--- Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h	(working copy)
>@@ -30,6 +30,7 @@
> 
> #include <WebCore/FileSystem.h>
> #include <WebCore/npruntime_internal.h>
>+#include <memory>
> #include <wtf/Forward.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/RefCounted.h>
>@@ -106,7 +107,7 @@ private:
>     CString m_headers;
> 
>     RunLoop::Timer<NetscapePluginStream> m_deliveryDataTimer;
>-    OwnPtr< Vector<uint8_t>> m_deliveryData;
>+    std::unique_ptr<Vector<uint8_t>> m_deliveryData;
>     bool m_stopStreamWhenDoneDelivering;
> };
> 
>Index: Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h
>===================================================================
>--- Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/WebCoreSupport/WebPopupMenu.h	(working copy)
>@@ -25,7 +25,6 @@
> #include "WebPopupItem.h"
> #include <WebCore/PopupMenu.h>
> #include <wtf/Forward.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/Vector.h>
> 
> namespace WebCore {
>Index: Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp	(revision 167842)
>+++ Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp	(working copy)
>@@ -53,7 +53,7 @@ PassRefPtr<EventDispatcher> EventDispatc
> 
> EventDispatcher::EventDispatcher()
>     : m_queue(WorkQueue::create("com.apple.WebKit.EventDispatcher"))
>-    , m_recentWheelEventDeltaTracker(adoptPtr(new WheelEventDeltaTracker))
>+    , m_recentWheelEventDeltaTracker(std::make_unique<WheelEventDeltaTracker>())
> #if ENABLE(IOS_TOUCH_EVENTS)
>     , m_touchEventsLock(SPINLOCK_INITIALIZER)
> #endif
>Index: Source/WebKit2/WebProcess/WebPage/EventDispatcher.h
>===================================================================
>--- Source/WebKit2/WebProcess/WebPage/EventDispatcher.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/WebPage/EventDispatcher.h	(working copy)
>@@ -30,6 +30,7 @@
> 
> #include <WebCore/WheelEventDeltaTracker.h>
> #include <WebEvent.h>
>+#include <memory>
> #include <wtf/HashMap.h>
> #include <wtf/Noncopyable.h>
> #include <wtf/RefPtr.h>
>@@ -94,7 +95,7 @@ private:
>     Mutex m_scrollingTreesMutex;
>     HashMap<uint64_t, RefPtr<WebCore::ThreadedScrollingTree>> m_scrollingTrees;
> #endif
>-    OwnPtr<WebCore::WheelEventDeltaTracker> m_recentWheelEventDeltaTracker;
>+    std::unique_ptr<WebCore::WheelEventDeltaTracker> m_recentWheelEventDeltaTracker;
> #if ENABLE(IOS_TOUCH_EVENTS)
>     SpinLock m_touchEventsLock;
>     HashMap<uint64_t, TouchEventQueue> m_touchEvents;
>Index: Source/WebKit2/WebProcess/WebPage/WebPage.cpp
>===================================================================
>--- Source/WebKit2/WebProcess/WebPage/WebPage.cpp	(revision 167842)
>+++ Source/WebKit2/WebProcess/WebPage/WebPage.cpp	(working copy)
>@@ -339,7 +339,7 @@ WebPage::WebPage(uint64_t pageID, const
> 
>     pageClients.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
> 
>-    m_page = adoptPtr(new Page(pageClients));
>+    m_page = std::make_unique<Page>(pageClients);
> 
>     m_drawingArea = DrawingArea::create(this, parameters);
>     m_drawingArea->setPaintingEnabled(false);
>@@ -3548,7 +3548,7 @@ void WebPage::beginPrinting(uint64_t fra
> #endif // PLATFORM(MAC)
> 
>     if (!m_printContext)
>-        m_printContext = adoptPtr(new PrintContext(coreFrame));
>+        m_printContext = std::make_unique<PrintContext>(coreFrame);
> 
>     drawingArea()->setLayerTreeStateIsFrozen(true);
>     m_printContext->begin(printInfo.availablePaperWidth, printInfo.availablePaperHeight);
>Index: Source/WebKit2/WebProcess/WebPage/WebPage.h
>===================================================================
>--- Source/WebKit2/WebProcess/WebPage/WebPage.h	(revision 167842)
>+++ Source/WebKit2/WebProcess/WebPage/WebPage.h	(working copy)
>@@ -59,8 +59,8 @@
> #include <WebCore/ViewState.h>
> #include <WebCore/ViewportConfiguration.h>
> #include <WebCore/WebCoreKeyboardUIMode.h>
>+#include <memory>
> #include <wtf/HashMap.h>
>-#include <wtf/OwnPtr.h>
> #include <wtf/PassRefPtr.h>
> #include <wtf/RefPtr.h>
> #include <wtf/text/WTFString.h>
>@@ -994,7 +994,7 @@ private:
> 
>     uint64_t m_pageID;
> 
>-    OwnPtr<WebCore::Page> m_page;
>+    std::unique_ptr<WebCore::Page> m_page;
>     RefPtr<WebFrame> m_mainFrame;
>     RefPtr<InjectedBundleBackForwardList> m_backForwardList;
> 
>@@ -1125,7 +1125,7 @@ private:
>     GeolocationPermissionRequestManager m_geolocationPermissionRequestManager;
> #endif
> 
>-    OwnPtr<WebCore::PrintContext> m_printContext;
>+    std::unique_ptr<WebCore::PrintContext> m_printContext;
> #if PLATFORM(GTK)
>     RefPtr<WebPrintOperationGtk> m_printOperation;
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 129670: 225754 | 227790 | 230243