Changeset 130036 in webkit

Timestamp:

Oct 1, 2012, 4:30:40 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] WebKitDownload: use more of GOwnPtr/GRefPtr
​https://bugs.webkit.org/show_bug.cgi?id=98009

Patch by Claudio Saavedra <Claudio Saavedra> on 2012-10-01
Reviewed by Carlos Garcia Campos.

Use more GOwnPtr/GRefPtr in WebKitDownload

• webkit/webkitdownload.cpp:

(webkit_download_open_stream_for_uri): Use GRefPtr
for a GFile and GOwnPtr for GError.
(webkit_download_set_destination_uri): Ditto.
(webkit_download_received_data): Use GOwnPtr for GError.

Location:

trunk/Source/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitdownload.cpp (modified) (5 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2012-10-01  Claudio Saavedra  <csaavedra@igalia.com>
+
+        [GTK] WebKitDownload: use more of GOwnPtr/GRefPtr
+        https://bugs.webkit.org/show_bug.cgi?id=98009
+
+        Reviewed by Carlos Garcia Campos.
+
+        Use more GOwnPtr/GRefPtr in WebKitDownload
+
+        * webkit/webkitdownload.cpp:
+        (webkit_download_open_stream_for_uri): Use GRefPtr
+        for a GFile and GOwnPtr for GError.
+        (webkit_download_set_destination_uri): Ditto.
+        (webkit_download_received_data): Use GOwnPtr for GError.
+
 2012-09-28  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
 

trunk/Source/WebKit/gtk/webkit/webkitdownload.cpp

@@ -39 +39 @@
 #include <glib/gstdio.h>
 #include <wtf/Noncopyable.h>
+#include <wtf/gobject/GOwnPtr.h>
 #include <wtf/gobject/GRefPtr.h>
 #include <wtf/text/CString.h>
@@ -460 +461 @@
 
     WebKitDownloadPrivate* priv = download->priv;
-    GFile* file = g_file_new_for_uri(uri);
-    GError* error = NULL;
+    GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(uri));
+    GOwnPtr<GError> error;
 
     if (append)
-        priv->outputStream = g_file_append_to(file, G_FILE_CREATE_NONE, NULL, &error);
+        priv->outputStream = g_file_append_to(file.get(), G_FILE_CREATE_NONE, NULL, &error.outPtr());
     else
-        priv->outputStream = g_file_replace(file, NULL, TRUE, G_FILE_CREATE_NONE, NULL, &error);
-
-    g_object_unref(file);
+        priv->outputStream = g_file_replace(file.get(), NULL, TRUE, G_FILE_CREATE_NONE, NULL, &error.outPtr());
 
     if (error) {
         webkitDownloadEmitError(download, downloadDestinationError(core(priv->networkResponse), error->message));
-        g_error_free(error);
         return FALSE;
     }
@@ -697 +695 @@
             webkit_download_close_stream(download);
 
-        GFile* src = g_file_new_for_uri(priv->destinationURI);
-        GFile* dest = g_file_new_for_uri(destination_uri);
-        GError* error = NULL;
-
-        g_file_move(src, dest, G_FILE_COPY_BACKUP, NULL, NULL, NULL, &error);
-
-        g_object_unref(src);
-        g_object_unref(dest);
+        GRefPtr<GFile> src = adoptGRef(g_file_new_for_uri(priv->destinationURI));
+        GRefPtr<GFile> dest = adoptGRef(g_file_new_for_uri(destination_uri));
+        GOwnPtr<GError> error;
+
+        g_file_move(src.get(), dest.get(), G_FILE_COPY_BACKUP, 0, 0, 0, &error.outPtr());
 
         g_free(priv->destinationURI);
@@ -711 +706 @@
         if (error) {
             webkitDownloadEmitError(download, downloadDestinationError(core(priv->networkResponse), error->message));
-            g_error_free(error);
             return;
         }
@@ -863 +857 @@
 
     gsize bytes_written;
-    GError* error = NULL;
+    GOwnPtr<GError> error;
 
     g_output_stream_write_all(G_OUTPUT_STREAM(priv->outputStream),
-                              data, length, &bytes_written, NULL, &error);
+                              data, length, &bytes_written, NULL, &error.outPtr());
 
     if (error) {
         webkitDownloadEmitError(download, downloadDestinationError(core(priv->networkResponse), error->message));
-        g_error_free(error);
         return;
     }