Changeset 163797 in webkit


Ignore:
Timestamp:
Feb 10, 2014 10:22:20 AM (10 years ago)
Author:
Carlos Garcia Campos
Message:

[GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
​https://bugs.webkit.org/show_bug.cgi?id=127554

Reviewed by Gustavo Noronha Silva.

Source/WebCore:

Use GUniqueOutPtr instead of GOwnPtr.

  • GNUmakefile.list.am:
  • PlatformEfl.cmake:
  • PlatformGTK.cmake:
  • platform/audio/gstreamer/AudioDestinationGStreamer.cpp:

(WebCore::AudioDestinationGStreamer::handleMessage):

  • platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:

(WebCore::AudioFileReader::handleMessage):

  • platform/glib/BatteryProviderUPower.cpp:

(BatteryProviderUPower::startUpdating):

  • platform/graphics/gstreamer/GStreamerUtilities.cpp:

(WebCore::initializeGStreamer):

  • platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:

(WebCore::MediaPlayerPrivateGStreamer::handleMessage):

  • platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:

(WebCore::TrackPrivateBaseGStreamer::getTag):

  • platform/graphics/gtk/ImageBufferGtk.cpp:

(WebCore::encodeImage):
(WebCore::ImageBuffer::toDataURL):

  • platform/graphics/gtk/ImageGtk.cpp:

(WebCore::loadResourceSharedBuffer):

  • platform/gtk/DataObjectGtk.cpp:

(WebCore::DataObjectGtk::setURIList):

  • platform/gtk/FileSystemGtk.cpp:

(WebCore::readFromFile):

  • platform/gtk/GamepadsGtk.cpp:

(WebCore::GamepadDeviceGtk::readCallback):

  • platform/gtk/GtkInputMethodFilter.cpp:

(WebCore::GtkInputMethodFilter::handlePreeditChanged):

  • platform/gtk/PasteboardHelper.cpp:

(WebCore::PasteboardHelper::fillDataObjectFromDropData):

  • platform/gtk/RenderThemeGtk.cpp:

(WebCore::RenderThemeGtk::systemFont):

  • platform/gtk/SharedBufferGtk.cpp:

(WebCore::SharedBuffer::createWithContentsOfFile):

  • platform/network/gtk/CredentialBackingStore.cpp:

(WebCore::credentialForChallengeAsyncReadyCallback):

  • platform/network/soup/GOwnPtrSoup.cpp: Removed.
  • platform/network/soup/GOwnPtrSoup.h: Removed.
  • platform/network/soup/ResourceHandleSoup.cpp:

(WebCore::redirectSkipCallback):
(WebCore::nextMultipartResponsePartCallback):
(WebCore::sendRequestCallback):
(WebCore::addFileToSoupMessageBody):
(WebCore::createSoupRequestAndMessageForHandle):
(WebCore::readCallback):

  • platform/network/soup/SocketStreamHandleSoup.cpp:

(WebCore::SocketStreamHandle::platformSend):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::connectedCallback):
(WebCore::readReadyCallback):

  • platform/network/soup/SoupNetworkSession.cpp:

(WebCore::SoupNetworkSession::httpProxy):

Source/WebKit/gtk:

Use GUniqueOutPtr instead of GOwnPtr.

  • WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::dispatchDidFailLoad):

  • WebCoreSupport/TextCheckerClientGtk.cpp:
  • webkit/webkitdownload.cpp:

(webkit_download_open_stream_for_uri):
(webkit_download_set_destination_uri):
(webkit_download_received_data):

  • webkit/webkitwebplugin.cpp:

(webkit_web_plugin_get_path):

  • webkit/webkitwebview.cpp:

(webkit_web_view_expose_event):

Source/WebKit2:

Use GUniqueOutPtr instead of GOwnPtr.

  • NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::getCacheDiskFreeSize):

  • Shared/Downloads/soup/DownloadSoup.cpp:

(WebKit::DownloadClient::didReceiveResponse):
(WebKit::DownloadClient::didReceiveData):
(WebKit::DownloadClient::didFinishLoading):

  • UIProcess/API/gtk/WebKitFaviconDatabase.cpp:

(processPendingIconsForPageURL):
(webkit_favicon_database_get_favicon):

  • UIProcess/API/gtk/WebKitURISchemeRequest.cpp:

(webkitURISchemeRequestReadCallback):

  • UIProcess/API/gtk/WebKitWebView.cpp:

(gotFaviconCallback):

  • UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:

(WebKit::WebInspectorServer::platformResourceForPath):

  • UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:

(WebKit::PluginProcessProxy::scanPlugin):

  • WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
  • WebProcess/soup/WebProcessSoup.cpp:

(WebKit::getCacheDiskFreeSize):

Source/WTF:

GUniqueOutPtr is a simplified version of GOwnPtr for the cases
where we need the address of the contained pointer. GUniqueOutPtr
uses GUniquePtr to free the contained object and to release the
container pointer. The API is very simple to make sure this is
only used when outPtr() is needed. It can't be constructed with a
pointer, and there's not method to set a new pointer. Another
difference with the old GOwnPtr is that outPtr() can be used
multiple times, because it frees any pointer previously set.

  • GNUmakefile.list.am:
  • wtf/PlatformEfl.cmake:
  • wtf/PlatformGTK.cmake:
  • wtf/gobject/GOwnPtr.cpp: Removed.
  • wtf/gobject/GOwnPtr.h: Removed.
  • wtf/gobject/GUniquePtr.h:

(WTF::GUniqueOutPtr::GUniqueOutPtr):
(WTF::GUniqueOutPtr::~GUniqueOutPtr):
(WTF::GUniqueOutPtr::outPtr):
(WTF::GUniqueOutPtr::reset):
(WTF::GUniqueOutPtr::release):
(WTF::GUniqueOutPtr::operator*):
(WTF::GUniqueOutPtr::operator->):
(WTF::GUniqueOutPtr::get):
(WTF::GUniqueOutPtr::operator!):
(WTF::GUniqueOutPtr::operator UnspecifiedBoolType):

Tools:

Use GUniqueOutPtr instead of GOwnPtr.

  • DumpRenderTree/gtk/DumpRenderTree.cpp:
  • DumpRenderTree/gtk/EventSender.cpp:

(createKeyPressEvent):

  • TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp:

(TestWebKitAPI::returnOutChar):
(TestWebKitAPI::TEST):

  • TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp:
  • TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:

(testInspectorServerPageList):
(openRemoteDebuggingSession):
(sendIncompleteRequest):

  • TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:

(testWebExtensionWindowObjectCleared):
(testWebExtensionIsolatedWorld):

  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp:
  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:

(testWebViewRunJavaScript):
(testWebViewSave):
(testWebViewPageVisibility):

  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp:

(isStyleSheetInjectedForURLAtPath):

  • TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
  • TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
  • TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp:
  • TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp:

(TestWebKitAPI::TestInputMethodFilter::sendKeyEventToFilter):

  • TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:

(TestWebKitAPI::doKeyStroke):

  • TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
  • TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp:

(WebKitTestBus::run):

  • TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:

(resourceGetDataCallback):
(WebViewTest::keyStroke):
(onSnapshotReady):

  • WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:

(WTR::EventSenderProxy::keyDown):

Location:
trunk
Files:
4 deleted
65 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r163792 r163797  
     12014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
     4        https://bugs.webkit.org/show_bug.cgi?id=127554
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        GUniqueOutPtr is a simplified version of GOwnPtr for the cases
     9        where we need the address of the contained pointer. GUniqueOutPtr
     10        uses GUniquePtr to free the contained object and to release the
     11        container pointer. The API is very simple to make sure this is
     12        only used when outPtr() is needed. It can't be constructed with a
     13        pointer, and there's not method to set a new pointer. Another
     14        difference with the old GOwnPtr is that outPtr() can be used
     15        multiple times, because it frees any pointer previously set.
     16
     17        * GNUmakefile.list.am:
     18        * wtf/PlatformEfl.cmake:
     19        * wtf/PlatformGTK.cmake:
     20        * wtf/gobject/GOwnPtr.cpp: Removed.
     21        * wtf/gobject/GOwnPtr.h: Removed.
     22        * wtf/gobject/GUniquePtr.h:
     23        (WTF::GUniqueOutPtr::GUniqueOutPtr):
     24        (WTF::GUniqueOutPtr::~GUniqueOutPtr):
     25        (WTF::GUniqueOutPtr::outPtr):
     26        (WTF::GUniqueOutPtr::reset):
     27        (WTF::GUniqueOutPtr::release):
     28        (WTF::GUniqueOutPtr::operator*):
     29        (WTF::GUniqueOutPtr::operator->):
     30        (WTF::GUniqueOutPtr::get):
     31        (WTF::GUniqueOutPtr::operator!):
     32        (WTF::GUniqueOutPtr::operator UnspecifiedBoolType):
     33
    1342014-02-10  Darin Adler  <darin@apple.com>
    235

  • trunk/Source/WTF/GNUmakefile.list.am

    r163407 r163797  
    212212    Source/WTF/wtf/dtoa/utils.h \
    213213    Source/WTF/wtf/gobject/GMutexLocker.h \
    214     Source/WTF/wtf/gobject/GOwnPtr.cpp \
    215     Source/WTF/wtf/gobject/GOwnPtr.h \
    216214    Source/WTF/wtf/gobject/GRefPtr.cpp \
    217215    Source/WTF/wtf/gobject/GRefPtr.h \

  • trunk/Source/WTF/wtf/PlatformEfl.cmake

    r159001 r163797  
    55    efl/RunLoopEfl.cpp
    66
    7     gobject/GOwnPtr.cpp
    87    gobject/GRefPtr.cpp
    98)

  • trunk/Source/WTF/wtf/PlatformGTK.cmake

    r160361 r163797  
    11list(APPEND WTF_SOURCES
    2     gobject/GOwnPtr.cpp
    32    gobject/GRefPtr.cpp
    43    gobject/GlibUtilities.cpp

  • trunk/Source/WTF/wtf/gobject/GUniquePtr.h

    r162516 r163797  
    2525
    2626#include <gio/gio.h>
     27#include <wtf/Noncopyable.h>
    2728
    2829namespace WTF {
    … …  
    5859#undef FOR_EACH_GLIB_DELETER
    5960
     61template <typename T> class GUniqueOutPtr {
     62    WTF_MAKE_NONCOPYABLE(GUniqueOutPtr);
     63public:
     64    GUniqueOutPtr()
     65        : m_ptr(nullptr)
     66    {
     67    }
     68
     69    ~GUniqueOutPtr()
     70    {
     71        reset();
     72    }
     73
     74    T*& outPtr()
     75    {
     76        reset();
     77        return m_ptr;
     78    }
     79
     80    GUniquePtr<T> release()
     81    {
     82        GUniquePtr<T> ptr(m_ptr);
     83        m_ptr = nullptr;
     84        return ptr;
     85    }
     86
     87    T& operator*() const
     88    {
     89        ASSERT(m_ptr);
     90        return *m_ptr;
     91    }
     92
     93    T* operator->() const
     94    {
     95        ASSERT(m_ptr);
     96        return m_ptr;
     97    }
     98
     99    T* get() const { return m_ptr; }
     100
     101    bool operator!() const { return !m_ptr; }
     102
     103    // This conversion operator allows implicit conversion to bool but not to other integer types.
     104    typedef T* GUniqueOutPtr::*UnspecifiedBoolType;
     105    operator UnspecifiedBoolType() const { return m_ptr ? &GUniqueOutPtr::m_ptr : 0; }
     106
     107private:
     108    void reset()
     109    {
     110        if (m_ptr) {
     111            GUniquePtr<T> deletePtr(m_ptr);
     112            m_ptr = nullptr;
     113        }
     114    }
     115
     116    T* m_ptr;
     117};
     118
    60119} // namespace WTF
    61120
    62121using WTF::GUniquePtr;
     122using WTF::GUniqueOutPtr;
    63123
    64124#endif // USE(GLIB)

  • trunk/Source/WebCore/ChangeLog

    r163793 r163797  
     12014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
     4        https://bugs.webkit.org/show_bug.cgi?id=127554
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        Use GUniqueOutPtr instead of GOwnPtr.
     9
     10        * GNUmakefile.list.am:
     11        * PlatformEfl.cmake:
     12        * PlatformGTK.cmake:
     13        * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
     14        (WebCore::AudioDestinationGStreamer::handleMessage):
     15        * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
     16        (WebCore::AudioFileReader::handleMessage):
     17        * platform/glib/BatteryProviderUPower.cpp:
     18        (BatteryProviderUPower::startUpdating):
     19        * platform/graphics/gstreamer/GStreamerUtilities.cpp:
     20        (WebCore::initializeGStreamer):
     21        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
     22        (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
     23        * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
     24        (WebCore::TrackPrivateBaseGStreamer::getTag):
     25        * platform/graphics/gtk/ImageBufferGtk.cpp:
     26        (WebCore::encodeImage):
     27        (WebCore::ImageBuffer::toDataURL):
     28        * platform/graphics/gtk/ImageGtk.cpp:
     29        (WebCore::loadResourceSharedBuffer):
     30        * platform/gtk/DataObjectGtk.cpp:
     31        (WebCore::DataObjectGtk::setURIList):
     32        * platform/gtk/FileSystemGtk.cpp:
     33        (WebCore::readFromFile):
     34        * platform/gtk/GamepadsGtk.cpp:
     35        (WebCore::GamepadDeviceGtk::readCallback):
     36        * platform/gtk/GtkInputMethodFilter.cpp:
     37        (WebCore::GtkInputMethodFilter::handlePreeditChanged):
     38        * platform/gtk/PasteboardHelper.cpp:
     39        (WebCore::PasteboardHelper::fillDataObjectFromDropData):
     40        * platform/gtk/RenderThemeGtk.cpp:
     41        (WebCore::RenderThemeGtk::systemFont):
     42        * platform/gtk/SharedBufferGtk.cpp:
     43        (WebCore::SharedBuffer::createWithContentsOfFile):
     44        * platform/network/gtk/CredentialBackingStore.cpp:
     45        (WebCore::credentialForChallengeAsyncReadyCallback):
     46        * platform/network/soup/GOwnPtrSoup.cpp: Removed.
     47        * platform/network/soup/GOwnPtrSoup.h: Removed.
     48        * platform/network/soup/ResourceHandleSoup.cpp:
     49        (WebCore::redirectSkipCallback):
     50        (WebCore::nextMultipartResponsePartCallback):
     51        (WebCore::sendRequestCallback):
     52        (WebCore::addFileToSoupMessageBody):
     53        (WebCore::createSoupRequestAndMessageForHandle):
     54        (WebCore::readCallback):
     55        * platform/network/soup/SocketStreamHandleSoup.cpp:
     56        (WebCore::SocketStreamHandle::platformSend):
     57        (WebCore::SocketStreamHandle::platformClose):
     58        (WebCore::connectedCallback):
     59        (WebCore::readReadyCallback):
     60        * platform/network/soup/SoupNetworkSession.cpp:
     61        (WebCore::SoupNetworkSession::httpProxy):
     62
    1632014-02-10  Darin Adler  <darin@apple.com>
    264

  • trunk/Source/WebCore/GNUmakefile.list.am

    r163749 r163797  
    58555855        Source/WebCore/platform/leveldb/LevelDBWriteBatch.h \
    58565856        Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
    5857         Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \
    5858         Source/WebCore/platform/network/soup/GOwnPtrSoup.h \
    58595857        Source/WebCore/platform/network/soup/ProxyServerSoup.cpp \
    58605858        Source/WebCore/platform/network/soup/ResourceError.h \

  • trunk/Source/WebCore/PlatformEfl.cmake

    r163505 r163797  
    158158    platform/network/soup/CredentialStorageSoup.cpp
    159159    platform/network/soup/DNSSoup.cpp
    160     platform/network/soup/GOwnPtrSoup.cpp
    161160    platform/network/soup/NetworkStorageSessionSoup.cpp
    162161    platform/network/soup/ProxyResolverSoup.cpp

  • trunk/Source/WebCore/PlatformGTK.cmake

    r163749 r163797  
    116116    platform/network/soup/CredentialStorageSoup.cpp
    117117    platform/network/soup/DNSSoup.cpp
    118     platform/network/soup/GOwnPtrSoup.cpp
    119118    platform/network/soup/NetworkStorageSessionSoup.cpp
    120119    platform/network/soup/ProxyResolverSoup.cpp
    … …  
    246245    platform/network/soup/CredentialStorageSoup.cpp
    247246    platform/network/soup/DNSSoup.cpp
    248     platform/network/soup/GOwnPtrSoup.cpp
    249247    platform/network/soup/NetworkStorageSessionSoup.cpp
    250248    platform/network/soup/ProxyResolverSoup.cpp

  • trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp

    r162368 r163797  
    2525#include "AudioChannel.h"
    2626#include "AudioSourceProvider.h"
    27 #include <wtf/gobject/GOwnPtr.h>
    2827#include "GRefPtrGStreamer.h"
    2928#include "Logging.h"
    … …  
    3130#include <gst/gst.h>
    3231#include <gst/pbutils/pbutils.h>
     32#include <wtf/gobject/GUniquePtr.h>
    3333
    3434namespace WebCore {
    … …  
    151151gboolean AudioDestinationGStreamer::handleMessage(GstMessage* message)
    152152{
    153     GOwnPtr<GError> error;
    154     GOwnPtr<gchar> debug;
     153    GUniqueOutPtr<GError> error;
     154    GUniqueOutPtr<gchar> debug;
    155155
    156156    switch (GST_MESSAGE_TYPE(message)) {

  • trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp

    r162368 r163797  
    3131#include <gst/pbutils/pbutils.h>
    3232#include <wtf/Noncopyable.h>
    33 #include <wtf/gobject/GOwnPtr.h>
    3433#include <wtf/gobject/GRefPtr.h>
     34#include <wtf/gobject/GUniquePtr.h>
    3535
    3636#include <gst/audio/audio.h>
    … …  
    204204gboolean AudioFileReader::handleMessage(GstMessage* message)
    205205{
    206     GOwnPtr<GError> error;
    207     GOwnPtr<gchar> debug;
     206    GUniqueOutPtr<GError> error;
     207    GUniqueOutPtr<gchar> debug;
    208208
    209209    switch (GST_MESSAGE_TYPE(message)) {

  • trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp

    r160444 r163797  
    2626#include <cmath>
    2727#include <limits>
    28 #include <wtf/gobject/GOwnPtr.h>
     28#include <wtf/gobject/GUniquePtr.h>
    2929
    3030using namespace WebCore;
    … …  
    5252    m_upowerClient = adoptGRef(up_client_new());
    5353
    54     GOwnPtr<GError> error;
     54    GUniqueOutPtr<GError> error;
    5555    if (!up_client_enumerate_devices_sync(m_upowerClient.get(), 0, &error.outPtr())) {
    5656        m_client->updateBatteryStatus(NotAvailable);

  • trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp

    r159766 r163797  
    2727#include <gst/audio/audio.h>
    2828#include <gst/gst.h>
    29 #include <wtf/gobject/GOwnPtr.h>
     29#include <wtf/gobject/GUniquePtr.h>
    3030
    3131namespace WebCore {
    … …  
    127127#endif
    128128
    129     GOwnPtr<GError> error;
     129    GUniqueOutPtr<GError> error;
    130130    // FIXME: We should probably pass the arguments from the command line.
    131131    bool gstInitialized = gst_init_check(0, 0, &error.outPtr());

  • trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

    r162907 r163797  
    3838#include <gst/pbutils/missing-plugins.h>
    3939#include <limits>
    40 #include <wtf/gobject/GOwnPtr.h>
    4140#include <wtf/gobject/GUniquePtr.h>
    4241#include <wtf/text/CString.h>
    … …  
    946945gboolean MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
    947946{
    948     GOwnPtr<GError> err;
    949     GOwnPtr<gchar> debug;
     947    GUniqueOutPtr<GError> err;
     948    GUniqueOutPtr<gchar> debug;
    950949    MediaPlayer::NetworkState error;
    951950    bool issueError = true;

  • trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp

    r160375 r163797  
    3535#include <glib-object.h>
    3636#include <gst/gst.h>
    37 #include <wtf/gobject/GOwnPtr.h>
     37#include <wtf/gobject/GUniquePtr.h>
    3838
    3939GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
    … …  
    144144bool TrackPrivateBaseGStreamer::getTag(GstTagList* tags, const gchar* tagName, String& value)
    145145{
    146     GOwnPtr<gchar> tagValue;
     146    GUniqueOutPtr<gchar> tagValue;
    147147    if (gst_tag_list_get_string(tags, tagName, &tagValue.outPtr())) {
    148148        INFO_MEDIA_MESSAGE("Track %d got %s %s.", m_index, tagName, tagValue.get());

  • trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp

    r162599 r163797  
    2626#include <cairo.h>
    2727#include <gtk/gtk.h>
    28 #include <wtf/gobject/GOwnPtr.h>
     28#include <wtf/gobject/GUniquePtr.h>
    2929#include <wtf/text/Base64.h>
    3030#include <wtf/text/CString.h>
    … …  
    3333namespace WebCore {
    3434
    35 static bool encodeImage(cairo_surface_t* surface, const String& mimeType, const double* quality, GOwnPtr<gchar>& buffer, gsize& bufferSize)
     35static bool encodeImage(cairo_surface_t* surface, const String& mimeType, const double* quality, GUniqueOutPtr<gchar>& buffer, gsize& bufferSize)
    3636{
    3737    // List of supported image encoding types comes from the GdkPixbuf documentation.
    … …  
    6666        return false;
    6767
    68     GOwnPtr<GError> error;
     68    GUniqueOutPtr<GError> error;
    6969    if (type == "jpeg" && quality && *quality >= 0.0 && *quality <= 1.0) {
    7070        String qualityString = String::format("%d", static_cast<int>(*quality * 100.0 + 0.5));
    … …  
    8080    ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
    8181
    82     GOwnPtr<gchar> buffer;
     82    GUniqueOutPtr<gchar> buffer;
    8383    gsize bufferSize;
    8484    if (!encodeImage(m_data.m_surface.get(), mimeType, quality, buffer, bufferSize))

  • trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp

    r162599 r163797  
    3131#include "GdkCairoUtilities.h"
    3232#include "SharedBuffer.h"
    33 #include <wtf/gobject/GOwnPtr.h>
    3433#include <wtf/gobject/GUniquePtr.h>
    3534#include <wtf/text/CString.h>
    … …  
    6867static PassRefPtr<SharedBuffer> loadResourceSharedBuffer(CString name)
    6968{
    70     GOwnPtr<gchar> content;
     69    GUniqueOutPtr<gchar> content;
    7170    gsize length;
    7271    if (!g_file_get_contents(name.data(), &content.outPtr(), &length, 0))

  • trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp

    r162599 r163797  
    2222#include "markup.h"
    2323#include <gtk/gtk.h>
    24 #include <wtf/gobject/GOwnPtr.h>
    2524#include <wtf/gobject/GUniquePtr.h>
    2625#include <wtf/text/StringBuilder.h>
    … …  
    103102            }
    104103
    105             GOwnPtr<GError> error;
     104            GUniqueOutPtr<GError> error;
    106105            GUniquePtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
    107106            if (!error && filename)

  • trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp

    r162943 r163797  
    2929#include <glib.h>
    3030#include <glib/gstdio.h>
    31 #include <wtf/gobject/GOwnPtr.h>
    3231#include <wtf/gobject/GRefPtr.h>
    3332#include <wtf/gobject/GUniquePtr.h>
    … …  
    341340int readFromFile(PlatformFileHandle handle, char* data, int length)
    342341{
    343     GOwnPtr<GError> error;
     342    GUniqueOutPtr<GError> error;
    344343    do {
    345344        gssize bytesRead = g_input_stream_read(g_io_stream_get_input_stream(G_IO_STREAM(handle)),

  • trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp

    r162599 r163797  
    3636#include <wtf/HashMap.h>
    3737#include <wtf/PassOwnPtr.h>
    38 #include <wtf/gobject/GOwnPtr.h>
    3938#include <wtf/gobject/GRefPtr.h>
    4039#include <wtf/gobject/GUniquePtr.h>
    … …  
    8180{
    8281    GamepadDeviceGtk* gamepadDevice = reinterpret_cast<GamepadDeviceGtk*>(data);
    83     GOwnPtr<GError> error;
     82    GUniqueOutPtr<GError> error;
    8483    struct js_event event;
    8584

  • trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp

    r162599 r163797  
    2525#include <gtk/gtk.h>
    2626#include <wtf/MathExtras.h>
    27 #include <wtf/gobject/GOwnPtr.h>
     27#include <wtf/gobject/GUniquePtr.h>
    2828
    2929// The Windows composition key event code is 299 or VK_PROCESSKEY. We need to
    … …  
    318318        return;
    319319
    320     GOwnPtr<gchar> newPreedit;
     320    GUniqueOutPtr<gchar> newPreedit;
    321321    gtk_im_context_get_preedit_string(m_context.get(), &newPreedit.outPtr(), 0, &m_cursorOffset);
    322322

  • trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp

    r162599 r163797  
    3333#include "TextResourceDecoder.h"
    3434#include <gtk/gtk.h>
    35 #include <wtf/gobject/GOwnPtr.h>
    3635#include <wtf/gobject/GUniquePtr.h>
    3736
    … …  
    260259        GRefPtr<GVariant> variant = g_variant_new_parsed(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)));
    261260
    262         GOwnPtr<gchar> key;
    263         GOwnPtr<gchar> value;
     261        GUniqueOutPtr<gchar> key;
     262        GUniqueOutPtr<gchar> value;
    264263        GVariantIter iter;
    265264
    266265        g_variant_iter_init(&iter, variant.get());
    267         while (g_variant_iter_next(&iter, "{ss}", &key.outPtr(), &value.outPtr())) {
     266        while (g_variant_iter_next(&iter, "{ss}", &key.outPtr(), &value.outPtr()))
    268267            dataObject->setUnknownTypeData(key.get(), value.get());
    269 
    270             // FIXME: should GOwnPtr be smarter about this and replace the existing ptr when outPtr() is used?
    271             key.clear();
    272             value.clear();
    273         }
    274268    }
    275269}

  • trunk/Source/WebCore/platform/gtk/RenderThemeGtk.cpp

    r160226 r163797  
    3131#include "FileSystem.h"
    3232#include "FontDescription.h"
    33 #include <wtf/gobject/GOwnPtr.h>
    3433#include "Gradient.h"
    3534#include "GraphicsContext.h"
    … …  
    4948#include <glib.h>
    5049#include <gtk/gtk.h>
     50#include <wtf/gobject/GUniquePtr.h>
    5151#include <wtf/text/CString.h>
    5252
    … …  
    445445
    446446    // This will be a font selection string like "Sans 10" so we cannot use it as the family name.
    447     GOwnPtr<gchar> fontName;
     447    GUniqueOutPtr<gchar> fontName;
    448448    g_object_get(settings, "gtk-font-name", &fontName.outPtr(), NULL);
    449449

  • trunk/Source/WebCore/platform/gtk/SharedBufferGtk.cpp

    r152446 r163797  
    2121
    2222#include "FileSystem.h"
    23 #include <wtf/gobject/GOwnPtr.h>
     23#include <wtf/gobject/GUniquePtr.h>
    2424#include <wtf/text/CString.h>
    2525
    … …  
    3535
    3636    CString filename = fileSystemRepresentation(filePath);
    37     GOwnPtr<gchar> contents;
     37    GUniqueOutPtr<gchar> contents;
    3838    gsize size;
    39     GOwnPtr<GError> error;
     39    GUniqueOutPtr<GError> error;
    4040    if (!g_file_get_contents(filename.data(), &contents.outPtr(), &size, &error.outPtr())) {
    4141        LOG_ERROR("Failed to fully read contents of file %s - %s", filenameForDisplay(filePath).utf8().data(), error->message);

  • trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp

    r162599 r163797  
    3535#include <libsecret/secret.h>
    3636#include <libsoup/soup.h>
    37 #include <wtf/gobject/GOwnPtr.h>
    3837#include <wtf/gobject/GUniquePtr.h>
    3938#include <wtf/text/CString.h>
    … …  
    7877    delete callbackData;
    7978
    80     GOwnPtr<GError> error;
     79    GUniqueOutPtr<GError> error;
    8180    GUniquePtr<GList> elements(secret_service_search_finish(service, asyncResult, &error.outPtr()));
    8281    if (error || !elements || !elements->data) {

  • trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp

    r162922 r163797  
    3333#include "CredentialStorage.h"
    3434#include "FileSystem.h"
    35 #include "GOwnPtrSoup.h"
     35#include "GUniquePtrSoup.h"
    3636#include "HTTPParsers.h"
    3737#include "LocalizedStrings.h"
    … …  
    5656#include <wtf/CurrentTime.h>
    5757#include <wtf/SHA1.h>
    58 #include <wtf/gobject/GOwnPtr.h>
    5958#include <wtf/gobject/GRefPtr.h>
    6059#include <wtf/text/Base64.h>
    … …  
    505504    }
    506505
    507     GOwnPtr<GError> error;
     506    GUniqueOutPtr<GError> error;
    508507    ResourceHandleInternal* d = handle->getInternal();
    509508    gssize bytesSkipped = g_input_stream_skip_finish(d->m_inputStream.get(), asyncResult, &error.outPtr());
    … …  
    611610    ASSERT(!d->m_inputStream);
    612611
    613     GOwnPtr<GError> error;
     612    GUniqueOutPtr<GError> error;
    614613    d->m_inputStream = adoptGRef(soup_multipart_input_stream_next_part_finish(d->m_multipartInputStream.get(), result, &error.outPtr()));
    615614
    … …  
    658657    }
    659658
    660     GOwnPtr<GError> error;
     659    GUniqueOutPtr<GError> error;
    661660    GRefPtr<GInputStream> inputStream = adoptGRef(soup_request_send_finish(d->m_soupRequest.get(), result, &error.outPtr()));
    662661    if (error) {
    … …  
    728727static bool addFileToSoupMessageBody(SoupMessage* message, const String& fileNameString, size_t offset, size_t lengthToSend, unsigned long& totalBodySize)
    729728{
    730     GOwnPtr<GError> error;
     729    GUniqueOutPtr<GError> error;
    731730    CString fileName = fileSystemRepresentation(fileNameString);
    732731    GMappedFile* fileMapping = g_mapped_file_new(fileName.data(), false, &error.outPtr());
    … …  
    979978    ResourceHandleInternal* d = handle->getInternal();
    980979
    981     GOwnPtr<GError> error;
    982 
    983980    GUniquePtr<SoupURI> soupURI = request.createSoupURI();
    984981    if (!soupURI)
    985982        return false;
    986983
     984    GUniqueOutPtr<GError> error;
    987985    d->m_soupRequest = adoptGRef(soup_session_request_uri(d->soupSession(), soupURI.get(), &error.outPtr()));
    988986    if (error) {
    … …  
    13021300    }
    13031301
    1304     GOwnPtr<GError> error;
     1302    GUniqueOutPtr<GError> error;
    13051303    gssize bytesRead = g_input_stream_read_finish(d->m_inputStream.get(), asyncResult, &error.outPtr());
    13061304

  • trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp

    r156550 r163797  
    4343
    4444#include <wtf/Vector.h>
    45 #include <wtf/gobject/GOwnPtr.h>
     45#include <wtf/gobject/GUniquePtr.h>
    4646#include <wtf/text/CString.h>
    4747
    … …  
    169169        return 0;
    170170
    171     GOwnPtr<GError> error;
     171    GUniqueOutPtr<GError> error;
    172172    gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, 0, &error.outPtr());
    173173    if (error) {
    … …  
    195195
    196196    if (m_socketConnection) {
    197         GOwnPtr<GError> error;
     197        GUniqueOutPtr<GError> error;
    198198        g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), 0, &error.outPtr());
    199199        if (error)
    … …  
    252252{
    253253    // Always finish the connection, even if this SocketStreamHandle was deactivated earlier.
    254     GOwnPtr<GError> error;
     254    GUniqueOutPtr<GError> error;
    255255    GSocketConnection* socketConnection = g_socket_client_connect_to_host_finish(client, result, &error.outPtr());
    256256
    … …  
    269269{
    270270    // Always finish the read, even if this SocketStreamHandle was deactivated earlier.
    271     GOwnPtr<GError> error;
     271    GUniqueOutPtr<GError> error;
    272272    gssize bytesRead = g_input_stream_read_finish(stream, result, &error.outPtr());
    273273

  • trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp

    r163081 r163797  
    2929#include "AuthenticationChallenge.h"
    3030#include "CookieJarSoup.h"
    31 #include "GOwnPtrSoup.h"
     31#include "GUniquePtrSoup.h"
    3232#include "Logging.h"
    3333#include "ResourceHandle.h"
    … …  
    211211        return nullptr;
    212212
    213     GOwnPtr<SoupURI> uri;
     213    GUniqueOutPtr<SoupURI> uri;
    214214    g_object_get(soupResolver, SOUP_PROXY_RESOLVER_WK_PROXY_URI, &uri.outPtr(), nullptr);
    215215

  • trunk/Source/WebKit/gtk/ChangeLog

    r163749 r163797  
     12014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
     4        https://bugs.webkit.org/show_bug.cgi?id=127554
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        Use GUniqueOutPtr instead of GOwnPtr.
     9
     10        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     11        (WebKit::FrameLoaderClient::dispatchDidFailLoad):
     12        * WebCoreSupport/TextCheckerClientGtk.cpp:
     13        * webkit/webkitdownload.cpp:
     14        (webkit_download_open_stream_for_uri):
     15        (webkit_download_set_destination_uri):
     16        (webkit_download_received_data):
     17        * webkit/webkitwebplugin.cpp:
     18        (webkit_web_plugin_get_path):
     19        * webkit/webkitwebview.cpp:
     20        (webkit_web_view_expose_event):
     21
    1222014-02-09  Carlos Garnacho  <carlosg@gnome.org>
    223

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r162786 r163797  
    9696#include <glib/gi18n-lib.h>
    9797#include <stdio.h>
    98 #include <wtf/gobject/GOwnPtr.h>
    9998#include <wtf/gobject/GRefPtr.h>
    10099#include <wtf/gobject/GUniquePtr.h>
    … …  
    10411040        content = makeString("<html><body>", webError->message, "</body></html>");
    10421041    else {
    1043         GOwnPtr<gchar> fileContent;
     1042        GUniqueOutPtr<gchar> fileContent;
    10441043        if (!g_file_load_contents(errorFile.get(), 0, &fileContent.outPtr(), 0, 0, 0))
    10451044            content = makeString("<html><body>", webError->message, "</body></html>");

  • trunk/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp

    r163712 r163797  
    2929#include "webkitwebsettingsprivate.h"
    3030#include <glib.h>
    31 #include <wtf/gobject/GOwnPtr.h>
    3231#include <wtf/text/CString.h>
    3332#include <wtf/text/StringView.h>

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

    r161536 r163797  
    4040#include <glib/gstdio.h>
    4141#include <wtf/Noncopyable.h>
    42 #include <wtf/gobject/GOwnPtr.h>
    4342#include <wtf/gobject/GRefPtr.h>
     43#include <wtf/gobject/GUniquePtr.h>
    4444#include <wtf/text/CString.h>
    4545
    … …  
    465465    WebKitDownloadPrivate* priv = download->priv;
    466466    GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(uri));
    467     GOwnPtr<GError> error;
     467    GUniqueOutPtr<GError> error;
    468468
    469469    if (append)
    … …  
    706706        GRefPtr<GFile> src = adoptGRef(g_file_new_for_uri(priv->destinationURI));
    707707        GRefPtr<GFile> dest = adoptGRef(g_file_new_for_uri(destination_uri));
    708         GOwnPtr<GError> error;
     708        GUniqueOutPtr<GError> error;
    709709
    710710        g_file_move(src.get(), dest.get(), G_FILE_COPY_BACKUP, 0, 0, 0, &error.outPtr());
    … …  
    866866
    867867    gsize bytes_written;
    868     GOwnPtr<GError> error;
     868    GUniqueOutPtr<GError> error;
    869869
    870870    g_output_stream_write_all(G_OUTPUT_STREAM(priv->outputStream),

  • trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp

    r162599 r163797  
    2525#include "webkitwebpluginprivate.h"
    2626#include <glib/gi18n-lib.h>
    27 #include <wtf/gobject/GOwnPtr.h>
     27#include <wtf/gobject/GUniquePtr.h>
    2828
    2929/**
    … …  
    193193        return priv->path.get();
    194194
    195     GOwnPtr<GError> error;
     195    GUniqueOutPtr<GError> error;
    196196    priv->path.reset(g_filename_from_utf8(priv->corePlugin->path().utf8().data(), -1, 0, 0, &error.outPtr()));
    197197

  • trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

    r163079 r163797  
    120120#include <gdk/gdkkeysyms.h>
    121121#include <glib/gi18n-lib.h>
    122 #include <wtf/gobject/GOwnPtr.h>
    123122#include <wtf/text/CString.h>
    124123
    … …  
    671670{
    672671    int rectCount;
    673     GOwnPtr<GdkRectangle> rects;
     672    GUniqueOutPtr<GdkRectangle> rects;
    674673    gdk_region_get_rectangles(event->region, &rects.outPtr(), &rectCount);
    675674

  • trunk/Source/WebKit2/ChangeLog

    r163795 r163797  
     12014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
     4        https://bugs.webkit.org/show_bug.cgi?id=127554
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        Use GUniqueOutPtr instead of GOwnPtr.
     9
     10        * NetworkProcess/soup/NetworkProcessSoup.cpp:
     11        (WebKit::getCacheDiskFreeSize):
     12        * Shared/Downloads/soup/DownloadSoup.cpp:
     13        (WebKit::DownloadClient::didReceiveResponse):
     14        (WebKit::DownloadClient::didReceiveData):
     15        (WebKit::DownloadClient::didFinishLoading):
     16        * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
     17        (processPendingIconsForPageURL):
     18        (webkit_favicon_database_get_favicon):
     19        * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
     20        (webkitURISchemeRequestReadCallback):
     21        * UIProcess/API/gtk/WebKitWebView.cpp:
     22        (gotFaviconCallback):
     23        * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
     24        (WebKit::WebInspectorServer::platformResourceForPath):
     25        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
     26        (WebKit::ProcessLauncher::launchProcess):
     27        * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
     28        (WebKit::PluginProcessProxy::scanPlugin):
     29        * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
     30        * WebProcess/soup/WebProcessSoup.cpp:
     31        (WebKit::getCacheDiskFreeSize):
     32
    1332014-02-10  Tim Horton  <timothy_horton@apple.com>
    234

  • trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp

    r161976 r163797  
    3838#include <WebCore/SoupNetworkSession.h>
    3939#include <libsoup/soup.h>
    40 #include <wtf/gobject/GOwnPtr.h>
    4140#include <wtf/gobject/GRefPtr.h>
     41#include <wtf/gobject/GUniquePtr.h>
    4242
    4343using namespace WebCore;
    … …  
    4949    ASSERT(cache);
    5050
    51     GOwnPtr<char> cacheDir;
     51    GUniqueOutPtr<char> cacheDir;
    5252    g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
    5353    if (!cacheDir)

  • trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp

    r162830 r163797  
    3333#include <WebCore/ResourceHandleInternal.h>
    3434#include <gio/gio.h>
    35 #include <wtf/gobject/GOwnPtr.h>
    3635#include <wtf/gobject/GRefPtr.h>
    3736#include <wtf/gobject/GUniquePtr.h>
    … …  
    107106        String intermediateURI = m_destinationURI + ".wkdownload";
    108107        m_intermediateFile = adoptGRef(g_file_new_for_uri(intermediateURI.utf8().data()));
    109         GOwnPtr<GError> error;
     108        GUniqueOutPtr<GError> error;
    110109        m_outputStream = adoptGRef(g_file_replace(m_intermediateFile.get(), 0, TRUE, G_FILE_CREATE_NONE, 0, &error.outPtr()));
    111110        if (!m_outputStream) {
    … …  
    125124
    126125        gsize bytesWritten;
    127         GOwnPtr<GError> error;
     126        GUniqueOutPtr<GError> error;
    128127        g_output_stream_write_all(G_OUTPUT_STREAM(m_outputStream.get()), data, length, &bytesWritten, 0, &error.outPtr());
    129128        if (error) {
    … …  
    140139        ASSERT(m_intermediateFile);
    141140        GRefPtr<GFile> destinationFile = adoptGRef(g_file_new_for_uri(m_destinationURI.utf8().data()));
    142         GOwnPtr<GError> error;
     141        GUniqueOutPtr<GError> error;
    143142        if (!g_file_move(m_intermediateFile.get(), destinationFile.get(), G_FILE_COPY_NONE, nullptr, nullptr, nullptr, &error.outPtr())) {
    144143            downloadFailed(platformDownloadDestinationError(m_response, error->message));

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp

    r160125 r163797  
    3030#include <glib/gi18n-lib.h>
    3131#include <wtf/RunLoop.h>
    32 #include <wtf/gobject/GOwnPtr.h>
    3332#include <wtf/gobject/GRefPtr.h>
     33#include <wtf/gobject/GUniquePtr.h>
    3434#include <wtf/text/CString.h>
    3535
    … …  
    165165        return;
    166166
    167     GOwnPtr<GError> error;
     167    GUniqueOutPtr<GError> error;
    168168    RefPtr<cairo_surface_t> icon = getIconSurfaceSynchronously(database, pageURL, &error.outPtr());
    169169
    … …  
    171171        GTask* task = pendingIconRequests->at(i).get();
    172172        if (error)
    173             g_task_return_error(task, error.release());
     173            g_task_return_error(task, error.release().release());
    174174        else {
    175175            GetFaviconSurfaceAsyncData* data = static_cast<GetFaviconSurfaceAsyncData*>(g_task_get_task_data(task));
    … …  
    291291    // We ask for the icon directly. If we don't get the icon data now,
    292292    // we'll be notified later (even if the database is still importing icons).
    293     GOwnPtr<GError> error;
     293    GUniqueOutPtr<GError> error;
    294294    data->icon = getIconSurfaceSynchronously(database, data->pageURL, &error.outPtr());
    295295    if (data->icon) {
    … …  
    302302
    303303    if (g_error_matches(error.get(), WEBKIT_FAVICON_DATABASE_ERROR, WEBKIT_FAVICON_DATABASE_ERROR_FAVICON_NOT_FOUND)) {
    304         g_task_return_error(task.get(), error.release());
     304        g_task_return_error(task.get(), error.release().release());
    305305        return;
    306306    }

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp

    r162920 r163797  
    2929#include <WebCore/ResourceError.h>
    3030#include <libsoup/soup.h>
    31 #include <wtf/gobject/GOwnPtr.h>
    3231#include <wtf/gobject/GRefPtr.h>
    3332#include <wtf/text/CString.h>
    … …  
    160159{
    161160    GRefPtr<WebKitURISchemeRequest> request = adoptGRef(schemeRequest);
    162     GOwnPtr<GError> error;
     161    GUniqueOutPtr<GError> error;
    163162    gssize bytesRead = g_input_stream_read_finish(inputStream, result, &error.outPtr());
    164163    if (bytesRead == -1) {

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

    r163781 r163797  
    6767#include <WebCore/RefPtrCairo.h>
    6868#include <glib/gi18n-lib.h>
    69 #include <wtf/gobject/GOwnPtr.h>
    7069#include <wtf/gobject/GRefPtr.h>
    7170#include <wtf/text/CString.h>
    … …  
    339338static void gotFaviconCallback(GObject* object, GAsyncResult* result, gpointer userData)
    340339{
    341     GOwnPtr<GError> error;
     340    GUniqueOutPtr<GError> error;
    342341    RefPtr<cairo_surface_t> favicon = adoptRef(webkit_favicon_database_get_favicon_finish(WEBKIT_FAVICON_DATABASE(object), result, &error.outPtr()));
    343342    if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_CANCELLED))

  • trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp

    r162599 r163797  
    3434#include <gio/gio.h>
    3535#include <glib.h>
    36 #include <wtf/gobject/GOwnPtr.h>
    3736#include <wtf/gobject/GUniquePtr.h>
    3837#include <wtf/text/CString.h>
    … …  
    5655
    5756    GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(resourceURI.data()));
    58     GOwnPtr<GError> error;
     57    GUniqueOutPtr<GError> error;
    5958    GRefPtr<GFileInfo> fileInfo = adoptGRef(g_file_query_info(file.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE "," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, 0, &error.outPtr()));
    6059    if (!fileInfo) {

  • trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

    r162599 r163797  
    4040#include <wtf/text/CString.h>
    4141#include <wtf/text/WTFString.h>
    42 #include <wtf/gobject/GOwnPtr.h>
    4342#include <wtf/gobject/GUniquePtr.h>
    4443#include <wtf/gobject/GlibUtilities.h>
    … …  
    124123    argv[i++] = 0;
    125124
    126     GOwnPtr<GError> error;
     125    GUniqueOutPtr<GError> error;
    127126    if (!g_spawn_async(0, argv, 0, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, childSetupFunction, GINT_TO_POINTER(sockets[1]), &pid, &error.outPtr())) {
    128127        g_printerr("Unable to fork a new WebProcess: %s.\n", error->message);

  • trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

    r162513 r163797  
    3838#if PLATFORM(GTK) || PLATFORM(EFL)
    3939#include <glib.h>
    40 #include <wtf/gobject/GOwnPtr.h>
     40#include <wtf/gobject/GUniquePtr.h>
    4141#endif
    4242
    … …  
    7575
    7676    int status;
    77     GOwnPtr<char> stdOut;
     77    GUniqueOutPtr<char> stdOut;
    7878
    7979    // If the disposition of SIGCLD signal is set to SIG_IGN (default)

  • trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp

    r162599 r163797  
    4141#include <gtk/gtk.h>
    4242#include <wtf/Vector.h>
    43 #include <wtf/gobject/GOwnPtr.h>
    4443#include <wtf/gobject/GUniquePtr.h>
    4544
    … …  
    8079        m_printJob = adoptGRef(gtk_print_job_new(jobName.get(), printer, m_printSettings.get(), m_pageSetup.get()));
    8180
    82         GOwnPtr<GError> error;
     81        GUniqueOutPtr<GError> error;
    8382        cairo_surface_t* surface = gtk_print_job_get_surface(m_printJob.get(), &error.outPtr());
    8483        if (!surface) {

  • trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp

    r162449 r163797  
    4242#include <WebCore/SoupNetworkSession.h>
    4343#include <libsoup/soup.h>
    44 #include <wtf/gobject/GOwnPtr.h>
    4544#include <wtf/gobject/GRefPtr.h>
     45#include <wtf/gobject/GUniquePtr.h>
    4646
    4747#if !ENABLE(CUSTOM_PROTOCOLS)
    … …  
    5555    ASSERT(cache);
    5656
    57     GOwnPtr<char> cacheDir;
     57    GUniqueOutPtr<char> cacheDir;
    5858    g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
    5959    if (!cacheDir)

  • trunk/Tools/ChangeLog

    r163781 r163797  
     12014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
     4        https://bugs.webkit.org/show_bug.cgi?id=127554
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        Use GUniqueOutPtr instead of GOwnPtr.
     9
     10        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     11        * DumpRenderTree/gtk/EventSender.cpp:
     12        (createKeyPressEvent):
     13        * TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp:
     14        (TestWebKitAPI::returnOutChar):
     15        (TestWebKitAPI::TEST):
     16        * TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp:
     17        * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
     18        (testInspectorServerPageList):
     19        (openRemoteDebuggingSession):
     20        (sendIncompleteRequest):
     21        * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
     22        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
     23        (testWebExtensionWindowObjectCleared):
     24        (testWebExtensionIsolatedWorld):
     25        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp:
     26        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
     27        (testWebViewRunJavaScript):
     28        (testWebViewSave):
     29        (testWebViewPageVisibility):
     30        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp:
     31        (isStyleSheetInjectedForURLAtPath):
     32        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
     33        * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
     34        * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp:
     35        * TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp:
     36        (TestWebKitAPI::TestInputMethodFilter::sendKeyEventToFilter):
     37        * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
     38        (TestWebKitAPI::doKeyStroke):
     39        * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
     40        * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp:
     41        (WebKitTestBus::run):
     42        * TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:
     43        (resourceGetDataCallback):
     44        (WebViewTest::keyStroke):
     45        (onSnapshotReady):
     46        * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
     47        (WTR::EventSenderProxy::keyDown):
     48
    1492014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
    250

  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r163427 r163797  
    5555#include <webkit/webkit.h>
    5656#include <wtf/Assertions.h>
    57 #include <wtf/gobject/GOwnPtr.h>
    5857#include <wtf/gobject/GlibUtilities.h>
    5958#include <wtf/text/WTFString.h>

  • trunk/Tools/DumpRenderTree/gtk/EventSender.cpp

    r163749 r163797  
    4848#include <wtf/ASCIICType.h>
    4949#include <wtf/Platform.h>
    50 #include <wtf/gobject/GOwnPtr.h>
    5150#include <wtf/gobject/GUniquePtr.h>
    5251#include <wtf/text/CString.h>
    … …  
    806805    // When synthesizing an event, an invalid hardware_keycode value
    807806    // can cause it to be badly processed by Gtk+.
    808     GOwnPtr<GdkKeymapKey> keys;
     807    GUniqueOutPtr<GdkKeymapKey> keys;
    809808    gint nKeys;
    810809    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeySym, &keys.outPtr(), &nKeys))

  • trunk/Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp

    r162516 r163797  
    146146}
    147147
     148static void returnOutChar(char** outChar)
     149{
     150    *outChar = g_strdup("a");
     151}
     152
     153TEST(WTF_GUniquePtr, OutPtr)
     154{
     155    std::ostringstream actual;
     156
     157    {
     158        GUniqueOutPtr<char> a;
     159        ASSERT_EQ(nullptr, a.get());
     160    }
     161    ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
     162    actual.str("");
     163
     164    {
     165        GUniqueOutPtr<char> a;
     166        returnOutChar(&a.outPtr());
     167        actual << "g_free(" << a.get() << ");";
     168    }
     169    ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
     170    actual.str("");
     171
     172    {
     173        GUniqueOutPtr<char> a;
     174        returnOutChar(&a.outPtr());
     175        actual << "g_free(" << a.get() << ");";
     176        returnOutChar(&a.outPtr());
     177        ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
     178        actual.str("");
     179        actual << "g_free(" << a.get() << ");";
     180    }
     181    ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
     182    actual.str("");
     183
     184    {
     185        GUniqueOutPtr<char> a;
     186        returnOutChar(&a.outPtr());
     187        GUniquePtr<char> b = a.release();
     188        ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
     189        actual << "g_free(" << b.get() << ");";
     190    }
     191    ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
     192    actual.str("");
     193}
     194
    148195} // namespace TestWebKitAPI

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp

    r162599 r163797  
    8989    static void getAcceptPolicyReadyCallback(GObject* object, GAsyncResult* result, gpointer userData)
    9090    {
    91         GOwnPtr<GError> error;
     91        GUniqueOutPtr<GError> error;
    9292        WebKitCookieAcceptPolicy policy = webkit_cookie_manager_get_accept_policy_finish(WEBKIT_COOKIE_MANAGER(object), result, &error.outPtr());
    9393        g_assert(!error.get());
    … …  
    114114    static void getDomainsReadyCallback(GObject* object, GAsyncResult* result, gpointer userData)
    115115    {
    116         GOwnPtr<GError> error;
     116        GUniqueOutPtr<GError> error;
    117117        char** domains = webkit_cookie_manager_get_domains_with_cookies_finish(WEBKIT_COOKIE_MANAGER(object), result, &error.outPtr());
    118118        g_assert(!error.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp

    r162599 r163797  
    159159static void testInspectorServerPageList(InspectorServerTest* test, gconstpointer)
    160160{
    161     GOwnPtr<GError> error;
     161    GUniqueOutPtr<GError> error;
    162162
    163163    test->showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
    … …  
    229229    g_assert(test->getPageList());
    230230
    231     GOwnPtr<GError> error;
     231    GUniqueOutPtr<GError> error;
    232232    WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("pages[0].inspectorUrl;", &error.outPtr());
    233233    g_assert(javascriptResult);
    … …  
    248248static void sendIncompleteRequest(InspectorServerTest* test, gconstpointer)
    249249{
    250     GOwnPtr<GError> error;
     250    GUniqueOutPtr<GError> error;
    251251
    252252    // Connect to the inspector server.

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp

    r162599 r163797  
    162162    {
    163163        size_t dataSize;
    164         GOwnPtr<GError> error;
     164        GUniqueOutPtr<GError> error;
    165165        unsigned char* data = webkit_web_resource_get_data_finish(WEBKIT_WEB_RESOURCE(object), result, &dataSize, &error.outPtr());
    166166        g_assert(!error.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp

    r162599 r163797  
    107107    test->waitUntilLoadFinished();
    108108
    109     GOwnPtr<GError> error;
     109    GUniqueOutPtr<GError> error;
    110110    WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.echo('Foo');", &error.outPtr());
    111111    g_assert(javascriptResult);
    … …  
    134134    test->waitUntilLoadFinished();
    135135
    136     GOwnPtr<char> result;
     136    GUniqueOutPtr<char> result;
    137137    gulong scriptDialogID = g_signal_connect(test->m_webView, "script-dialog", G_CALLBACK(scriptDialogCallback), &result.outPtr());
    138138
    … …  
    144144    test->runJavaScriptAndWaitUntilFinished(mainWorldScript, 0);
    145145    g_assert_cmpstr(result.get(), ==, "Main World");
    146     result.clear();
    147146
    148147    WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementById('console').innerHTML", 0);
    … …  
    166165    g_main_loop_run(test->m_mainLoop);
    167166    g_assert_cmpstr(result.get(), ==, "Isolated World");
    168     result.clear();
    169167
    170168    // Check that 'top.foo' defined in main world is not visible in isolated world.

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp

    r162599 r163797  
    2424#include <glib/gstdio.h>
    2525#include <libsoup/soup.h>
    26 #include <wtf/gobject/GOwnPtr.h>
    2726#include <wtf/gobject/GUniquePtr.h>
    2827
    … …  
    3736        : m_webContext(webkit_web_context_get_default())
    3837        , m_favicon(0)
    39         , m_error(0)
    4038        , m_faviconNotificationReceived(false)
    4139    {
    … …  
    8583    void getFaviconForPageURIAndWaitUntilReady(const char* pageURI)
    8684    {
    87         m_error.clear();
    8885        if (m_favicon) {
    8986            cairo_surface_destroy(m_favicon);
    … …  
    9996    cairo_surface_t* m_favicon;
    10097    CString m_faviconURI;
    101     GOwnPtr<GError> m_error;
     98    GUniqueOutPtr<GError> m_error;
    10299    bool m_faviconNotificationReceived;
    103100};

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp

    r162599 r163797  
    8787    test->waitUntilLoadFinished();
    8888
    89     GOwnPtr<GError> error;
     89    GUniqueOutPtr<GError> error;
    9090    WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.getElementById('WebKitLink').title;", &error.outPtr());
    9191    g_assert(javascriptResult);
    … …  
    145145    g_assert(!javascriptResult);
    146146    g_assert_error(error.get(), G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
    147     error.clear();
    148147
    149148    javascriptResult = test->runJavaScriptAndWaitUntilFinished("foo();", &error.outPtr());
    … …  
    347346    static void webViewSavedToStreamCallback(GObject* object, GAsyncResult* result, SaveWebViewTest* test)
    348347    {
    349         GOwnPtr<GError> error;
     348        GUniqueOutPtr<GError> error;
    350349        test->m_inputStream = adoptGRef(webkit_web_view_save_finish(test->m_webView, result, &error.outPtr()));
    351350        g_assert(G_IS_INPUT_STREAM(test->m_inputStream.get()));
    … …  
    357356    static void webViewSavedToFileCallback(GObject* object, GAsyncResult* result, SaveWebViewTest* test)
    358357    {
    359         GOwnPtr<GError> error;
     358        GUniqueOutPtr<GError> error;
    360359        g_assert(webkit_web_view_save_to_file_finish(test->m_webView, result, &error.outPtr()));
    361360        g_assert(!error);
    … …  
    406405    // different on each case. MHTML functionality will be tested by
    407406    // Layout tests, so checking the amount of bytes is enough.
    408     GOwnPtr<GError> error;
     407    GUniqueOutPtr<GError> error;
    409408    gchar buffer[512] = { 0 };
    410409    gssize readBytes = 0;
    … …  
    459458    test->waitUntilLoadFinished();
    460459
    461     GOwnPtr<GError> error;
     460    GUniqueOutPtr<GError> error;
    462461    WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.visibilityState;", &error.outPtr());
    463462    g_assert(javascriptResult);
    … …  
    508507    static void onSnapshotCancelledReady(WebKitWebView* web_view, GAsyncResult* res, SnapshotWebViewTest* test)
    509508    {
    510         GOwnPtr<GError> error;
     509        GUniqueOutPtr<GError> error;
    511510        test->m_surface = webkit_web_view_get_snapshot_finish(web_view, res, &error.outPtr());
    512511        g_assert(!test->m_surface);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp

    r162599 r163797  
    104104    test->waitUntilLoadFinished();
    105105
    106     GOwnPtr<GError> error;
     106    GUniqueOutPtr<GError> error;
    107107    WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished(kStyleSheetTestScript, &error.outPtr());
    108108    g_assert(javascriptResult);

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp

    r162599 r163797  
    3939    static void canExecuteEditingCommandReadyCallback(GObject*, GAsyncResult* result, EditorTest* test)
    4040    {
    41         GOwnPtr<GError> error;
     41        GUniqueOutPtr<GError> error;
    4242        test->m_canExecuteEditingCommand = webkit_web_view_can_execute_editing_command_finish(test->m_webView, result, &error.outPtr());
    4343        g_assert(!error.get());

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp

    r162928 r163797  
    3030#include <wtf/PassOwnPtr.h>
    3131#include <wtf/ProcessID.h>
    32 #include <wtf/gobject/GOwnPtr.h>
    3332#include <wtf/gobject/GRefPtr.h>
    3433#include <wtf/gobject/GUniquePtr.h>
    … …  
    245244        introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);
    246245
    247     GOwnPtr<GError> error;
     246    GUniqueOutPtr<GError> error;
    248247    unsigned registrationID = g_dbus_connection_register_object(
    249248        connection,

  • trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp

    r161366 r163797  
    2222
    2323#include <gio/gio.h>
    24 #include <wtf/gobject/GOwnPtr.h>
     24#include <wtf/gobject/GUniquePtr.h>
    2525
    2626typedef HashMap<String, std::function<PassOwnPtr<WebProcessTest> ()>> TestsMap;
    … …  
    8181        introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);
    8282
    83     GOwnPtr<GError> error;
     83    GUniqueOutPtr<GError> error;
    8484    unsigned registrationID = g_dbus_connection_register_object(
    8585        connection,

  • trunk/Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp

    r138806 r163797  
    3030#include <gdk/gdkkeysyms.h>
    3131#include <gtk/gtk.h>
    32 #include <wtf/gobject/GOwnPtr.h>
     32#include <wtf/gobject/GUniquePtr.h>
    3333#include <wtf/gobject/GRefPtr.h>
    3434#include <wtf/text/CString.h>
    … …  
    6565#endif
    6666
    67         GOwnPtr<GdkKeymapKey> keys;
     67        GUniqueOutPtr<GdkKeymapKey> keys;
    6868        gint nKeys;
    6969        if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeyValue, &keys.outPtr(), &nKeys))

  • trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp

    r162599 r163797  
    2929#include <WebCore/GUniquePtrGtk.h>
    3030#include <gtk/gtk.h>
    31 #include <wtf/gobject/GOwnPtr.h>
     31#include <wtf/gobject/GUniquePtr.h>
    3232
    3333namespace TestWebKitAPI {
    … …  
    6868
    6969    // When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
    70     GOwnPtr<GdkKeymapKey> keys;
     70    GUniqueOutPtr<GdkKeymapKey> keys;
    7171    int keysCount;
    7272    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keyVal, &keys.outPtr(), &keysCount))

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h

    r162599 r163797  
    2424#include <glib-object.h>
    2525#include <wtf/HashSet.h>
    26 #include <wtf/gobject/GOwnPtr.h>
    2726#include <wtf/gobject/GUniquePtr.h>
    2827#include <wtf/text/CString.h>

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp

    r162599 r163797  
    2121#include "WebKitTestBus.h"
    2222
    23 #include <wtf/gobject/GOwnPtr.h>
    2423#include <wtf/gobject/GUniquePtr.h>
    2524#include <wtf/text/WTFString.h>
    … …  
    3938    }
    4039
    41     GOwnPtr<char> output;
    42     GOwnPtr<GError> error;
     40    GUniqueOutPtr<char> output;
     41    GUniqueOutPtr<GError> error;
    4342    if (!g_spawn_command_line_sync(dbusLaunch.get(), &output.outPtr(), 0, 0, &error.outPtr())) {
    4443        g_warning("Error starting DBUS daemon: %s", error->message);

  • trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp

    r162599 r163797  
    219219{
    220220    size_t dataSize;
    221     GOwnPtr<GError> error;
     221    GUniqueOutPtr<GError> error;
    222222    unsigned char* data = webkit_web_resource_get_data_finish(WEBKIT_WEB_RESOURCE(object), result, &dataSize, &error.outPtr());
    223223    g_assert(data);
    … …  
    289289
    290290    // When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
    291     GOwnPtr<GdkKeymapKey> keys;
     291    GUniqueOutPtr<GdkKeymapKey> keys;
    292292    int keysCount;
    293293    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keyVal, &keys.outPtr(), &keysCount))
    … …  
    426426static void onSnapshotReady(WebKitWebView* web_view, GAsyncResult* res, WebViewTest* test)
    427427{
    428     GOwnPtr<GError> error;
     428    GUniqueOutPtr<GError> error;
    429429    test->m_surface = webkit_web_view_get_snapshot_finish(web_view, res, &error.outPtr());
    430430    g_assert(!test->m_surface || !error.get());

  • trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp

    r163774 r163797  
    4040#include <gtk/gtk.h>
    4141#include <wtf/StdLibExtras.h>
    42 #include <wtf/gobject/GOwnPtr.h>
     42#include <wtf/gobject/GUniquePtr.h>
    4343#include <wtf/text/WTFString.h>
    4444
    … …  
    297297    gdk_event_set_device(pressEvent, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(pressEvent->key.window))));
    298298
    299     GOwnPtr<GdkKeymapKey> keys;
     299    GUniqueOutPtr<GdkKeymapKey> keys;
    300300    gint nKeys;
    301301    if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeySym, &keys.outPtr(), &nKeys))
Note: See TracChangeset for help on using the changeset viewer.