Changeset 165707 in webkit for trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp

Timestamp:

Mar 16, 2014, 12:47:00 PM (11 years ago)

Author:

[email protected]

Message:

Move GTK WebKit2 code to std::unique_ptr
​https://bugs.webkit.org/show_bug.cgi?id=129672

Reviewed by Anders Carlsson.

Repace uses of OwnPtr and PassOwnPtr in GTK-specific WebKit2 code with std::unique_ptr.

• Shared/Downloads/Download.h:
• Shared/Downloads/soup/DownloadSoup.cpp:

(WebKit::Download::start):
(WebKit::Download::startWithHandle):
(WebKit::Download::platformInvalidate):

• UIProcess/API/gtk/PageClientImpl.cpp:
• UIProcess/API/gtk/PageClientImpl.h:
• UIProcess/API/gtk/WebKitContextMenuItem.cpp:

(webkitContextMenuItemCreate):
(webkitContextMenuItemCreateForGtkItem):
(webkit_context_menu_item_new):
(webkit_context_menu_item_new_from_stock_action):
(webkit_context_menu_item_new_from_stock_action_with_label):
(webkit_context_menu_item_new_with_submenu):
(webkit_context_menu_item_new_separator):

• UIProcess/API/gtk/WebKitTextChecker.h:
• UIProcess/API/gtk/WebKitWebContext.cpp:

(createDefaultWebContext):

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseConstructed):

• WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:

(WebKit::WebPrintOperationGtk::print):

• WebProcess/gtk/WebGtkExtensionManager.cpp:

(WebKit::WebGtkExtensionManager::initialize):

• WebProcess/soup/WebKitSoupRequestInputStream.cpp:

(webkitSoupRequestInputStreamPendingReadAsyncComplete):
(webkitSoupRequestInputStreamReadAsync):

• WebProcess/soup/WebSoupRequestManager.cpp:

(WebKit::WebSoupRequestManager::send):

• WebProcess/soup/WebSoupRequestManager.h:

File:

• trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp (modified) (4 diffs)

trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp

@@ -21 +21 @@
 #include "WebKitSoupRequestInputStream.h"
 
-#include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
 #include <wtf/Threading.h>
 #include <wtf/gobject/GRefPtr.h>
@@ -47 +45 @@
 
     Mutex readLock;
-    OwnPtr<AsyncReadData> pendingAsyncRead;
+    std::unique_ptr<AsyncReadData> pendingAsyncRead;
 };
 
@@ -71 +69 @@
     AsyncReadData* data = stream->priv->pendingAsyncRead.get();
     webkitSoupRequestInputStreamReadAsyncResultComplete(stream, data->result.get(), data->buffer, data->count, data->cancellable.get());
-    stream->priv->pendingAsyncRead.clear();
+    stream->priv->pendingAsyncRead = nullptr;
 }
 
@@ -102 +100 @@
     }
 
-    stream->priv->pendingAsyncRead = adoptPtr(new AsyncReadData(result.get(), buffer, count, cancellable));
+    stream->priv->pendingAsyncRead = std::make_unique<AsyncReadData>(result.get(), buffer, count, cancellable);
 }