<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163865] releases/WebKitGTK/webkit-2.4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163865">163865</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-10 23:35:34 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/163797">r163797</a> - [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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFChangeLog">releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFGNUmakefilelistam">releases/WebKitGTK/webkit-2.4/Source/WTF/GNUmakefile.list.am</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFwtfPlatformEflcmake">releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformEfl.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFwtfPlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFwtfgobjectGUniquePtrh">releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GUniquePtr.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreGNUmakefilelistam">releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorePlatformEflcmake">releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformaudiogstreamerAudioDestinationGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformglibBatteryProviderUPowercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/glib/BatteryProviderUPower.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgtkImageBufferGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgtkImageGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkDataObjectGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/DataObjectGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkFileSystemGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/FileSystemGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkGamepadsGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GamepadsGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkGtkInputMethodFiltercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkPasteboardHelpercpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/PasteboardHelper.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkRenderThemeGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformgtkSharedBufferGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/SharedBufferGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworkgtkCredentialBackingStorecpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupResourceHandleSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkWebCoreSupportTextCheckerClientGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkwebkitwebkitdownloadcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitdownload.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkwebkitwebkitwebplugincpp">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebplugin.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKitgtkwebkitwebkitwebviewcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2SharedDownloadssoupDownloadSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitFaviconDatabasecpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcesssoupWebProcessSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsChangeLog">releases/WebKitGTK/webkit-2.4/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsDumpRenderTreegtkDumpRenderTreecpp">releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsDumpRenderTreegtkEventSendercpp">releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/EventSender.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWTFgobjectGUniquePtrcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestCookieManagercpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestInspectorServercpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebKitFaviconDatabasecpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewGroupcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkWebProcessTestcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsgtkInputMethodFiltercpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkPlatformWebViewGtkcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkWebKit2GtkTestMainh">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBuscpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsWebKitTestRunnergtkEventSenderProxyGtkcpp">releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFwtfgobjectGOwnPtrcpp">releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWTFwtfgobjectGOwnPtrh">releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.h</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupGOwnPtrSoupcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupGOwnPtrSouph">releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/ChangeLog 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127554
+
+ Reviewed by Gustavo Noronha Silva.
+
+ 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):
+
</ins><span class="cx"> 2014-02-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> HashMap can't be used with std::unique_ptr as value when it has a custom deleter
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/GNUmakefile.list.am (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/GNUmakefile.list.am 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/GNUmakefile.list.am 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -209,8 +209,6 @@
</span><span class="cx"> Source/WTF/wtf/dtoa/strtod.h \
</span><span class="cx"> Source/WTF/wtf/dtoa/utils.h \
</span><span class="cx"> Source/WTF/wtf/gobject/GMutexLocker.h \
</span><del>- Source/WTF/wtf/gobject/GOwnPtr.cpp \
- Source/WTF/wtf/gobject/GOwnPtr.h \
</del><span class="cx"> Source/WTF/wtf/gobject/GRefPtr.cpp \
</span><span class="cx"> Source/WTF/wtf/gobject/GRefPtr.h \
</span><span class="cx"> Source/WTF/wtf/gobject/GTypedefs.h \
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFwtfPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformEfl.cmake (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformEfl.cmake 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformEfl.cmake 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -4,7 +4,6 @@
</span><span class="cx"> efl/RefPtrEfl.cpp
</span><span class="cx"> efl/RunLoopEfl.cpp
</span><span class="cx">
</span><del>- gobject/GOwnPtr.cpp
</del><span class="cx"> gobject/GRefPtr.cpp
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFwtfPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformGTK.cmake (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformGTK.cmake 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/PlatformGTK.cmake 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,5 +1,4 @@
</span><span class="cx"> list(APPEND WTF_SOURCES
</span><del>- gobject/GOwnPtr.cpp
</del><span class="cx"> gobject/GRefPtr.cpp
</span><span class="cx"> gobject/GlibUtilities.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFwtfgobjectGOwnPtrcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "GOwnPtr.h"
-
-#if USE(GLIB)
-
-#include <gio/gio.h>
-#include <glib.h>
-
-namespace WTF {
-
-template <> WTF_EXPORT_PRIVATE void freeOwnedGPtr<GError>(GError* ptr)
-{
- if (ptr)
- g_error_free(ptr);
-}
-
-template <> void freeOwnedGPtr<GList>(GList* ptr)
-{
- g_list_free(ptr);
-}
-
-template <> void freeOwnedGPtr<GSList>(GSList* ptr)
-{
- g_slist_free(ptr);
-}
-
-template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr)
-{
- if (ptr)
- g_pattern_spec_free(ptr);
-}
-
-template <> void freeOwnedGPtr<GDir>(GDir* ptr)
-{
- if (ptr)
- g_dir_close(ptr);
-}
-
-template <> void freeOwnedGPtr<GTimer>(GTimer* ptr)
-{
- if (ptr)
- g_timer_destroy(ptr);
-}
-
-template <> void freeOwnedGPtr<GKeyFile>(GKeyFile* ptr)
-{
- if (ptr)
- g_key_file_free(ptr);
-}
-
-} // namespace WTF
-
-#endif // USE(GLIB)
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFwtfgobjectGOwnPtrh"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.h (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.h 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GOwnPtr.h 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,144 +0,0 @@
</span><del>-/*
- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
- * Copyright (C) 2008 Collabora Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GOwnPtr_h
-#define GOwnPtr_h
-
-#if USE(GLIB)
-
-#include <algorithm>
-#include <wtf/Assertions.h>
-#include <wtf/Noncopyable.h>
-
-extern "C" void g_free(void*);
-
-namespace WTF {
-
-template <typename T> inline void freeOwnedGPtr(T* ptr);
-template<> WTF_EXPORT_PRIVATE void freeOwnedGPtr<GError>(GError*);
-template<> void freeOwnedGPtr<GList>(GList*);
-template<> void freeOwnedGPtr<GSList>(GSList*);
-template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*);
-template<> void freeOwnedGPtr<GDir>(GDir*);
-template<> void freeOwnedGPtr<GTimer>(GTimer*);
-template<> void freeOwnedGPtr<GKeyFile>(GKeyFile*);
-
-template <typename T> class GOwnPtr {
- WTF_MAKE_NONCOPYABLE(GOwnPtr);
-public:
- explicit GOwnPtr(T* ptr = 0) : m_ptr(ptr) { }
- ~GOwnPtr() { freeOwnedGPtr(m_ptr); }
-
- T* get() const { return m_ptr; }
- T* release()
- {
- T* ptr = m_ptr;
- m_ptr = 0;
- return ptr;
- }
-
- T*& outPtr()
- {
- ASSERT(!m_ptr);
- return m_ptr;
- }
-
- void set(T* ptr)
- {
- ASSERT(!ptr || m_ptr != ptr);
- freeOwnedGPtr(m_ptr);
- m_ptr = ptr;
- }
-
- void clear()
- {
- T* ptr = m_ptr;
- m_ptr = 0;
- freeOwnedGPtr(ptr);
- }
-
- T& operator*() const
- {
- ASSERT(m_ptr);
- return *m_ptr;
- }
-
- T* operator->() const
- {
- ASSERT(m_ptr);
- return m_ptr;
- }
-
- bool operator!() const { return !m_ptr; }
-
- // This conversion operator allows implicit conversion to bool but not to other integer types.
- typedef T* GOwnPtr::*UnspecifiedBoolType;
- operator UnspecifiedBoolType() const { return m_ptr ? &GOwnPtr::m_ptr : 0; }
-
- void swap(GOwnPtr& o) { std::swap(m_ptr, o.m_ptr); }
-
-private:
- T* m_ptr;
-};
-
-template <typename T> inline void swap(GOwnPtr<T>& a, GOwnPtr<T>& b)
-{
- a.swap(b);
-}
-
-template <typename T, typename U> inline bool operator==(const GOwnPtr<T>& a, U* b)
-{
- return a.get() == b;
-}
-
-template <typename T, typename U> inline bool operator==(T* a, const GOwnPtr<U>& b)
-{
- return a == b.get();
-}
-
-template <typename T, typename U> inline bool operator!=(const GOwnPtr<T>& a, U* b)
-{
- return a.get() != b;
-}
-
-template <typename T, typename U> inline bool operator!=(T* a, const GOwnPtr<U>& b)
-{
- return a != b.get();
-}
-
-template <typename T> inline typename GOwnPtr<T>::PtrType getPtr(const GOwnPtr<T>& p)
-{
- return p.get();
-}
-
-template <typename T> inline void freeOwnedGPtr(T* ptr)
-{
- g_free(ptr);
-}
-
-} // namespace WTF
-
-using WTF::GOwnPtr;
-
-#endif // USE(GLIB)
-
-#endif // GOwnPtr_h
-
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWTFwtfgobjectGUniquePtrh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GUniquePtr.h (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GUniquePtr.h 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WTF/wtf/gobject/GUniquePtr.h 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #if USE(GLIB)
</span><span class="cx">
</span><span class="cx"> #include <gio/gio.h>
</span><ins>+#include <wtf/Noncopyable.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -57,9 +58,68 @@
</span><span class="cx"> FOR_EACH_GLIB_DELETER(WTF_DEFINE_GPTR_DELETER)
</span><span class="cx"> #undef FOR_EACH_GLIB_DELETER
</span><span class="cx">
</span><ins>+template <typename T> class GUniqueOutPtr {
+ WTF_MAKE_NONCOPYABLE(GUniqueOutPtr);
+public:
+ GUniqueOutPtr()
+ : m_ptr(nullptr)
+ {
+ }
+
+ ~GUniqueOutPtr()
+ {
+ reset();
+ }
+
+ T*& outPtr()
+ {
+ reset();
+ return m_ptr;
+ }
+
+ GUniquePtr<T> release()
+ {
+ GUniquePtr<T> ptr(m_ptr);
+ m_ptr = nullptr;
+ return ptr;
+ }
+
+ T& operator*() const
+ {
+ ASSERT(m_ptr);
+ return *m_ptr;
+ }
+
+ T* operator->() const
+ {
+ ASSERT(m_ptr);
+ return m_ptr;
+ }
+
+ T* get() const { return m_ptr; }
+
+ bool operator!() const { return !m_ptr; }
+
+ // This conversion operator allows implicit conversion to bool but not to other integer types.
+ typedef T* GUniqueOutPtr::*UnspecifiedBoolType;
+ operator UnspecifiedBoolType() const { return m_ptr ? &GUniqueOutPtr::m_ptr : 0; }
+
+private:
+ void reset()
+ {
+ if (m_ptr) {
+ GUniquePtr<T> deletePtr(m_ptr);
+ m_ptr = nullptr;
+ }
+ }
+
+ T* m_ptr;
+};
+
</ins><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::GUniquePtr;
</span><ins>+using WTF::GUniqueOutPtr;
</ins><span class="cx">
</span><span class="cx"> #endif // USE(GLIB)
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,3 +1,65 @@
</span><ins>+2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127554
+
+ Reviewed by Gustavo Noronha Silva.
+
+ 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):
+
</ins><span class="cx"> 2014-02-09 Carlos Garnacho <carlosg@gnome.org>
</span><span class="cx">
</span><span class="cx"> [GTK] Add touch-events related code to build
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -5869,8 +5869,6 @@
</span><span class="cx"> Source/WebCore/platform/leveldb/LevelDBTransaction.cpp \
</span><span class="cx"> Source/WebCore/platform/leveldb/LevelDBWriteBatch.h \
</span><span class="cx"> Source/WebCore/platform/leveldb/LevelDBWriteBatch.cpp \
</span><del>- Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp \
- Source/WebCore/platform/network/soup/GOwnPtrSoup.h \
</del><span class="cx"> Source/WebCore/platform/network/soup/GUniquePtrSoup.h \
</span><span class="cx"> Source/WebCore/platform/network/soup/ProxyServerSoup.cpp \
</span><span class="cx"> Source/WebCore/platform/network/soup/ResourceError.h \
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformEfl.cmake (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformEfl.cmake 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformEfl.cmake 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -157,7 +157,6 @@
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span><span class="cx"> platform/network/soup/DNSSoup.cpp
</span><del>- platform/network/soup/GOwnPtrSoup.cpp
</del><span class="cx"> platform/network/soup/NetworkStorageSessionSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyResolverSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyServerSoup.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/PlatformGTK.cmake 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -115,7 +115,6 @@
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span><span class="cx"> platform/network/soup/DNSSoup.cpp
</span><del>- platform/network/soup/GOwnPtrSoup.cpp
</del><span class="cx"> platform/network/soup/NetworkStorageSessionSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyResolverSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyServerSoup.cpp
</span><span class="lines">@@ -245,7 +244,6 @@
</span><span class="cx"> platform/network/soup/CookieStorageSoup.cpp
</span><span class="cx"> platform/network/soup/CredentialStorageSoup.cpp
</span><span class="cx"> platform/network/soup/DNSSoup.cpp
</span><del>- platform/network/soup/GOwnPtrSoup.cpp
</del><span class="cx"> platform/network/soup/NetworkStorageSessionSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyResolverSoup.cpp
</span><span class="cx"> platform/network/soup/ProxyServerSoup.cpp
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformaudiogstreamerAudioDestinationGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -24,12 +24,12 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioChannel.h"
</span><span class="cx"> #include "AudioSourceProvider.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "WebKitWebAudioSourceGStreamer.h"
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/pbutils/pbutils.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -150,8 +150,8 @@
</span><span class="cx">
</span><span class="cx"> gboolean AudioDestinationGStreamer::handleMessage(GstMessage* message)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
- GOwnPtr<gchar> debug;
</del><ins>+ GUniqueOutPtr<GError> error;
+ GUniqueOutPtr<gchar> debug;
</ins><span class="cx">
</span><span class="cx"> switch (GST_MESSAGE_TYPE(message)) {
</span><span class="cx"> case GST_MESSAGE_WARNING:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/pbutils/pbutils.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> #include <gst/audio/audio.h>
</span><span class="cx">
</span><span class="lines">@@ -203,8 +203,8 @@
</span><span class="cx">
</span><span class="cx"> gboolean AudioFileReader::handleMessage(GstMessage* message)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
- GOwnPtr<gchar> debug;
</del><ins>+ GUniqueOutPtr<GError> error;
+ GUniqueOutPtr<gchar> debug;
</ins><span class="cx">
</span><span class="cx"> switch (GST_MESSAGE_TYPE(message)) {
</span><span class="cx"> case GST_MESSAGE_EOS:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformglibBatteryProviderUPowercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/glib/BatteryProviderUPower.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/glib/BatteryProviderUPower.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/glib/BatteryProviderUPower.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "BatteryProviderUPowerClient.h"
</span><span class="cx"> #include <cmath>
</span><span class="cx"> #include <limits>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> ASSERT(!m_upowerClient);
</span><span class="cx"> m_upowerClient = adoptGRef(up_client_new());
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> if (!up_client_enumerate_devices_sync(m_upowerClient.get(), 0, &error.outPtr())) {
</span><span class="cx"> m_client->updateBatteryStatus(NotAvailable);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #include <gst/audio/audio.h>
</span><span class="cx"> #include <gst/gst.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> // FIXME: We should probably pass the arguments from the command line.
</span><span class="cx"> bool gstInitialized = gst_init_check(0, 0, &error.outPtr());
</span><span class="cx"> ASSERT_WITH_MESSAGE(gstInitialized, "GStreamer initialization failed: %s", error ? error->message : "unknown error occurred");
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/pbutils/missing-plugins.h>
</span><span class="cx"> #include <limits>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -945,8 +944,8 @@
</span><span class="cx">
</span><span class="cx"> gboolean MediaPlayerPrivateGStreamer::handleMessage(GstMessage* message)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> err;
- GOwnPtr<gchar> debug;
</del><ins>+ GUniqueOutPtr<GError> err;
+ GUniqueOutPtr<gchar> debug;
</ins><span class="cx"> MediaPlayer::NetworkState error;
</span><span class="cx"> bool issueError = true;
</span><span class="cx"> bool attemptNextLocation = false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "TrackPrivateBase.h"
</span><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <gst/gst.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
</span><span class="cx"> #define GST_CAT_DEFAULT webkit_media_player_debug
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> bool TrackPrivateBaseGStreamer::getTag(GstTagList* tags, const gchar* tagName, String& value)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> tagValue;
</del><ins>+ GUniqueOutPtr<gchar> tagValue;
</ins><span class="cx"> if (gst_tag_list_get_string(tags, tagName, &tagValue.outPtr())) {
</span><span class="cx"> INFO_MEDIA_MESSAGE("Track %d got %s %s.", m_index, tagName, tagValue.get());
</span><span class="cx"> value = tagValue.get();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgtkImageBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -25,14 +25,14 @@
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-static bool encodeImage(cairo_surface_t* surface, const String& mimeType, const double* quality, GOwnPtr<gchar>& buffer, gsize& bufferSize)
</del><ins>+static bool encodeImage(cairo_surface_t* surface, const String& mimeType, const double* quality, GUniqueOutPtr<gchar>& buffer, gsize& bufferSize)
</ins><span class="cx"> {
</span><span class="cx"> // List of supported image encoding types comes from the GdkPixbuf documentation.
</span><span class="cx"> // http://developer.gnome.org/gdk-pixbuf/stable/gdk-pixbuf-File-saving.html#gdk-pixbuf-save-to-bufferv
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> if (!pixbuf)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> if (type == "jpeg" && quality && *quality >= 0.0 && *quality <= 1.0) {
</span><span class="cx"> String qualityString = String::format("%d", static_cast<int>(*quality * 100.0 + 0.5));
</span><span class="cx"> gdk_pixbuf_save_to_buffer(pixbuf.get(), &buffer.outPtr(), &bufferSize, type.utf8().data(), &error.outPtr(), "quality", qualityString.utf8().data(), NULL);
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
</span><span class="cx">
</span><del>- GOwnPtr<gchar> buffer;
</del><ins>+ GUniqueOutPtr<gchar> buffer;
</ins><span class="cx"> gsize bufferSize;
</span><span class="cx"> if (!encodeImage(m_data.m_surface.get(), mimeType, quality, buffer, bufferSize))
</span><span class="cx"> return "data:,";
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgraphicsgtkImageGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "GUniquePtrGtk.h"
</span><span class="cx"> #include "GdkCairoUtilities.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <cairo.h>
</span><span class="lines">@@ -67,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SharedBuffer> loadResourceSharedBuffer(CString name)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> content;
</del><ins>+ GUniqueOutPtr<gchar> content;
</ins><span class="cx"> gsize length;
</span><span class="cx"> if (!g_file_get_contents(name.data(), &content.outPtr(), &length, 0))
</span><span class="cx"> return SharedBuffer::create();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/DataObjectGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx">
</span><span class="cx"> #include "markup.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="lines">@@ -102,7 +101,7 @@
</span><span class="cx"> setURL = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> GUniquePtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
</span><span class="cx"> if (!error && filename)
</span><span class="cx"> m_filenames.append(String::fromUTF8(filename.get()));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkFileSystemGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/FileSystemGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <glib/gstdio.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><span class="lines">@@ -340,7 +339,7 @@
</span><span class="cx">
</span><span class="cx"> int readFromFile(PlatformFileHandle handle, char* data, int length)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> do {
</span><span class="cx"> gssize bytesRead = g_input_stream_read(g_io_stream_get_input_stream(G_IO_STREAM(handle)),
</span><span class="cx"> data, length, 0, &error.outPtr());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkGamepadsGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GamepadsGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GamepadsGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GamepadsGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include <gudev/gudev.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -80,7 +79,7 @@
</span><span class="cx"> gboolean GamepadDeviceGtk::readCallback(GObject* pollableStream, gpointer data)
</span><span class="cx"> {
</span><span class="cx"> GamepadDeviceGtk* gamepadDevice = reinterpret_cast<GamepadDeviceGtk*>(data);
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> struct js_event event;
</span><span class="cx">
</span><span class="cx"> gssize len = g_pollable_input_stream_read_nonblocking(G_POLLABLE_INPUT_STREAM(pollableStream),
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkGtkInputMethodFiltercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> // The Windows composition key event code is 299 or VK_PROCESSKEY. We need to
</span><span class="cx"> // emit this code for web compatibility reasons when key events trigger
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> if (!m_enabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<gchar> newPreedit;
</del><ins>+ GUniqueOutPtr<gchar> newPreedit;
</ins><span class="cx"> gtk_im_context_get_preedit_string(m_context.get(), &newPreedit.outPtr(), 0, &m_cursorOffset);
</span><span class="cx">
</span><span class="cx"> if (m_preventNextCommit) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/PasteboardHelper.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -259,18 +258,13 @@
</span><span class="cx"> } else if (target == unknownAtom) {
</span><span class="cx"> GRefPtr<GVariant> variant = g_variant_new_parsed(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)));
</span><span class="cx">
</span><del>- GOwnPtr<gchar> key;
- GOwnPtr<gchar> value;
</del><ins>+ GUniqueOutPtr<gchar> key;
+ GUniqueOutPtr<gchar> value;
</ins><span class="cx"> GVariantIter iter;
</span><span class="cx">
</span><span class="cx"> g_variant_iter_init(&iter, variant.get());
</span><del>- while (g_variant_iter_next(&iter, "{ss}", &key.outPtr(), &value.outPtr())) {
</del><ins>+ while (g_variant_iter_next(&iter, "{ss}", &key.outPtr(), &value.outPtr()))
</ins><span class="cx"> dataObject->setUnknownTypeData(key.get(), value.get());
</span><del>-
- // FIXME: should GOwnPtr be smarter about this and replace the existing ptr when outPtr() is used?
- key.clear();
- value.clear();
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/RenderThemeGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "FileList.h"
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include "FontDescription.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include "Gradient.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="cx"> #include "GtkVersioning.h"
</span><span class="lines">@@ -48,6 +47,7 @@
</span><span class="cx"> #include <gdk/gdk.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PROGRESS_ELEMENT)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // This will be a font selection string like "Sans 10" so we cannot use it as the family name.
</span><del>- GOwnPtr<gchar> fontName;
</del><ins>+ GUniqueOutPtr<gchar> fontName;
</ins><span class="cx"> g_object_get(settings, "gtk-font-name", &fontName.outPtr(), NULL);
</span><span class="cx">
</span><span class="cx"> PangoFontDescription* pangoDescription = pango_font_description_from_string(fontName.get());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformgtkSharedBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/SharedBufferGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/SharedBufferGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/gtk/SharedBufferGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #include <glib.h>
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> CString filename = fileSystemRepresentation(filePath);
</span><del>- GOwnPtr<gchar> contents;
</del><ins>+ GUniqueOutPtr<gchar> contents;
</ins><span class="cx"> gsize size;
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> if (!g_file_get_contents(filename.data(), &contents.outPtr(), &size, &error.outPtr())) {
</span><span class="cx"> LOG_ERROR("Failed to fully read contents of file %s - %s", filenameForDisplay(filePath).utf8().data(), error->message);
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworkgtkCredentialBackingStorecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <libsecret/secret.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -77,7 +76,7 @@
</span><span class="cx"> void* data = callbackData->data;
</span><span class="cx"> delete callbackData;
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> GUniquePtr<GList> elements(secret_service_search_finish(service, asyncResult, &error.outPtr()));
</span><span class="cx"> if (error || !elements || !elements->data) {
</span><span class="cx"> callback(Credential(), data);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupGOwnPtrSoupcpp"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Igalia S.L
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-
-#include "config.h"
-#include "GOwnPtrSoup.h"
-
-#include <libsoup/soup.h>
-
-namespace WTF {
-
-template <> void freeOwnedGPtr<SoupURI>(SoupURI* ptr)
-{
- if (ptr)
- soup_uri_free(ptr);
-}
-
-template <> void freeOwnedGPtr<SoupCookie>(SoupCookie* ptr)
-{
- if (ptr)
- soup_cookie_free(ptr);
-}
-
-template <> void freeOwnedGPtr<SoupMessageHeaders>(SoupMessageHeaders* ptr)
-{
- if (ptr)
- soup_message_headers_free(ptr);
-}
-
-template <> void freeOwnedGPtr<SoupBuffer>(SoupBuffer* ptr)
-{
- if (ptr)
- soup_buffer_free(ptr);
-}
-
-} // namespace WTF
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupGOwnPtrSouph"></a>
<div class="delfile"><h4>Deleted: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.h (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.h 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/GOwnPtrSoup.h 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Igalia S.L
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef GOwnPtrSoup_h
-#define GOwnPtrSoup_h
-
-// We need to include libsoup headers here because the way that SoupBuffer
-// is defined is not compatible with forward declaration.
-#include <libsoup/soup.h>
-#include <wtf/gobject/GOwnPtr.h>
-
-namespace WTF {
-
-template<> void freeOwnedGPtr<SoupURI>(SoupURI* ptr);
-template<> void freeOwnedGPtr<SoupCookie>(SoupCookie* ptr);
-template<> void freeOwnedGPtr<SoupMessageHeaders>(SoupMessageHeaders*);
-template<> void freeOwnedGPtr<SoupBuffer>(SoupBuffer*);
-
-}
-
-#endif
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "CookieJarSoup.h"
</span><span class="cx"> #include "CredentialStorage.h"
</span><span class="cx"> #include "FileSystem.h"
</span><del>-#include "GOwnPtrSoup.h"
</del><ins>+#include "GUniquePtrSoup.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "LocalizedStrings.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="lines">@@ -55,7 +55,6 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/SHA1.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -504,7 +503,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx"> gssize bytesSkipped = g_input_stream_skip_finish(d->m_inputStream.get(), asyncResult, &error.outPtr());
</span><span class="cx"> if (error) {
</span><span class="lines">@@ -610,7 +609,7 @@
</span><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx"> ASSERT(!d->m_inputStream);
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> d->m_inputStream = adoptGRef(soup_multipart_input_stream_next_part_finish(d->m_multipartInputStream.get(), result, &error.outPtr()));
</span><span class="cx">
</span><span class="cx"> if (error) {
</span><span class="lines">@@ -657,7 +656,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> GRefPtr<GInputStream> inputStream = adoptGRef(soup_request_send_finish(d->m_soupRequest.get(), result, &error.outPtr()));
</span><span class="cx"> if (error) {
</span><span class="cx"> handle->client()->didFail(handle.get(), ResourceError::httpError(soupMessage, error.get(), d->m_soupRequest.get()));
</span><span class="lines">@@ -727,7 +726,7 @@
</span><span class="cx">
</span><span class="cx"> static bool addFileToSoupMessageBody(SoupMessage* message, const String& fileNameString, size_t offset, size_t lengthToSend, unsigned long& totalBodySize)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> CString fileName = fileSystemRepresentation(fileNameString);
</span><span class="cx"> GMappedFile* fileMapping = g_mapped_file_new(fileName.data(), false, &error.outPtr());
</span><span class="cx"> if (error)
</span><span class="lines">@@ -978,12 +977,11 @@
</span><span class="cx"> {
</span><span class="cx"> ResourceHandleInternal* d = handle->getInternal();
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
-
</del><span class="cx"> GUniquePtr<SoupURI> soupURI = request.createSoupURI();
</span><span class="cx"> if (!soupURI)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> d->m_soupRequest = adoptGRef(soup_session_request_uri(d->soupSession(), soupURI.get(), &error.outPtr()));
</span><span class="cx"> if (error) {
</span><span class="cx"> d->m_soupRequest.clear();
</span><span class="lines">@@ -1301,7 +1299,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> gssize bytesRead = g_input_stream_read_finish(d->m_inputStream.get(), asyncResult, &error.outPtr());
</span><span class="cx">
</span><span class="cx"> if (error) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx">
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #define READ_BUFFER_SIZE 1024
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if (!m_outputStream || !data)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, 0, &error.outPtr());
</span><span class="cx"> if (error) {
</span><span class="cx"> if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> stopWaitingForSocketWritability();
</span><span class="cx">
</span><span class="cx"> if (m_socketConnection) {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), 0, &error.outPtr());
</span><span class="cx"> if (error)
</span><span class="cx"> m_client->didFailSocketStream(this, SocketStreamError(error->code, error->message));
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> static void connectedCallback(GSocketClient* client, GAsyncResult* result, void* id)
</span><span class="cx"> {
</span><span class="cx"> // Always finish the connection, even if this SocketStreamHandle was deactivated earlier.
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> GSocketConnection* socketConnection = g_socket_client_connect_to_host_finish(client, result, &error.outPtr());
</span><span class="cx">
</span><span class="cx"> // The SocketStreamHandle has been deactivated, so just close the connection, ignoring errors.
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> static void readReadyCallback(GInputStream* stream, GAsyncResult* result, void* id)
</span><span class="cx"> {
</span><span class="cx"> // Always finish the read, even if this SocketStreamHandle was deactivated earlier.
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> gssize bytesRead = g_input_stream_read_finish(stream, result, &error.outPtr());
</span><span class="cx">
</span><span class="cx"> SocketStreamHandle* handle = getHandleFromId(id);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "AuthenticationChallenge.h"
</span><span class="cx"> #include "CookieJarSoup.h"
</span><del>-#include "GOwnPtrSoup.h"
</del><ins>+#include "GUniquePtrSoup.h"
</ins><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> if (!soupResolver)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> uri;
</del><ins>+ GUniqueOutPtr<SoupURI> uri;
</ins><span class="cx"> g_object_get(soupResolver, SOUP_PROXY_RESOLVER_WK_PROXY_URI, &uri.outPtr(), nullptr);
</span><span class="cx">
</span><span class="cx"> return uri ? soup_uri_to_string(uri.get(), FALSE) : nullptr;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/ChangeLog 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127554
+
+ Reviewed by Gustavo Noronha Silva.
+
+ 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):
+
</ins><span class="cx"> 2014-02-09 Carlos Garnacho <carlosg@gnome.org>
</span><span class="cx">
</span><span class="cx"> [GTK] Allow building with touch events enabled
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <stdio.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -1040,7 +1039,7 @@
</span><span class="cx"> if (!errorFile)
</span><span class="cx"> content = makeString("<html><body>", webError->message, "</body></html>");
</span><span class="cx"> else {
</span><del>- GOwnPtr<gchar> fileContent;
</del><ins>+ GUniqueOutPtr<gchar> fileContent;
</ins><span class="cx"> if (!g_file_load_contents(errorFile.get(), 0, &fileContent.outPtr(), 0, 0, 0))
</span><span class="cx"> content = makeString("<html><body>", webError->message, "</body></html>");
</span><span class="cx"> else
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkWebCoreSupportTextCheckerClientGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/WebCoreSupport/TextCheckerClientGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "webkitspellchecker.h"
</span><span class="cx"> #include "webkitwebsettingsprivate.h"
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkwebkitwebkitdownloadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitdownload.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitdownload.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitdownload.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #ifdef ERROR
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitDownloadPrivate* priv = download->priv;
</span><span class="cx"> GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(uri));
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx">
</span><span class="cx"> if (append)
</span><span class="cx"> priv->outputStream = g_file_append_to(file.get(), G_FILE_CREATE_NONE, NULL, &error.outPtr());
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx">
</span><span class="cx"> GRefPtr<GFile> src = adoptGRef(g_file_new_for_uri(priv->destinationURI));
</span><span class="cx"> GRefPtr<GFile> dest = adoptGRef(g_file_new_for_uri(destination_uri));
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx">
</span><span class="cx"> g_file_move(src.get(), dest.get(), G_FILE_COPY_BACKUP, 0, 0, 0, &error.outPtr());
</span><span class="cx">
</span><span class="lines">@@ -865,7 +865,7 @@
</span><span class="cx"> ASSERT(priv->outputStream);
</span><span class="cx">
</span><span class="cx"> gsize bytes_written;
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx">
</span><span class="cx"> g_output_stream_write_all(G_OUTPUT_STREAM(priv->outputStream),
</span><span class="cx"> data, length, &bytes_written, NULL, &error.outPtr());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkwebkitwebkitwebplugincpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebplugin.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "webkitglobalsprivate.h"
</span><span class="cx"> #include "webkitwebpluginprivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * SECTION:webkitwebplugin
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> if (priv->path)
</span><span class="cx"> return priv->path.get();
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> priv->path.reset(g_filename_from_utf8(priv->corePlugin->path().utf8().data(), -1, 0, 0, &error.outPtr()));
</span><span class="cx">
</span><span class="cx"> if (!error)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebview.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -119,7 +119,6 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION)
</span><span class="lines">@@ -670,7 +669,7 @@
</span><span class="cx"> static gboolean webkit_web_view_expose_event(GtkWidget* widget, GdkEventExpose* event)
</span><span class="cx"> {
</span><span class="cx"> int rectCount;
</span><del>- GOwnPtr<GdkRectangle> rects;
</del><ins>+ GUniqueOutPtr<GdkRectangle> rects;
</ins><span class="cx"> gdk_region_get_rectangles(event->region, &rects.outPtr(), &rectCount);
</span><span class="cx">
</span><span class="cx"> RefPtr<cairo_t> cr = adoptRef(gdk_cairo_create(event->window));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127554
+
+ Reviewed by Gustavo Noronha Silva.
+
+ 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):
+
+2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Add API to create a webview related to another one
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128498
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cache);
</span><span class="cx">
</span><del>- GOwnPtr<char> cacheDir;
</del><ins>+ GUniqueOutPtr<char> cacheDir;
</ins><span class="cx"> g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
</span><span class="cx"> if (!cacheDir)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2SharedDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/ResourceHandleInternal.h>
</span><span class="cx"> #include <gio/gio.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -106,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> String intermediateURI = m_destinationURI + ".wkdownload";
</span><span class="cx"> m_intermediateFile = adoptGRef(g_file_new_for_uri(intermediateURI.utf8().data()));
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> m_outputStream = adoptGRef(g_file_replace(m_intermediateFile.get(), 0, TRUE, G_FILE_CREATE_NONE, 0, &error.outPtr()));
</span><span class="cx"> if (!m_outputStream) {
</span><span class="cx"> downloadFailed(platformDownloadDestinationError(response, error->message));
</span><span class="lines">@@ -124,7 +123,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gsize bytesWritten;
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> g_output_stream_write_all(G_OUTPUT_STREAM(m_outputStream.get()), data, length, &bytesWritten, 0, &error.outPtr());
</span><span class="cx"> if (error) {
</span><span class="cx"> downloadFailed(platformDownloadDestinationError(m_response, error->message));
</span><span class="lines">@@ -139,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(m_intermediateFile);
</span><span class="cx"> GRefPtr<GFile> destinationFile = adoptGRef(g_file_new_for_uri(m_destinationURI.utf8().data()));
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> if (!g_file_move(m_intermediateFile.get(), destinationFile.get(), G_FILE_COPY_NONE, nullptr, nullptr, nullptr, &error.outPtr())) {
</span><span class="cx"> downloadFailed(platformDownloadDestinationError(m_response, error->message));
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitFaviconDatabasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -164,13 +164,13 @@
</span><span class="cx"> if (!pendingIconRequests)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> RefPtr<cairo_surface_t> icon = getIconSurfaceSynchronously(database, pageURL, &error.outPtr());
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < pendingIconRequests->size(); ++i) {
</span><span class="cx"> GTask* task = pendingIconRequests->at(i).get();
</span><span class="cx"> if (error)
</span><del>- g_task_return_error(task, error.release());
</del><ins>+ g_task_return_error(task, error.release().release());
</ins><span class="cx"> else {
</span><span class="cx"> GetFaviconSurfaceAsyncData* data = static_cast<GetFaviconSurfaceAsyncData*>(g_task_get_task_data(task));
</span><span class="cx"> data->icon = icon;
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx">
</span><span class="cx"> // We ask for the icon directly. If we don't get the icon data now,
</span><span class="cx"> // we'll be notified later (even if the database is still importing icons).
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> data->icon = getIconSurfaceSynchronously(database, data->pageURL, &error.outPtr());
</span><span class="cx"> if (data->icon) {
</span><span class="cx"> g_task_return_boolean(task.get(), TRUE);
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> data->shouldReleaseIconForPageURL = true;
</span><span class="cx">
</span><span class="cx"> if (g_error_matches(error.get(), WEBKIT_FAVICON_DATABASE_ERROR, WEBKIT_FAVICON_DATABASE_ERROR_FAVICON_NOT_FOUND)) {
</span><del>- g_task_return_error(task.get(), error.release());
</del><ins>+ g_task_return_error(task.get(), error.release().release());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include <WebCore/GUniquePtrSoup.h>
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -159,7 +158,7 @@
</span><span class="cx"> static void webkitURISchemeRequestReadCallback(GInputStream* inputStream, GAsyncResult* result, WebKitURISchemeRequest* schemeRequest)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitURISchemeRequest> request = adoptGRef(schemeRequest);
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> gssize bytesRead = g_input_stream_read_finish(inputStream, result, &error.outPtr());
</span><span class="cx"> if (bytesRead == -1) {
</span><span class="cx"> webkit_uri_scheme_request_finish_error(request.get(), error.get());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -338,7 +337,7 @@
</span><span class="cx">
</span><span class="cx"> static void gotFaviconCallback(GObject* object, GAsyncResult* result, gpointer userData)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> RefPtr<cairo_surface_t> favicon = adoptRef(webkit_favicon_database_get_favicon_finish(WEBKIT_FAVICON_DATABASE(object), result, &error.outPtr()));
</span><span class="cx"> if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_CANCELLED))
</span><span class="cx"> return;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="lines">@@ -55,7 +54,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> GRefPtr<GFile> file = adoptGRef(g_file_new_for_uri(resourceURI.data()));
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> 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()));
</span><span class="cx"> if (!fileInfo) {
</span><span class="cx"> StringBuilder builder;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><span class="cx">
</span><span class="lines">@@ -123,7 +122,7 @@
</span><span class="cx"> argv[i++] = const_cast<char*>(realPluginPath.data());
</span><span class="cx"> argv[i++] = 0;
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> if (!g_spawn_async(0, argv, 0, G_SPAWN_LEAVE_DESCRIPTORS_OPEN, childSetupFunction, GINT_TO_POINTER(sockets[1]), &pid, &error.outPtr())) {
</span><span class="cx"> g_printerr("Unable to fork a new WebProcess: %s.\n", error->message);
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <sys/wait.h>
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> argv[3] = 0;
</span><span class="cx">
</span><span class="cx"> int status;
</span><del>- GOwnPtr<char> stdOut;
</del><ins>+ GUniqueOutPtr<char> stdOut;
</ins><span class="cx">
</span><span class="cx"> // If the disposition of SIGCLD signal is set to SIG_IGN (default)
</span><span class="cx"> // then the signal will be ignored and g_spawn_sync() will not be
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx">
</span><span class="cx"> #ifdef HAVE_GTK_UNIX_PRINTING
</span><span class="lines">@@ -79,7 +78,7 @@
</span><span class="cx"> GUniquePtr<char>jobName(g_strdup_printf("%s job #%d", applicationName ? applicationName : "WebKit", ++jobNumber));
</span><span class="cx"> m_printJob = adoptGRef(gtk_print_job_new(jobName.get(), printer, m_printSettings.get(), m_pageSetup.get()));
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> cairo_surface_t* surface = gtk_print_job_get_surface(m_printJob.get(), &error.outPtr());
</span><span class="cx"> if (!surface) {
</span><span class="cx"> printDone(printError(frameURL(), error->message));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> #if !ENABLE(CUSTOM_PROTOCOLS)
</span><span class="cx"> #include "WebSoupRequestManager.h"
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cache);
</span><span class="cx">
</span><del>- GOwnPtr<char> cacheDir;
</del><ins>+ GUniqueOutPtr<char> cacheDir;
</ins><span class="cx"> g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
</span><span class="cx"> if (!cacheDir)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -1,5 +1,53 @@
</span><span class="cx"> 2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GLIB] Add GUniqueOutPtr and use it instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127554
+
+ Reviewed by Gustavo Noronha Silva.
+
+ 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):
+
+2014-02-10 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Add API to create a webview related to another one
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128498
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsDumpRenderTreegtkDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -54,7 +54,6 @@
</span><span class="cx"> #include <locale.h>
</span><span class="cx"> #include <webkit/webkit.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsDumpRenderTreegtkEventSendercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/EventSender.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/EventSender.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/DumpRenderTree/gtk/EventSender.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #include <webkit/webkitwebview.h>
</span><span class="cx"> #include <wtf/ASCIICType.h>
</span><span class="cx"> #include <wtf/Platform.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -805,7 +804,7 @@
</span><span class="cx">
</span><span class="cx"> // When synthesizing an event, an invalid hardware_keycode value
</span><span class="cx"> // can cause it to be badly processed by Gtk+.
</span><del>- GOwnPtr<GdkKeymapKey> keys;
</del><ins>+ GUniqueOutPtr<GdkKeymapKey> keys;
</ins><span class="cx"> gint nKeys;
</span><span class="cx"> if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeySym, &keys.outPtr(), &nKeys))
</span><span class="cx"> pressEvent->key.hardware_keycode = keys.get()[0].keycode;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWTFgobjectGUniquePtrcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -145,4 +145,51 @@
</span><span class="cx"> actual.str("");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void returnOutChar(char** outChar)
+{
+ *outChar = g_strdup("a");
+}
+
+TEST(WTF_GUniquePtr, OutPtr)
+{
+ std::ostringstream actual;
+
+ {
+ GUniqueOutPtr<char> a;
+ ASSERT_EQ(nullptr, a.get());
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniqueOutPtr<char> a;
+ returnOutChar(&a.outPtr());
+ actual << "g_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniqueOutPtr<char> a;
+ returnOutChar(&a.outPtr());
+ actual << "g_free(" << a.get() << ");";
+ returnOutChar(&a.outPtr());
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+ actual << "g_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniqueOutPtr<char> a;
+ returnOutChar(&a.outPtr());
+ GUniquePtr<char> b = a.release();
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual << "g_free(" << b.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestCookieManagercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> static void getAcceptPolicyReadyCallback(GObject* object, GAsyncResult* result, gpointer userData)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> WebKitCookieAcceptPolicy policy = webkit_cookie_manager_get_accept_policy_finish(WEBKIT_COOKIE_MANAGER(object), result, &error.outPtr());
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx">
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx"> static void getDomainsReadyCallback(GObject* object, GAsyncResult* result, gpointer userData)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> char** domains = webkit_cookie_manager_get_domains_with_cookies_finish(WEBKIT_COOKIE_MANAGER(object), result, &error.outPtr());
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestInspectorServercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> // Should contain only one entry pointing to http://127.0.0.1:2999/webinspector/Main.html?page=1
</span><span class="cx"> static void testInspectorServerPageList(InspectorServerTest* test, gconstpointer)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx">
</span><span class="cx"> test->showInWindowAndWaitUntilMapped(GTK_WINDOW_TOPLEVEL);
</span><span class="cx"> g_assert(test->getPageList());
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">
</span><span class="cx"> g_assert(test->getPageList());
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("pages[0].inspectorUrl;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> static void sendIncompleteRequest(InspectorServerTest* test, gconstpointer)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx">
</span><span class="cx"> // Connect to the inspector server.
</span><span class="cx"> GRefPtr<GSocketClient> client = adoptGRef(g_socket_client_new());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> static void resourceGetDataCallback(GObject* object, GAsyncResult* result, gpointer userData)
</span><span class="cx"> {
</span><span class="cx"> size_t dataSize;
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> unsigned char* data = webkit_web_resource_get_data_finish(WEBKIT_WEB_RESOURCE(object), result, &dataSize, &error.outPtr());
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx"> g_assert(data);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> static const char* webExtensionsUserData = "Web Extensions user data";
</span><span class="cx"> static WebKitTestBus* bus;
</span><ins>+static GUniquePtr<char> scriptDialogResult;
</ins><span class="cx">
</span><span class="cx"> static void testWebExtensionGetTitle(WebViewTest* test, gconstpointer)
</span><span class="cx"> {
</span><span class="lines">@@ -106,7 +107,7 @@
</span><span class="cx"> test->loadHtml("<html><header></header><body></body></html>", 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.echo('Foo');", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><span class="lines">@@ -114,11 +115,10 @@
</span><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "Foo");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static gboolean scriptDialogCallback(WebKitWebView*, WebKitScriptDialog* dialog, char** result)
</del><ins>+static gboolean scriptDialogCallback(WebKitWebView*, WebKitScriptDialog* dialog, gpointer)
</ins><span class="cx"> {
</span><span class="cx"> g_assert_cmpuint(webkit_script_dialog_get_dialog_type(dialog), ==, WEBKIT_SCRIPT_DIALOG_ALERT);
</span><del>- g_assert(!*result);
- *result = g_strdup(webkit_script_dialog_get_message(dialog));
</del><ins>+ scriptDialogResult.reset(g_strdup(webkit_script_dialog_get_message(dialog)));
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -133,8 +133,7 @@
</span><span class="cx"> test->loadHtml("<html><header></header><body><div id='console'></div></body></html>", 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx">
</span><del>- GOwnPtr<char> result;
- gulong scriptDialogID = g_signal_connect(test->m_webView, "script-dialog", G_CALLBACK(scriptDialogCallback), &result.outPtr());
</del><ins>+ gulong scriptDialogID = g_signal_connect(test->m_webView, "script-dialog", G_CALLBACK(scriptDialogCallback), nullptr);
</ins><span class="cx">
</span><span class="cx"> static const char* mainWorldScript =
</span><span class="cx"> "top.foo = 'Foo';\n"
</span><span class="lines">@@ -142,8 +141,7 @@
</span><span class="cx"> "window.open = function () { alert('Main World'); }\n"
</span><span class="cx"> "document.open(1, 2, 3);";
</span><span class="cx"> test->runJavaScriptAndWaitUntilFinished(mainWorldScript, 0);
</span><del>- g_assert_cmpstr(result.get(), ==, "Main World");
- result.clear();
</del><ins>+ g_assert_cmpstr(scriptDialogResult.get(), ==, "Main World");
</ins><span class="cx">
</span><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementById('console').innerHTML", 0);
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="lines">@@ -164,8 +162,7 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(runJavaScriptInIsolatedWorldFinishedCallback),
</span><span class="cx"> test);
</span><span class="cx"> g_main_loop_run(test->m_mainLoop);
</span><del>- g_assert_cmpstr(result.get(), ==, "Isolated World");
- result.clear();
</del><ins>+ g_assert_cmpstr(scriptDialogResult.get(), ==, "Isolated World");
</ins><span class="cx">
</span><span class="cx"> // Check that 'top.foo' defined in main world is not visible in isolated world.
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementById('console').innerHTML", 0);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebKitFaviconDatabasecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span><span class="lines">@@ -36,7 +35,6 @@
</span><span class="cx"> FaviconDatabaseTest()
</span><span class="cx"> : m_webContext(webkit_web_context_get_default())
</span><span class="cx"> , m_favicon(0)
</span><del>- , m_error(0)
</del><span class="cx"> , m_faviconNotificationReceived(false)
</span><span class="cx"> {
</span><span class="cx"> WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(m_webContext);
</span><span class="lines">@@ -84,7 +82,6 @@
</span><span class="cx">
</span><span class="cx"> void getFaviconForPageURIAndWaitUntilReady(const char* pageURI)
</span><span class="cx"> {
</span><del>- m_error.clear();
</del><span class="cx"> if (m_favicon) {
</span><span class="cx"> cairo_surface_destroy(m_favicon);
</span><span class="cx"> m_favicon = 0;
</span><span class="lines">@@ -98,7 +95,7 @@
</span><span class="cx"> WebKitWebContext* m_webContext;
</span><span class="cx"> cairo_surface_t* m_favicon;
</span><span class="cx"> CString m_faviconURI;
</span><del>- GOwnPtr<GError> m_error;
</del><ins>+ GUniqueOutPtr<GError> m_error;
</ins><span class="cx"> bool m_faviconNotificationReceived;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> test->loadHtml(html, 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.getElementById('WebKitLink').title;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx"> javascriptResult = test->runJavaScriptFromGResourceAndWaitUntilFinished("/wrong/path/to/resource.js", &error.outPtr());
</span><span class="cx"> g_assert(!javascriptResult);
</span><span class="cx"> g_assert_error(error.get(), G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
</span><del>- error.clear();
</del><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("foo();", &error.outPtr());
</span><span class="cx"> g_assert(!javascriptResult);
</span><span class="lines">@@ -346,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> static void webViewSavedToStreamCallback(GObject* object, GAsyncResult* result, SaveWebViewTest* test)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> test->m_inputStream = adoptGRef(webkit_web_view_save_finish(test->m_webView, result, &error.outPtr()));
</span><span class="cx"> g_assert(G_IS_INPUT_STREAM(test->m_inputStream.get()));
</span><span class="cx"> g_assert(!error);
</span><span class="lines">@@ -356,7 +355,7 @@
</span><span class="cx">
</span><span class="cx"> static void webViewSavedToFileCallback(GObject* object, GAsyncResult* result, SaveWebViewTest* test)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> g_assert(webkit_web_view_save_to_file_finish(test->m_webView, result, &error.outPtr()));
</span><span class="cx"> g_assert(!error);
</span><span class="cx">
</span><span class="lines">@@ -405,7 +404,7 @@
</span><span class="cx"> // strings read since the 'Date' field and the boundaries will be
</span><span class="cx"> // different on each case. MHTML functionality will be tested by
</span><span class="cx"> // Layout tests, so checking the amount of bytes is enough.
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> gchar buffer[512] = { 0 };
</span><span class="cx"> gssize readBytes = 0;
</span><span class="cx"> gssize totalBytesFromStream = 0;
</span><span class="lines">@@ -458,7 +457,7 @@
</span><span class="cx"> // Wait untill the page is loaded. Initial visibility should be 'hidden'.
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.visibilityState;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><span class="lines">@@ -507,7 +506,7 @@
</span><span class="cx">
</span><span class="cx"> static void onSnapshotCancelledReady(WebKitWebView* web_view, GAsyncResult* res, SnapshotWebViewTest* test)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> test->m_surface = webkit_web_view_get_snapshot_finish(web_view, res, &error.outPtr());
</span><span class="cx"> g_assert(!test->m_surface);
</span><span class="cx"> g_assert_error(error.get(), G_IO_ERROR, G_IO_ERROR_CANCELLED);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewGroupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> test->loadURI(kServer->getURIForPath(path).data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished(kStyleSheetTestScript, &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> static void canExecuteEditingCommandReadyCallback(GObject*, GAsyncResult* result, EditorTest* test)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> test->m_canExecuteEditingCommand = webkit_web_view_can_execute_editing_command_finish(test->m_webView, result, &error.outPtr());
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx"> g_main_loop_quit(test->m_mainLoop);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/ProcessID.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -244,7 +243,7 @@
</span><span class="cx"> if (!introspectionData)
</span><span class="cx"> introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> unsigned registrationID = g_dbus_connection_register_object(
</span><span class="cx"> connection,
</span><span class="cx"> "/org/webkit/gtk/WebExtensionTest",
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkWebProcessTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #include "WebProcessTest.h"
</span><span class="cx">
</span><span class="cx"> #include <gio/gio.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<String, std::function<PassOwnPtr<WebProcessTest> ()>> TestsMap;
</span><span class="cx"> static TestsMap& testsMap()
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> if (!introspectionData)
</span><span class="cx"> introspectionData = g_dbus_node_info_new_for_xml(introspectionXML, 0);
</span><span class="cx">
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> unsigned registrationID = g_dbus_connection_register_object(
</span><span class="cx"> connection,
</span><span class="cx"> "/org/webkit/gtk/WebProcessTest",
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsgtkInputMethodFiltercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/gtk/InputMethodFilter.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "WTFStringUtilities.h"
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> gdk_event_set_device(event, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_display_get_default())));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- GOwnPtr<GdkKeymapKey> keys;
</del><ins>+ GUniqueOutPtr<GdkKeymapKey> keys;
</ins><span class="cx"> gint nKeys;
</span><span class="cx"> if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeyValue, &keys.outPtr(), &nKeys))
</span><span class="cx"> event->key.hardware_keycode = keys.get()[0].keycode;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> gdk_event_set_device(event.get(), gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gtk_widget_get_display(viewWidget))));
</span><span class="cx">
</span><span class="cx"> // When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
</span><del>- GOwnPtr<GdkKeymapKey> keys;
</del><ins>+ GUniqueOutPtr<GdkKeymapKey> keys;
</ins><span class="cx"> int keysCount;
</span><span class="cx"> if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keyVal, &keys.outPtr(), &keysCount))
</span><span class="cx"> event->key.hardware_keycode = keys.get()[0].keycode;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkWebKit2GtkTestMainh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBuscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -20,7 +20,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitTestBus.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -38,8 +37,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<char> output;
- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<char> output;
+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> if (!g_spawn_command_line_sync(dbusLaunch.get(), &output.outPtr(), 0, 0, &error.outPtr())) {
</span><span class="cx"> g_warning("Error starting DBUS daemon: %s", error->message);
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> static void resourceGetDataCallback(GObject* object, GAsyncResult* result, gpointer userData)
</span><span class="cx"> {
</span><span class="cx"> size_t dataSize;
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> unsigned char* data = webkit_web_resource_get_data_finish(WEBKIT_WEB_RESOURCE(object), result, &dataSize, &error.outPtr());
</span><span class="cx"> g_assert(data);
</span><span class="cx">
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> event->key.state = keyModifiers;
</span><span class="cx">
</span><span class="cx"> // When synthesizing an event, an invalid hardware_keycode value can cause it to be badly processed by GTK+.
</span><del>- GOwnPtr<GdkKeymapKey> keys;
</del><ins>+ GUniqueOutPtr<GdkKeymapKey> keys;
</ins><span class="cx"> int keysCount;
</span><span class="cx"> if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), keyVal, &keys.outPtr(), &keysCount))
</span><span class="cx"> event->key.hardware_keycode = keys.get()[0].keycode;
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx">
</span><span class="cx"> static void onSnapshotReady(WebKitWebView* web_view, GAsyncResult* res, WebViewTest* test)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> error;
</del><ins>+ GUniqueOutPtr<GError> error;
</ins><span class="cx"> test->m_surface = webkit_web_view_get_snapshot_finish(web_view, res, &error.outPtr());
</span><span class="cx"> g_assert(!test->m_surface || !error.get());
</span><span class="cx"> if (error)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsWebKitTestRunnergtkEventSenderProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (163864 => 163865)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2014-02-11 06:37:36 UTC (rev 163864)
+++ releases/WebKitGTK/webkit-2.4/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2014-02-11 07:35:34 UTC (rev 163865)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx"> g_object_ref(pressEvent->key.window);
</span><span class="cx"> gdk_event_set_device(pressEvent, gdk_device_manager_get_client_pointer(gdk_display_get_device_manager(gdk_window_get_display(pressEvent->key.window))));
</span><span class="cx">
</span><del>- GOwnPtr<GdkKeymapKey> keys;
</del><ins>+ GUniqueOutPtr<GdkKeymapKey> keys;
</ins><span class="cx"> gint nKeys;
</span><span class="cx"> if (gdk_keymap_get_entries_for_keyval(gdk_keymap_get_default(), gdkKeySym, &keys.outPtr(), &nKeys))
</span><span class="cx"> pressEvent->key.hardware_keycode = keys.get()[0].keycode;
</span></span></pre>
</div>
</div>
</body>
</html>