<!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>[162599] trunk</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/162599">162599</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-22 23:53:48 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GLIB] Use GUniquePtr instead of GOwnPtr
https://bugs.webkit.org/show_bug.cgi?id=127431
Reviewed by Martin Robinson.
GUniquePtr is a template alias of std::unique_ptr with a custom
deleter that replaces GOwnPtr. GOwnPtr is still used for the cases
where the output pointer is needed, but it will also be replaced soon.
Source/WebCore:
* GNUmakefile.list.am:
* PlatformGTK.cmake:
* accessibility/atk/AXObjectCacheAtk.cpp:
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
(getAttributeSetForAccessibilityObject):
(accessibilityObjectLength):
(textExtents):
(webkitAccessibleTextGetChar):
(numberOfReplacedElementsBeforeOffset):
* page/ContextMenuController.cpp:
* platform/SharedBuffer.h:
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
(webKitWebAudioSrcConstructed):
(webKitWebAudioSrcLoop):
* platform/audio/gtk/AudioBusGtk.cpp:
(WebCore::AudioBus::loadPlatformResource):
* platform/geoclue/GeolocationProviderGeoclue.cpp:
* platform/graphics/gstreamer/ImageGStreamerCairo.cpp:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
(WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties):
(WebCore::MediaPlayerPrivateGStreamer::handleMessage):
* platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
(webKitMediaSrcAddSrc):
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
(webKitWebSrcStart):
(ResourceHandleStreamingClient::wasBlocked):
(ResourceHandleStreamingClient::cannotShowURL):
* platform/graphics/gtk/ImageBufferGtk.cpp:
(WebCore::encodeImage):
(WebCore::ImageBuffer::toDataURL):
* platform/graphics/gtk/ImageGtk.cpp:
(WebCore::getThemeIconFileName):
(WebCore::Image::loadPlatformResource):
* platform/gtk/ContextMenuGtk.cpp:
(WebCore::ContextMenu::itemCount):
(WebCore::contextMenuItemVector):
* platform/gtk/ContextMenuItemGtk.cpp:
(WebCore::createPlatformMenuItemDescription):
* platform/gtk/DataObjectGtk.cpp:
(WebCore::DataObjectGtk::setURIList):
(WebCore::DataObjectGtk::setURL):
* platform/gtk/FileSystemGtk.cpp:
(WebCore::filenameToString):
(WebCore::fileSystemRepresentation):
(WebCore::filenameForDisplay):
(WebCore::pathGetFileName):
(WebCore::applicationDirectoryPath):
(WebCore::sharedResourcesPath):
(WebCore::directoryName):
(WebCore::listDirectory):
(WebCore::openTemporaryFile):
* platform/gtk/GOwnPtrGtk.cpp: Removed.
* platform/gtk/GOwnPtrGtk.h: Removed.
* platform/gtk/GUniquePtrGtk.h: Added.
* platform/gtk/GamepadsGtk.cpp:
(WebCore::GamepadsGtk::GamepadsGtk):
* platform/gtk/GtkClickCounter.cpp:
(WebCore::GtkClickCounter::shouldProcessButtonEvent):
* platform/gtk/GtkInputMethodFilter.cpp:
(WebCore::GtkInputMethodFilter::sendCompositionAndPreeditWithFakeKeyEvents):
* platform/gtk/GtkPopupMenu.cpp:
(WebCore::GtkPopupMenu::popUp):
(WebCore::GtkPopupMenu::typeAheadFind):
* platform/gtk/LanguageGtk.cpp:
(WebCore::platformLanguage):
* platform/gtk/LocalizedStringsGtk.cpp:
(WebCore::imageTitle):
(WebCore::localizedMediaTimeDescription):
* platform/gtk/PasteboardHelper.cpp:
(WebCore::selectionDataToUTF8String):
(WebCore::PasteboardHelper::getClipboardContents):
(WebCore::PasteboardHelper::fillSelectionData):
* platform/gtk/PopupMenuGtk.cpp:
(WebCore::PopupMenuGtk::createGtkActionForMenuItem):
(WebCore::PopupMenuGtk::show):
* platform/gtk/WebKitAuthenticationWidget.cpp:
(webkitAuthenticationWidgetInitialize):
* platform/network/ResourceHandleInternal.h:
* platform/network/gtk/CredentialBackingStore.cpp:
(WebCore::credentialForChallengeAsyncReadyCallback):
* platform/network/soup/CookieJarSoup.cpp:
(WebCore::setCookiesFromDOM):
(WebCore::cookiesForSession):
(WebCore::getRawCookies):
(WebCore::deleteCookie):
(WebCore::getHostnamesWithCookies):
(WebCore::deleteCookiesForHostname):
(WebCore::deleteAllCookies):
* platform/network/soup/DNSSoup.cpp:
* platform/network/soup/GUniquePtrSoup.h: Added.
* platform/network/soup/ResourceErrorSoup.cpp:
(WebCore::failingURI):
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::ResourceHandle::ensureReadBuffer):
(WebCore::cleanupSoupRequestOperation):
(WebCore::createSoupRequestAndMessageForHandle):
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageMembers):
(WebCore::ResourceRequest::updateSoupMessage):
* platform/network/soup/ResourceResponseSoup.cpp:
* platform/network/soup/SoupURIUtils.cpp:
(WebCore::soupURIToKURL):
* platform/soup/SharedBufferSoup.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::clearPlatformData):
(WebCore::SharedBuffer::maybeTransferPlatformData):
(WebCore::SharedBuffer::hasPlatformData):
* plugins/gtk/PluginPackageGtk.cpp:
(WebCore::PluginPackage::fetchInfo):
(WebCore::PluginPackage::load):
Source/WebKit/gtk:
* WebCoreSupport/ContextMenuClientGtk.cpp:
(WebKit::getUnicodeMenuItemPosition):
* WebCoreSupport/DragClientGtk.cpp:
(WebKit::DragClient::startDrag):
* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::setValueForUser):
* WebCoreSupport/EditorClientGtk.h:
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::userAgent):
(WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
(WebKit::FrameLoaderClient::dispatchWillSendRequest):
(WebKit::FrameLoaderClient::assignIdentifierToInitialRequest):
(WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
(WebKit::FrameLoaderClient::dispatchDidReceiveContentLength):
(WebKit::FrameLoaderClient::dispatchDidFinishLoading):
(WebKit::FrameLoaderClient::dispatchDidFailLoading):
(WebKit::FrameLoaderClient::dispatchDidFailLoad):
* WebCoreSupport/InspectorClientGtk.h:
* webkit/webkitfavicondatabase.cpp:
(webkit_favicon_database_set_path):
* webkit/webkitfilechooserrequest.cpp:
* webkit/webkitglobals.cpp:
(webkitInit):
* webkit/webkithittestresult.cpp:
(WebKit::kit):
* webkit/webkiticondatabase.cpp:
(webkit_icon_database_set_path):
* webkit/webkitspellcheckerenchant.cpp:
* webkit/webkitwebplugin.cpp:
(webkit_web_plugin_get_path):
* webkit/webkitwebpluginprivate.h:
* webkit/webkitwebsettings.cpp:
(webkit_web_settings_class_init):
(webkit_web_settings_copy):
* webkit/webkitwebview.cpp:
(webkit_web_view_forward_context_menu_event):
(fileChooserDialogResponseCallback):
(webkit_web_view_drag_end):
* webkit/webkitwebviewprivate.h:
Source/WebKit2:
* Shared/Downloads/soup/DownloadSoup.cpp:
(WebKit::DownloadClient::didReceiveResponse):
* Shared/NativeWebKeyboardEvent.h:
* Shared/NativeWebMouseEvent.h:
* Shared/NativeWebWheelEvent.h:
* Shared/gtk/ArgumentCodersGtk.cpp:
(IPC::encodeGKeyFile):
(IPC::decodeGKeyFile):
(IPC::encode):
(IPC::decode):
* UIProcess/API/gtk/WebKitContextMenuItem.cpp:
(webkitContextMenuItemSetSubMenuFromGtkMenu):
* UIProcess/API/gtk/WebKitDownload.cpp:
(webkitDownloadDecideDestination):
(webkitDownloadNotifyProgress):
(webkitDownloadFailed):
* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
(webkit_file_chooser_request_select_files):
* UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
(didReceiveWebViewMessageFromInjectedBundle):
(getInjectedBundleInitializationUserData):
* UIProcess/API/gtk/WebKitLoaderClient.cpp:
(didFailProvisionalLoadWithErrorForFrame):
(didFailLoadWithErrorForFrame):
* UIProcess/API/gtk/WebKitPrintOperation.cpp:
(drawPagesForPrintingCompleted):
* UIProcess/API/gtk/WebKitURIRequest.cpp:
(webkit_uri_request_get_http_headers):
* UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
(webkit_uri_scheme_request_get_scheme):
(webkit_uri_scheme_request_get_path):
* UIProcess/API/gtk/WebKitWebContext.cpp:
(injectedBundleFilename):
(webkit_web_context_set_favicon_database_directory):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewLoadFail):
(webkitWebViewCreateJavaScriptDialog):
(fileChooserDialogResponseCallback):
(webkitWebViewLoadChanged):
(webkitWebViewLoadFailedWithTLSErrors):
(webkitWebViewPopulateContextMenu):
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseButtonPressEvent):
(webkitWebViewBaseStartDrag):
* UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
(WebKit::WebInspectorServer::platformResourceForPath):
* UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
(WebKit::connectionCallback):
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/gtk/WebContextGtk.cpp:
(WebKit::WebContext::platformDefaultApplicationCacheDirectory):
(WebKit::WebContext::platformDefaultDatabaseDirectory):
(WebKit::WebContext::platformDefaultIconDatabasePath):
(WebKit::WebContext::platformDefaultLocalStorageDirectory):
(WebKit::WebContext::platformDefaultDiskCacheDirectory):
* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
(WebKit::contextMenuItemVisibilityChanged):
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformInspectedURLChanged):
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::createGtkActionForMenuItem):
* WebProcess/WebPage/gtk/WebInspectorGtk.cpp:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
(WebKit::WebPage::platformInitialize):
* WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
* WebProcess/gtk/WebProcessMainGtk.cpp:
* WebProcess/soup/WebSoupRequestManager.cpp:
(WebKit::WebSoupRequestManager::send):
Tools:
* DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp:
(printAccessibilityEvent):
(axObjectEventListener):
* DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
(indexRangeInTable):
(AccessibilityUIElement::role):
(AccessibilityUIElement::title):
(AccessibilityUIElement::description):
(AccessibilityUIElement::stringValue):
(AccessibilityUIElement::language):
(AccessibilityUIElement::lineForIndex):
(AccessibilityUIElement::selectedTextRange):
(AccessibilityUIElement::url):
* DumpRenderTree/efl/AccessibilityControllerEfl.cpp:
(AccessibilityController::accessibleElementById):
* DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
(AccessibilityController::accessibleElementById):
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(getOutputDir):
(getFontsPath):
(initializeFonts):
(dumpFramesAsText):
(compareHistoryItems):
(dumpHistoryItem):
(soupURIToStringPreservingPassword):
(resetDefaultsToConsistentValues):
(temporaryDatabaseDirectory):
(webViewTitleChanged):
(webFrameLoadStatusNotified):
(pathFromSoupURI):
(convertWebResourceToURLPath):
(urlSuitableForTestResult):
(descriptionSuitableForTestResult):
(willSendRequestCallback):
(frameLoadEventCallback):
* DumpRenderTree/gtk/EditingCallbacks.cpp:
(dumpNodePath):
(dumpRange):
(shouldApplyStyle):
* DumpRenderTree/gtk/EventSender.cpp:
(contextClickCallback):
(beginDragWithFilesCallback):
* DumpRenderTree/gtk/TestRunnerGtk.cpp:
(TestRunner::pathToLocalResource):
(TestRunner::queueLoad):
(TestRunner::removeOriginAccessWhitelistEntry):
(TestRunner::setMockGeolocationPositionUnavailableError):
(TestRunner::setIconDatabaseEnabled):
(TestRunner::findString):
(TestRunner::setDomainRelaxationForbiddenForURLScheme):
(TestRunner::overridePreference):
(TestRunner::addUserScript):
(TestRunner::addUserStyleSheet):
(TestRunner::setTextDirection):
* DumpRenderTree/gtk/TextInputController.cpp:
(setMarkedTextCallback):
(insertTextCallback):
(doCommandCallback):
* DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
(LoadHTMLStringItem::invoke):
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
(WebKitDOMNodeTest::testTagNames):
* TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp:
(testBackForwardListLimitAndCache):
* TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp:
(testContextMenuSmartSeparators):
* TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp:
(testDownloadLocalFile):
(testDownloadLocalFileError):
(addContentDispositionHTTPHeaderToResponse):
(serverCallback):
(testDownloadRemoteFileError):
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
(startTestServer):
(testInspectorServerPageList):
(openRemoteDebuggingSession):
* TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp:
(testPrintOperationPrint):
* TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
(addCacheHTTPHeadersToResponse):
(serverCallback):
* TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp:
(httpsServerCallback):
(httpServerCallback):
* TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
(testWebViewJavaScriptDialogs):
(testWebViewWindowProperties):
(testWebViewFileChooserRequest):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
(testWebExtensionWindowObjectCleared):
(testWebExtensionIsolatedWorld):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp:
(startTestServer):
(checkAtspiAccessible):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp:
(serverCallback):
(testClearDatabase):
(testGetFaviconURI):
(webkitFaviconDatabaseFinalizedCallback):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextGetPlugins):
(testWebContextURIScheme):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
(testWebViewRunJavaScript):
(testWebViewMode):
(testWebViewPageVisibility):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp:
(isStyleSheetInjectedForURLAtPath):
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
(testWebViewEditorCutCopyPasteNonEditable):
(testWebViewEditorCutCopyPasteEditable):
(testWebViewEditorSelectAllNonEditable):
(testWebViewEditorSelectAllEditable):
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
(sendRequestCallback):
(methodCallCallback):
* TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:
(TestWebKitAPI::Util::createInjectedBundlePath):
(TestWebKitAPI::Util::createURLForResource):
* TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
(TestWebKitAPI::doKeyStroke):
(TestWebKitAPI::doMouseButtonEvent):
(TestWebKitAPI::PlatformWebView::simulateMouseMove):
* TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp:
(loadFailedCallback):
(LoadTrackingTest::loadURI):
(LoadTrackingTest::loadHtml):
(LoadTrackingTest::loadPlainText):
(LoadTrackingTest::loadRequest):
(LoadTrackingTest::reload):
(LoadTrackingTest::goBack):
(LoadTrackingTest::goForward):
* TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h:
* TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp:
(registerGResource):
(removeNonEmptyDirectory):
(main):
* TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
(Test::getWebKit1TestResoucesDir):
(Test::getResourcesDir):
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp:
(WebKitTestBus::run):
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp:
(WebKitTestServer::WebKitTestServer):
(WebKitTestServer::getURIForPath):
* TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp:
(WebProcessTestRunner::runTest):
* TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:
(resourceGetDataCallback):
(WebViewTest::mainResourceData):
(WebViewTest::mouseMoveTo):
(WebViewTest::keyStroke):
(WebViewTest::doMouseButtonEvent):
* TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
(WTR::AccessibilityController::accessibleElementById):
* WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
(WTR::AccessibilityUIElement::role):
(WTR::AccessibilityUIElement::title):
(WTR::AccessibilityUIElement::description):
(WTR::AccessibilityUIElement::stringValue):
(WTR::AccessibilityUIElement::language):
(WTR::AccessibilityUIElement::lineForIndex):
(WTR::AccessibilityUIElement::selectedTextRange):
(WTR::AccessibilityUIElement::url):
* WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
(WTR::getOutputDir):
(WTR::getFontsPath):
(WTR::initializeFontConfigSetting):
* WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp:
(WTR::topLevelPath):
* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
(WTR::TestRunner::pathToLocalResource):
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
(WTR::TestController::initializeInjectedBundlePath):
(WTR::TestController::initializeTestPluginDirectory):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreGNUmakefilelistam">trunk/Source/WebCore/GNUmakefile.list.am</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkAXObjectCacheAtkcpp">trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllercpp">trunk/Source/WebCore/page/ContextMenuController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogtkAudioBusGtkcpp">trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgeoclueGeolocationProviderGeocluecpp">trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerImageGStreamerCairocpp">trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitMediaSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgtkImageGtkcpp">trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkContextMenuGtkcpp">trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkContextMenuItemGtkcpp">trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkDataObjectGtkcpp">trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkFileSystemGtkcpp">trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGamepadsGtkcpp">trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkClickCountercpp">trunk/Source/WebCore/platform/gtk/GtkClickCounter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkInputMethodFiltercpp">trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkPopupMenucpp">trunk/Source/WebCore/platform/gtk/GtkPopupMenu.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkLanguageGtkcpp">trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp">trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPasteboardHelpercpp">trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkPopupMenuGtkcpp">trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkWebKitAuthenticationWidgetcpp">trunk/Source/WebCore/platform/gtk/WebKitAuthenticationWidget.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceHandleInternalh">trunk/Source/WebCore/platform/network/ResourceHandleInternal.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkgtkCredentialBackingStorecpp">trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp">trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupDNSSoupcpp">trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceErrorSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceResponseSoupcpp">trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupURIUtilscpp">trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformsoupSharedBufferSoupcpp">trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp</a></li>
<li><a href="#trunkSourceWebCorepluginsgtkPluginPackageGtkcpp">trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportContextMenuClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportDragClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportEditorClientGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp">trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkWebCoreSupportInspectorClientGtkh">trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitfavicondatabasecpp">trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitfilechooserrequestcpp">trunk/Source/WebKit/gtk/webkit/webkitfilechooserrequest.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitglobalscpp">trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkithittestresultcpp">trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkiticondatabasecpp">trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitspellcheckerenchantcpp">trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebplugincpp">trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebpluginprivateh">trunk/Source/WebKit/gtk/webkit/webkitwebpluginprivate.h</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebsettingscpp">trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewcpp">trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitwebviewprivateh">trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebKeyboardEventh">trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebMouseEventh">trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNativeWebWheelEventh">trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuItemcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURIRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp">trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp">trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp">trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebContextMenuProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebInspectorGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebProcessMainGtkcpp">trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebSoupRequestManagercpp">trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeatkAccessibilityCallbacksAtkcpp">trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp">trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeeflAccessibilityControllerEflcpp">trunk/Tools/DumpRenderTree/efl/AccessibilityControllerEfl.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkAccessibilityControllerGtkcpp">trunk/Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkDumpRenderTreecpp">trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkEditingCallbackscpp">trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkEventSendercpp">trunk/Tools/DumpRenderTree/gtk/EventSender.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkTestRunnerGtkcpp">trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkTextInputControllercpp">trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreegtkWorkQueueItemGtkcpp">trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestBackForwardListcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestContextMenucpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestCookieManagercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestDownloadscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestInspectorServercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestPrintingcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestSSLcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestUIClientcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitAccessibilitycpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitFaviconDatabasecpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewGroupcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkPlatformUtilitiesGtkcpp">trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkPlatformWebViewGtkcpp">trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkLoadTrackingTestcpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkLoadTrackingTesth">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkTestMaincpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkTestMainh">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBuscpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServercpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebProcessTestRunnercpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebViewTesth">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlegtkActivateFontsGtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlegtkInjectedBundleUtilitiescpp">trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkTestControllerGtkcpp">trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkGUniquePtrGtkh">trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupGUniquePtrSouph">trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgtkGOwnPtrGtkcpp">trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGOwnPtrGtkh">trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/ChangeLog 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -1,3 +1,125 @@
</span><ins>+2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Use GUniquePtr instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127431
+
+ Reviewed by Martin Robinson.
+
+ GUniquePtr is a template alias of std::unique_ptr with a custom
+ deleter that replaces GOwnPtr. GOwnPtr is still used for the cases
+ where the output pointer is needed, but it will also be replaced soon.
+
+ * GNUmakefile.list.am:
+ * PlatformGTK.cmake:
+ * accessibility/atk/AXObjectCacheAtk.cpp:
+ * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+ (getAttributeSetForAccessibilityObject):
+ (accessibilityObjectLength):
+ (textExtents):
+ (webkitAccessibleTextGetChar):
+ (numberOfReplacedElementsBeforeOffset):
+ * page/ContextMenuController.cpp:
+ * platform/SharedBuffer.h:
+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+ (webKitWebAudioSrcConstructed):
+ (webKitWebAudioSrcLoop):
+ * platform/audio/gtk/AudioBusGtk.cpp:
+ (WebCore::AudioBus::loadPlatformResource):
+ * platform/geoclue/GeolocationProviderGeoclue.cpp:
+ * platform/graphics/gstreamer/ImageGStreamerCairo.cpp:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::setAudioStreamProperties):
+ (WebCore::MediaPlayerPrivateGStreamer::handleMessage):
+ * platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
+ (webKitMediaSrcAddSrc):
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcStart):
+ (ResourceHandleStreamingClient::wasBlocked):
+ (ResourceHandleStreamingClient::cannotShowURL):
+ * platform/graphics/gtk/ImageBufferGtk.cpp:
+ (WebCore::encodeImage):
+ (WebCore::ImageBuffer::toDataURL):
+ * platform/graphics/gtk/ImageGtk.cpp:
+ (WebCore::getThemeIconFileName):
+ (WebCore::Image::loadPlatformResource):
+ * platform/gtk/ContextMenuGtk.cpp:
+ (WebCore::ContextMenu::itemCount):
+ (WebCore::contextMenuItemVector):
+ * platform/gtk/ContextMenuItemGtk.cpp:
+ (WebCore::createPlatformMenuItemDescription):
+ * platform/gtk/DataObjectGtk.cpp:
+ (WebCore::DataObjectGtk::setURIList):
+ (WebCore::DataObjectGtk::setURL):
+ * platform/gtk/FileSystemGtk.cpp:
+ (WebCore::filenameToString):
+ (WebCore::fileSystemRepresentation):
+ (WebCore::filenameForDisplay):
+ (WebCore::pathGetFileName):
+ (WebCore::applicationDirectoryPath):
+ (WebCore::sharedResourcesPath):
+ (WebCore::directoryName):
+ (WebCore::listDirectory):
+ (WebCore::openTemporaryFile):
+ * platform/gtk/GOwnPtrGtk.cpp: Removed.
+ * platform/gtk/GOwnPtrGtk.h: Removed.
+ * platform/gtk/GUniquePtrGtk.h: Added.
+ * platform/gtk/GamepadsGtk.cpp:
+ (WebCore::GamepadsGtk::GamepadsGtk):
+ * platform/gtk/GtkClickCounter.cpp:
+ (WebCore::GtkClickCounter::shouldProcessButtonEvent):
+ * platform/gtk/GtkInputMethodFilter.cpp:
+ (WebCore::GtkInputMethodFilter::sendCompositionAndPreeditWithFakeKeyEvents):
+ * platform/gtk/GtkPopupMenu.cpp:
+ (WebCore::GtkPopupMenu::popUp):
+ (WebCore::GtkPopupMenu::typeAheadFind):
+ * platform/gtk/LanguageGtk.cpp:
+ (WebCore::platformLanguage):
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ (WebCore::imageTitle):
+ (WebCore::localizedMediaTimeDescription):
+ * platform/gtk/PasteboardHelper.cpp:
+ (WebCore::selectionDataToUTF8String):
+ (WebCore::PasteboardHelper::getClipboardContents):
+ (WebCore::PasteboardHelper::fillSelectionData):
+ * platform/gtk/PopupMenuGtk.cpp:
+ (WebCore::PopupMenuGtk::createGtkActionForMenuItem):
+ (WebCore::PopupMenuGtk::show):
+ * platform/gtk/WebKitAuthenticationWidget.cpp:
+ (webkitAuthenticationWidgetInitialize):
+ * platform/network/ResourceHandleInternal.h:
+ * platform/network/gtk/CredentialBackingStore.cpp:
+ (WebCore::credentialForChallengeAsyncReadyCallback):
+ * platform/network/soup/CookieJarSoup.cpp:
+ (WebCore::setCookiesFromDOM):
+ (WebCore::cookiesForSession):
+ (WebCore::getRawCookies):
+ (WebCore::deleteCookie):
+ (WebCore::getHostnamesWithCookies):
+ (WebCore::deleteCookiesForHostname):
+ (WebCore::deleteAllCookies):
+ * platform/network/soup/DNSSoup.cpp:
+ * platform/network/soup/GUniquePtrSoup.h: Added.
+ * platform/network/soup/ResourceErrorSoup.cpp:
+ (WebCore::failingURI):
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::ResourceHandle::ensureReadBuffer):
+ (WebCore::cleanupSoupRequestOperation):
+ (WebCore::createSoupRequestAndMessageForHandle):
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupMessageMembers):
+ (WebCore::ResourceRequest::updateSoupMessage):
+ * platform/network/soup/ResourceResponseSoup.cpp:
+ * platform/network/soup/SoupURIUtils.cpp:
+ (WebCore::soupURIToKURL):
+ * platform/soup/SharedBufferSoup.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ (WebCore::SharedBuffer::clearPlatformData):
+ (WebCore::SharedBuffer::maybeTransferPlatformData):
+ (WebCore::SharedBuffer::hasPlatformData):
+ * plugins/gtk/PluginPackageGtk.cpp:
+ (WebCore::PluginPackage::fetchInfo):
+ (WebCore::PluginPackage::load):
+
</ins><span class="cx"> 2014-01-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Surround fixedVisibleContentRect code with USE(TILED_BACKING_STORE)
</span></span></pre></div>
<a id="trunkSourceWebCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/GNUmakefile.list.am (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/GNUmakefile.list.am 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -6251,10 +6251,9 @@
</span><span class="cx"> Source/WebCore/platform/gtk/DragIcon.h \
</span><span class="cx"> Source/WebCore/platform/gtk/EventLoopGtk.cpp \
</span><span class="cx"> Source/WebCore/platform/gtk/FileSystemGtk.cpp \
</span><del>- Source/WebCore/platform/gtk/GOwnPtrGtk.cpp \
- Source/WebCore/platform/gtk/GOwnPtrGtk.h \
</del><span class="cx"> Source/WebCore/platform/gtk/GRefPtrGtk.cpp \
</span><span class="cx"> Source/WebCore/platform/gtk/GRefPtrGtk.h \
</span><ins>+ Source/WebCore/platform/gtk/GUniquePtr.h \
</ins><span class="cx"> Source/WebCore/platform/gtk/GtkClickCounter.cpp \
</span><span class="cx"> Source/WebCore/platform/gtk/GtkClickCounter.h \
</span><span class="cx"> Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp \
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -196,7 +196,6 @@
</span><span class="cx"> platform/gtk/ErrorsGtk.cpp
</span><span class="cx"> platform/gtk/EventLoopGtk.cpp
</span><span class="cx"> platform/gtk/FileSystemGtk.cpp
</span><del>- platform/gtk/GOwnPtrGtk.cpp
</del><span class="cx"> platform/gtk/GRefPtrGtk.cpp
</span><span class="cx"> platform/gtk/GtkClickCounter.cpp
</span><span class="cx"> platform/gtk/GtkDragAndDropHelper.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkAXObjectCacheAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "Range.h"
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "WebKitAccessibleWrapperAtk.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></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> #include "WebKitAccessibleUtil.h"
</span><span class="cx"> #include "WebKitAccessibleWrapperAtk.h"
</span><span class="cx"> #include "htmlediting.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"> using namespace WebCore;
</span><span class="lines">@@ -87,18 +87,18 @@
</span><span class="cx"> RenderStyle* style = &renderer->style();
</span><span class="cx">
</span><span class="cx"> AtkAttributeSet* result = 0;
</span><del>- GOwnPtr<gchar> buffer(g_strdup_printf("%i", style->fontSize()));
</del><ins>+ GUniquePtr<gchar> buffer(g_strdup_printf("%i", style->fontSize()));
</ins><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_SIZE), buffer.get());
</span><span class="cx">
</span><span class="cx"> Color bgColor = style->visitedDependentColor(CSSPropertyBackgroundColor);
</span><span class="cx"> if (bgColor.isValid()) {
</span><del>- buffer.set(g_strdup_printf("%i,%i,%i", bgColor.red(), bgColor.green(), bgColor.blue()));
</del><ins>+ buffer.reset(g_strdup_printf("%i,%i,%i", bgColor.red(), bgColor.green(), bgColor.blue()));
</ins><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_BG_COLOR), buffer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color fgColor = style->visitedDependentColor(CSSPropertyColor);
</span><span class="cx"> if (fgColor.isValid()) {
</span><del>- buffer.set(g_strdup_printf("%i,%i,%i", fgColor.red(), fgColor.green(), fgColor.blue()));
</del><ins>+ buffer.reset(g_strdup_printf("%i,%i,%i", fgColor.red(), fgColor.green(), fgColor.blue()));
</ins><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_FG_COLOR), buffer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -120,13 +120,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (includeRise) {
</span><del>- buffer.set(g_strdup_printf("%i", baselinePosition));
</del><ins>+ buffer.reset(g_strdup_printf("%i", baselinePosition));
</ins><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_RISE), buffer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!style->textIndent().isUndefined()) {
</span><span class="cx"> int indentation = valueForLength(style->textIndent(), object->size().width(), &renderer->view());
</span><del>- buffer.set(g_strdup_printf("%i", indentation));
</del><ins>+ buffer.reset(g_strdup_printf("%i", indentation));
</ins><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_INDENT), buffer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> fontWeight = 900;
</span><span class="cx"> }
</span><span class="cx"> if (fontWeight > 0) {
</span><del>- buffer.set(g_strdup_printf("%i", fontWeight));
</del><ins>+ buffer.reset(g_strdup_printf("%i", fontWeight));
</ins><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_WEIGHT), buffer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> // well known API to always get the text in a consistent way
</span><span class="cx"> AtkObject* atkObj = ATK_OBJECT(object->wrapper());
</span><span class="cx"> if (ATK_IS_TEXT(atkObj)) {
</span><del>- GOwnPtr<gchar> text(webkitAccessibleTextGetText(ATK_TEXT(atkObj), 0, -1));
</del><ins>+ GUniquePtr<gchar> text(webkitAccessibleTextGetText(ATK_TEXT(atkObj), 0, -1));
</ins><span class="cx"> return g_utf8_strlen(text.get(), -1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx">
</span><span class="cx"> static IntRect textExtents(AtkText* text, gint startOffset, gint length, AtkCoordType coords)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> textContent(webkitAccessibleTextGetText(text, startOffset, -1));
</del><ins>+ GUniquePtr<char> textContent(webkitAccessibleTextGetText(text, startOffset, -1));
</ins><span class="cx"> gint textLength = g_utf8_strlen(textContent.get(), -1);
</span><span class="cx">
</span><span class="cx"> // The first case (endOffset of -1) should work, but seems broken for all Gtk+ apps.
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> else if (textPosition == GetTextPositionAfter)
</span><span class="cx"> actualOffset++;
</span><span class="cx">
</span><del>- GOwnPtr<char> textData(webkitAccessibleTextGetText(text, 0, -1));
</del><ins>+ GUniquePtr<char> textData(webkitAccessibleTextGetText(text, 0, -1));
</ins><span class="cx"> int textLength = g_utf8_strlen(textData.get(), -1);
</span><span class="cx">
</span><span class="cx"> *startOffset = std::max(0, actualOffset);
</span><span class="lines">@@ -637,7 +637,7 @@
</span><span class="cx">
</span><span class="cx"> static int numberOfReplacedElementsBeforeOffset(AtkText* text, unsigned offset)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> textForObject(webkitAccessibleTextGetText(text, 0, offset));
</del><ins>+ GUniquePtr<char> textForObject(webkitAccessibleTextGetText(text, 0, offset));
</ins><span class="cx"> String textBeforeOffset = String::fromUTF8(textForObject.get());
</span><span class="cx">
</span><span class="cx"> int count = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/page/ContextMenuController.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -71,10 +71,6 @@
</span><span class="cx"> #include <wtf/unicode/CharacterNames.h>
</span><span class="cx"> #include <wtf/unicode/Unicode.h>
</span><span class="cx">
</span><del>-#if PLATFORM(GTK)
-#include <wtf/gobject/GOwnPtr.h>
-#endif
-
</del><span class="cx"> using namespace WTF;
</span><span class="cx"> using namespace Unicode;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><del>-#include "GOwnPtrSoup.h"
</del><ins>+#include "GUniquePtrSoup.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> explicit SharedBuffer(SoupBuffer*);
</span><del>- GOwnPtr<SoupBuffer> m_soupBuffer;
</del><ins>+ GUniquePtr<SoupBuffer> m_soupBuffer;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,11 +24,11 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioBus.h"
</span><span class="cx"> #include "AudioIOCallback.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include "GStreamerUtilities.h"
</span><span class="cx"> #include <gst/audio/audio.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"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> // For each channel of the bus create a new upstream branch for interleave, like:
</span><span class="cx"> // queue ! capsfilter ! audioconvert. which is plugged to a new interleave request sinkpad.
</span><span class="cx"> for (unsigned channelIndex = 0; channelIndex < priv->bus->numberOfChannels(); channelIndex++) {
</span><del>- GOwnPtr<gchar> queueName(g_strdup_printf("webaudioQueue%u", channelIndex));
</del><ins>+ GUniquePtr<gchar> queueName(g_strdup_printf("webaudioQueue%u", channelIndex));
</ins><span class="cx"> GstElement* queue = gst_element_factory_make("queue", queueName.get());
</span><span class="cx"> GstElement* capsfilter = gst_element_factory_make("capsfilter", 0);
</span><span class="cx"> GstElement* audioconvert = gst_element_factory_make("audioconvert", 0);
</span><span class="lines">@@ -356,8 +356,8 @@
</span><span class="cx"> if (priv->newStreamEventPending) {
</span><span class="cx"> GRefPtr<GstElement> queue = adoptGRef(gst_pad_get_parent_element(pad));
</span><span class="cx"> GRefPtr<GstPad> sinkPad = adoptGRef(gst_element_get_static_pad(queue.get(), "sink"));
</span><del>- GOwnPtr<gchar> queueName(gst_element_get_name(queue.get()));
- GOwnPtr<gchar> streamId(g_strdup_printf("webaudio/%s", queueName.get()));
</del><ins>+ GUniquePtr<gchar> queueName(gst_element_get_name(queue.get()));
+ GUniquePtr<gchar> streamId(g_strdup_printf("webaudio/%s", queueName.get()));
</ins><span class="cx"> GstEvent* streamStartEvent = gst_event_new_stream_start(streamId.get());
</span><span class="cx"> #if GST_CHECK_VERSION(1, 2, 0)
</span><span class="cx"> gst_event_set_group_id(streamStartEvent, groupId);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogtkAudioBusGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,23 +24,21 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioFileReader.h"
</span><span class="cx"> #include "FileSystem.h"
</span><del>-
-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <glib.h>
+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#include <glib.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> PassRefPtr<AudioBus> AudioBus::loadPlatformResource(const char* name, float sampleRate)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> filename(g_strdup_printf("%s.wav", name));
</del><ins>+ GUniquePtr<gchar> filename(g_strdup_printf("%s.wav", name));
</ins><span class="cx"> const char* environmentPath = getenv("AUDIO_RESOURCES_PATH");
</span><del>- GOwnPtr<gchar> absoluteFilename;
</del><ins>+ GUniquePtr<gchar> absoluteFilename;
</ins><span class="cx"> if (environmentPath)
</span><del>- absoluteFilename.set(g_build_filename(environmentPath, filename.get(), NULL));
</del><ins>+ absoluteFilename.reset(g_build_filename(environmentPath, filename.get(), NULL));
</ins><span class="cx"> else
</span><del>- absoluteFilename.set(g_build_filename(sharedResourcesPath().data(), "resources", "audio", filename.get(), NULL));
</del><ins>+ absoluteFilename.reset(g_build_filename(sharedResourcesPath().data(), "resources", "audio", filename.get(), NULL));
</ins><span class="cx"> return createBusFromAudioFile(absoluteFilename.get(), false, sampleRate);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgeoclueGeolocationProviderGeocluecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> static void getPositionCallback(GeocluePosition* position, GeocluePositionFields fields, int timestamp, double latitude, double longitude, double altitude, GeoclueAccuracy* accuracy, GError* error, GeolocationProviderGeoclue* provider)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerImageGStreamerCairocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/ImageGStreamerCairo.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx">
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gst/gst.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
-
</del><span class="cx"> #include <gst/video/gstvideometa.h>
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include <gst/pbutils/missing-plugins.h>
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.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(VIDEO_TRACK)
</span><span class="lines">@@ -190,7 +191,7 @@
</span><span class="cx"> GstStructure* structure = gst_structure_new("stream-properties", "media.role", G_TYPE_STRING, role, NULL);
</span><span class="cx"> g_object_set(object, "stream-properties", structure, NULL);
</span><span class="cx"> gst_structure_free(structure);
</span><del>- GOwnPtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(object)));
</del><ins>+ GUniquePtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(object)));
</ins><span class="cx"> LOG_MEDIA_MESSAGE("Set media.role as %s at %s", role, elementName.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1037,7 +1038,7 @@
</span><span class="cx"> gst_message_parse_request_state(message, &requestedState);
</span><span class="cx"> gst_element_get_state(m_playBin.get(), &currentState, NULL, 250);
</span><span class="cx"> if (requestedState < currentState) {
</span><del>- GOwnPtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(message)));
</del><ins>+ GUniquePtr<gchar> elementName(gst_element_get_name(GST_ELEMENT(message)));
</ins><span class="cx"> INFO_MEDIA_MESSAGE("Element %s requested state change to %s", elementName.get(),
</span><span class="cx"> gst_element_state_get_name(requestedState));
</span><span class="cx"> m_requestedState = requestedState;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <gst/app/gstappsrc.h>
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/pbutils/missing-plugins.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"> typedef struct _Source {
</span><span class="lines">@@ -141,7 +141,6 @@
</span><span class="cx"> {
</span><span class="cx"> GstPad* ghostPad;
</span><span class="cx"> WebKitMediaSrcPrivate* priv = src->priv;
</span><del>- GOwnPtr<gchar> name;
</del><span class="cx">
</span><span class="cx"> if (!gst_bin_add(GST_BIN(src), element)) {
</span><span class="cx"> GST_DEBUG_OBJECT(src, "Src element not added");
</span><span class="lines">@@ -154,7 +153,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> gst_element_sync_state_with_parent(element);
</span><del>- name.set(g_strdup_printf("src_%u", priv->nbSource));
</del><ins>+ GUniquePtr<gchar> name(g_strdup_printf("src_%u", priv->nbSource));
</ins><span class="cx"> ghostPad = WebCore::webkitGstGhostPadFromStaticTemplate(&srcTemplate, name.get(), targetsrc.get());
</span><span class="cx"> gst_pad_set_active(ghostPad, TRUE);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> #include <gst/pbutils/missing-plugins.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/gobject/GMutexLocker.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 WebCore;
</span><span class="lines">@@ -502,9 +502,7 @@
</span><span class="cx"> request.setHTTPUserAgent("Quicktime/7.6.6");
</span><span class="cx">
</span><span class="cx"> if (priv->requestedOffset) {
</span><del>- GOwnPtr<gchar> val;
-
- val.set(g_strdup_printf("bytes=%" G_GUINT64_FORMAT "-", priv->requestedOffset));
</del><ins>+ GUniquePtr<gchar> val(g_strdup_printf("bytes=%" G_GUINT64_FORMAT "-", priv->requestedOffset));
</ins><span class="cx"> request.setHTTPHeaderField("Range", val.get());
</span><span class="cx"> }
</span><span class="cx"> priv->offset = priv->requestedOffset;
</span><span class="lines">@@ -1150,12 +1148,12 @@
</span><span class="cx"> void ResourceHandleStreamingClient::wasBlocked(ResourceHandle*)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
</span><del>- GOwnPtr<gchar> uri;
</del><ins>+ GUniquePtr<gchar> uri;
</ins><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Request was blocked");
</span><span class="cx">
</span><span class="cx"> GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</span><del>- uri.set(g_strdup(src->priv->uri));
</del><ins>+ uri.reset(g_strdup(src->priv->uri));
</ins><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="cx"> GST_ELEMENT_ERROR(src, RESOURCE, OPEN_READ, ("Access to \"%s\" was blocked", uri.get()), (0));
</span><span class="lines">@@ -1164,12 +1162,12 @@
</span><span class="cx"> void ResourceHandleStreamingClient::cannotShowURL(ResourceHandle*)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src.get());
</span><del>- GOwnPtr<gchar> uri;
</del><ins>+ GUniquePtr<gchar> uri;
</ins><span class="cx">
</span><span class="cx"> GST_ERROR_OBJECT(src, "Cannot show URL");
</span><span class="cx">
</span><span class="cx"> GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
</span><del>- uri.set(g_strdup(src->priv->uri));
</del><ins>+ uri.reset(g_strdup(src->priv->uri));
</ins><span class="cx"> locker.unlock();
</span><span class="cx">
</span><span class="cx"> GST_ELEMENT_ERROR(src, RESOURCE, OPEN_READ, ("Can't show \"%s\"", uri.get()), (0));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -21,11 +21,11 @@
</span><span class="cx">
</span><span class="cx"> #include "CairoUtilities.h"
</span><span class="cx"> #include "GdkCairoUtilities.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include "GRefPtrGtk.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><ins>+#include <wtf/gobject/GOwnPtr.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="lines">@@ -65,12 +65,12 @@
</span><span class="cx"> if (!pixbuf)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GError* error = 0;
</del><ins>+ GOwnPtr<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><del>- gdk_pixbuf_save_to_buffer(pixbuf.get(), &buffer.outPtr(), &bufferSize, type.utf8().data(), &error, "quality", qualityString.utf8().data(), NULL);
</del><ins>+ gdk_pixbuf_save_to_buffer(pixbuf.get(), &buffer.outPtr(), &bufferSize, type.utf8().data(), &error.outPtr(), "quality", qualityString.utf8().data(), NULL);
</ins><span class="cx"> } else
</span><del>- gdk_pixbuf_save_to_buffer(pixbuf.get(), &buffer.outPtr(), &bufferSize, type.utf8().data(), &error, NULL);
</del><ins>+ gdk_pixbuf_save_to_buffer(pixbuf.get(), &buffer.outPtr(), &bufferSize, type.utf8().data(), &error.outPtr(), NULL);
</ins><span class="cx">
</span><span class="cx"> return !error;
</span><span class="cx"> }
</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(0);
</del><ins>+ GOwnPtr<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="trunkSourceWebCoreplatformgraphicsgtkImageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -27,9 +27,11 @@
</span><span class="cx">
</span><span class="cx"> #include "BitmapImage.h"
</span><span class="cx"> #include "FileSystem.h"
</span><ins>+#include "GUniquePtrGtk.h"
</ins><span class="cx"> #include "GdkCairoUtilities.h"
</span><del>-#include "GOwnPtrGtk.h"
</del><span class="cx"> #include "SharedBuffer.h"
</span><ins>+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="lines">@@ -54,7 +56,7 @@
</span><span class="cx"> GTK_STOCK_MISSING_IMAGE, size,
</span><span class="cx"> GTK_ICON_LOOKUP_NO_SVG);
</span><span class="cx"> if (iconInfo) {
</span><del>- GOwnPtr<GtkIconInfo> info(iconInfo);
</del><ins>+ GUniquePtr<GtkIconInfo> info(iconInfo);
</ins><span class="cx"> return CString(gtk_icon_info_get_filename(info.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -93,8 +95,8 @@
</span><span class="cx"> if (!strcmp("missingImage", name))
</span><span class="cx"> fileName = getThemeIconFileName(GTK_STOCK_MISSING_IMAGE, 16);
</span><span class="cx"> if (fileName.isNull()) {
</span><del>- GOwnPtr<gchar> imageName(g_strdup_printf("%s.png", name));
- GOwnPtr<gchar> glibFileName(getPathToImageResource(imageName.get()));
</del><ins>+ GUniquePtr<gchar> imageName(g_strdup_printf("%s.png", name));
+ GUniquePtr<gchar> glibFileName(getPathToImageResource(imageName.get()));
</ins><span class="cx"> fileName = glibFileName.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkContextMenuGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> #include "ContextMenu.h"
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.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"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_platformDescription);
</span><span class="cx">
</span><del>- GOwnPtr<GList> children(gtk_container_get_children(GTK_CONTAINER(m_platformDescription)));
</del><ins>+ GUniquePtr<GList> children(gtk_container_get_children(GTK_CONTAINER(m_platformDescription)));
</ins><span class="cx"> return g_list_length(children.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<ContextMenuItem> menuItemVector;
</span><span class="cx">
</span><del>- GOwnPtr<GList> children(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ GUniquePtr<GList> children(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> int itemCount = g_list_length(children.get());
</span><span class="cx"> menuItemVector.reserveCapacity(itemCount);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkContextMenuItemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -25,9 +25,9 @@
</span><span class="cx"> #include "ContextMenuItem.h"
</span><span class="cx">
</span><span class="cx"> #include "ContextMenu.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <gtk/gtk.h>
</ins><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><del>-#include <gtk/gtk.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 WEBKIT_CONTEXT_MENU_ACTION "webkit-context-menu"
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> if (type == SeparatorType)
</span><span class="cx"> return GTK_MENU_ITEM(gtk_separator_menu_item_new());
</span><span class="cx">
</span><del>- GOwnPtr<char> actionName(g_strdup_printf("context-menu-action-%d", action));
</del><ins>+ GUniquePtr<char> actionName(g_strdup_printf("context-menu-action-%d", action));
</ins><span class="cx"> GRefPtr<GtkAction> platformAction;
</span><span class="cx">
</span><span class="cx"> if (type == CheckableActionType) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> #include "markup.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GOwnPtr<GError> error;
</span><del>- GOwnPtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
</del><ins>+ GUniquePtr<gchar> filename(g_filename_from_uri(line.utf8().data(), 0, &error.outPtr()));
</ins><span class="cx"> if (!error && filename)
</span><span class="cx"> m_filenames.append(String::fromUTF8(filename.get()));
</span><span class="cx"> }
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx"> markup.append("<a href=\"");
</span><span class="cx"> markup.append(url.string());
</span><span class="cx"> markup.append("\">");
</span><del>- GOwnPtr<gchar> escaped(g_markup_escape_text(actualLabel.utf8().data(), -1));
</del><ins>+ GUniquePtr<gchar> escaped(g_markup_escape_text(actualLabel.utf8().data(), -1));
</ins><span class="cx"> markup.append(String::fromUTF8(escaped.get()));
</span><span class="cx"> markup.append("</a>");
</span><span class="cx"> setMarkup(markup.toString());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkFileSystemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> return String::fromUTF8(filename);
</span><span class="cx"> #else
</span><del>- GOwnPtr<gchar> escapedString(g_uri_escape_string(filename, "/:", false));
</del><ins>+ GUniquePtr<gchar> escapedString(g_uri_escape_string(filename, "/:", false));
</ins><span class="cx"> return escapedString.get();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -58,7 +59,7 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx"> return path.utf8();
</span><span class="cx"> #else
</span><del>- GOwnPtr<gchar> filename(g_uri_unescape_string(path.utf8().data(), 0));
</del><ins>+ GUniquePtr<gchar> filename(g_uri_unescape_string(path.utf8().data(), 0));
</ins><span class="cx"> return filename.get();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -70,7 +71,7 @@
</span><span class="cx"> return string;
</span><span class="cx"> #else
</span><span class="cx"> CString filename = fileSystemRepresentation(string);
</span><del>- GOwnPtr<gchar> display(g_filename_to_utf8(filename.data(), 0, 0, 0, 0));
</del><ins>+ GUniquePtr<gchar> display(g_filename_to_utf8(filename.data(), 0, 0, 0, 0));
</ins><span class="cx"> if (!display)
</span><span class="cx"> return string;
</span><span class="cx">
</span><span class="lines">@@ -190,7 +191,7 @@
</span><span class="cx"> return pathName;
</span><span class="cx">
</span><span class="cx"> CString tmpFilename = fileSystemRepresentation(pathName);
</span><del>- GOwnPtr<gchar> baseName(g_path_get_basename(tmpFilename.data()));
</del><ins>+ GUniquePtr<gchar> baseName(g_path_get_basename(tmpFilename.data()));
</ins><span class="cx"> return String::fromUTF8(baseName.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -201,11 +202,11 @@
</span><span class="cx"> return path;
</span><span class="cx">
</span><span class="cx"> // If the above fails, check the PATH env variable.
</span><del>- GOwnPtr<char> currentExePath(g_find_program_in_path(g_get_prgname()));
</del><ins>+ GUniquePtr<char> currentExePath(g_find_program_in_path(g_get_prgname()));
</ins><span class="cx"> if (!currentExePath.get())
</span><span class="cx"> return CString();
</span><span class="cx">
</span><del>- GOwnPtr<char> dirname(g_path_get_dirname(currentExePath.get()));
</del><ins>+ GUniquePtr<char> dirname(g_path_get_dirname(currentExePath.get()));
</ins><span class="cx"> return dirname.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -219,10 +220,10 @@
</span><span class="cx"> HMODULE hmodule = 0;
</span><span class="cx"> GetModuleHandleExA(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, reinterpret_cast<char*>(sharedResourcesPath), &hmodule);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
- GOwnPtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
</del><ins>+ GUniquePtr<gchar> runtimeDir(g_win32_get_package_installation_directory_of_module(hmodule));
+ GUniquePtr<gchar> dataPath(g_build_filename(runtimeDir.get(), "share", "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
</ins><span class="cx"> #else
</span><del>- GOwnPtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
</del><ins>+ GUniquePtr<gchar> dataPath(g_build_filename(DATA_DIR, "webkitgtk-" WEBKITGTK_API_VERSION_STRING, NULL));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> cachedPath = dataPath.get();
</span><span class="lines">@@ -242,7 +243,7 @@
</span><span class="cx"> String directoryName(const String& path)
</span><span class="cx"> {
</span><span class="cx"> /* No null checking needed */
</span><del>- GOwnPtr<char> dirname(g_path_get_dirname(fileSystemRepresentation(path).data()));
</del><ins>+ GUniquePtr<char> dirname(g_path_get_dirname(fileSystemRepresentation(path).data()));
</ins><span class="cx"> return String::fromUTF8(dirname.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -251,28 +252,26 @@
</span><span class="cx"> Vector<String> entries;
</span><span class="cx">
</span><span class="cx"> CString filename = fileSystemRepresentation(path);
</span><del>- GDir* dir = g_dir_open(filename.data(), 0, 0);
</del><ins>+ GUniquePtr<GDir> dir(g_dir_open(filename.data(), 0, nullptr));
</ins><span class="cx"> if (!dir)
</span><span class="cx"> return entries;
</span><span class="cx">
</span><del>- GPatternSpec *pspec = g_pattern_spec_new((filter.utf8()).data());
- while (const char* name = g_dir_read_name(dir)) {
- if (!g_pattern_match_string(pspec, name))
</del><ins>+ GUniquePtr<GPatternSpec> pspec(g_pattern_spec_new((filter.utf8()).data()));
+ while (const char* name = g_dir_read_name(dir.get())) {
+ if (!g_pattern_match_string(pspec.get(), name))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- GOwnPtr<gchar> entry(g_build_filename(filename.data(), name, NULL));
</del><ins>+ GUniquePtr<gchar> entry(g_build_filename(filename.data(), name, NULL));
</ins><span class="cx"> entries.append(filenameToString(entry.get()));
</span><span class="cx"> }
</span><del>- g_pattern_spec_free(pspec);
- g_dir_close(dir);
</del><span class="cx">
</span><span class="cx"> return entries;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String openTemporaryFile(const String& prefix, PlatformFileHandle& handle)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> filename(g_strdup_printf("%s%s", prefix.utf8().data(), createCanonicalUUIDString().utf8().data()));
- GOwnPtr<gchar> tempPath(g_build_filename(g_get_tmp_dir(), filename.get(), NULL));
</del><ins>+ GUniquePtr<gchar> filename(g_strdup_printf("%s%s", prefix.utf8().data(), createCanonicalUUIDString().utf8().data()));
+ GUniquePtr<gchar> tempPath(g_build_filename(g_get_tmp_dir(), filename.get(), NULL));
</ins><span class="cx"> GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(tempPath.get()));
</span><span class="cx">
</span><span class="cx"> handle = g_file_create_readwrite(file.get(), G_FILE_CREATE_NONE, 0, 0);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGOwnPtrGtkcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -1,38 +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 "GOwnPtrGtk.h"
-
-#include <gtk/gtk.h>
-
-namespace WTF {
-
-template <> void freeOwnedGPtr<GdkEvent>(GdkEvent* ptr)
-{
- if (ptr)
- gdk_event_free(ptr);
-}
-
-template <> void freeOwnedGPtr<GtkIconInfo>(GtkIconInfo* info)
-{
- if (info)
- gtk_icon_info_free(info);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGOwnPtrGtkh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -1,32 +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 GOwnPtrGtk_h
-#define GOwnPtrGtk_h
-
-#include <wtf/gobject/GOwnPtr.h>
-
-namespace WTF {
-
-template <> void freeOwnedGPtr<GdkEvent>(GdkEvent*);
-template <> void freeOwnedGPtr<GtkIconInfo>(GtkIconInfo*);
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGUniquePtrGtkhfromrev162598trunkSourceWebCoreplatformgtkGOwnPtrGtkh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h (from rev 162598, trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.h) (0 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h (rev 0)
+++ trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 GUniquePtrGtk_h
+#define GUniquePtrGtk_h
+
+#include <gtk/gtk.h>
+#include <wtf/gobject/GUniquePtr.h>
+
+namespace WTF {
+
+WTF_DEFINE_GPTR_DELETER(GdkEvent, gdk_event_free)
+WTF_DEFINE_GPTR_DELETER(GtkIconInfo, gtk_icon_info_free)
+
+} // namespace WTF
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGamepadsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><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"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx"> m_gudevClient = adoptGRef(g_udev_client_new(subsystems));
</span><span class="cx"> g_signal_connect(m_gudevClient.get(), "uevent", G_CALLBACK(onUEventCallback), this);
</span><span class="cx">
</span><del>- GOwnPtr<GList> devicesList(g_udev_client_query_by_subsystem(m_gudevClient.get(), subsystems[0]));
</del><ins>+ GUniquePtr<GList> devicesList(g_udev_client_query_by_subsystem(m_gudevClient.get(), subsystems[0]));
</ins><span class="cx"> for (GList* listItem = devicesList.get(); listItem; listItem = g_list_next(listItem)) {
</span><span class="cx"> GUdevDevice* device = G_UDEV_DEVICE(listItem->data);
</span><span class="cx"> String deviceFile = String::fromUTF8(g_udev_device_get_device_file(device));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkClickCountercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkClickCounter.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GtkClickCounter.h"
</span><span class="cx">
</span><del>-#include "GOwnPtrGtk.h"
</del><ins>+#include "GUniquePtrGtk.h"
</ins><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> // coming up, ignore this event as it certainly generated the double or triple
</span><span class="cx"> // click. The consequence of not eating this event is two DOM button press events
</span><span class="cx"> // are generated.
</span><del>- GOwnPtr<GdkEvent> nextEvent(gdk_event_peek());
</del><ins>+ GUniquePtr<GdkEvent> nextEvent(gdk_event_peek());
</ins><span class="cx"> if (!nextEvent)
</span><span class="cx"> return true;
</span><span class="cx"> if (nextEvent->any.type == GDK_2BUTTON_PRESS || nextEvent->any.type == GDK_3BUTTON_PRESS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkInputMethodFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/GtkInputMethodFilter.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -19,11 +19,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GtkInputMethodFilter.h"
</span><span class="cx">
</span><del>-#include "GOwnPtrGtk.h"
</del><ins>+#include "GUniquePtrGtk.h"
</ins><span class="cx"> #include "GtkVersioning.h"
</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><ins>+#include <wtf/gobject/GOwnPtr.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">@@ -270,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> void GtkInputMethodFilter::sendCompositionAndPreeditWithFakeKeyEvents(ResultsToSend resultsToSend)
</span><span class="cx"> {
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(GDK_KEY_PRESS));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(GDK_KEY_PRESS));
</ins><span class="cx"> event->key.time = GDK_CURRENT_TIME;
</span><span class="cx"> event->key.keyval = gCompositionEventKeyCode;
</span><span class="cx"> sendKeyEventWithCompositionResults(&event->key, resultsToSend, EventFaked);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkPopupMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkPopupMenu.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/GtkPopupMenu.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "GtkPopupMenu.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include "GtkVersioning.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"> namespace WebCore {
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> gtk_widget_set_size_request(m_popup.get(), std::max(menuSize.width(), requisition.width), -1);
</span><span class="cx">
</span><span class="cx"> if (itemCount) {
</span><del>- GOwnPtr<GList> children(gtk_container_get_children(GTK_CONTAINER(m_popup.get())));
</del><ins>+ GUniquePtr<GList> children(gtk_container_get_children(GTK_CONTAINER(m_popup.get())));
</ins><span class="cx"> int i;
</span><span class="cx"> GList* child;
</span><span class="cx"> for (i = 0, child = children.get(); i < itemCount; i++, child = g_list_next(child)) {
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> glong charactersWritten;
</span><del>- GOwnPtr<gunichar2> utf16String(g_ucs4_to_utf16(&unicodeCharacter, 1, 0, &charactersWritten, 0));
</del><ins>+ GUniquePtr<gunichar2> utf16String(g_ucs4_to_utf16(&unicodeCharacter, 1, 0, &charactersWritten, 0));
</ins><span class="cx"> if (!utf16String) {
</span><span class="cx"> resetTypeAheadFindState();
</span><span class="cx"> return false;
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> // Like the Chromium port, we case fold before searching, because
</span><span class="cx"> // strncmp does not handle non-ASCII characters.
</span><del>- GOwnPtr<gchar> searchStringWithCaseFolded(g_utf8_casefold(m_currentSearchString.utf8().data(), -1));
</del><ins>+ GUniquePtr<gchar> searchStringWithCaseFolded(g_utf8_casefold(m_currentSearchString.utf8().data(), -1));
</ins><span class="cx"> size_t prefixLength = strlen(searchStringWithCaseFolded.get());
</span><span class="cx">
</span><span class="cx"> GList* children = gtk_container_get_children(GTK_CONTAINER(m_popup.get()));
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> if (!currentChild)
</span><span class="cx"> currentChild = children;
</span><span class="cx">
</span><del>- GOwnPtr<gchar> itemText(g_utf8_casefold(gtk_menu_item_get_label(GTK_MENU_ITEM(currentChild->data)), -1));
</del><ins>+ GUniquePtr<gchar> itemText(g_utf8_casefold(gtk_menu_item_get_label(GTK_MENU_ITEM(currentChild->data)), -1));
</ins><span class="cx"> if (!strncmp(searchStringWithCaseFolded.get(), itemText.get(), prefixLength)) {
</span><span class="cx"> gtk_menu_shell_select_item(GTK_MENU_SHELL(m_popup.get()), GTK_WIDGET(currentChild->data));
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkLanguageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Language.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> if (!localeDefault)
</span><span class="cx"> return String("c");
</span><span class="cx">
</span><del>- GOwnPtr<gchar> normalizedDefault(g_ascii_strdown(localeDefault, -1));
</del><ins>+ GUniquePtr<gchar> normalizedDefault(g_ascii_strdown(localeDefault, -1));
</ins><span class="cx"> char* ptr = strchr(normalizedDefault.get(), '_');
</span><span class="cx">
</span><span class="cx"> if (ptr)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -29,18 +29,17 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
</del><span class="cx"> #include "LocalizedStrings.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+
</ins><span class="cx"> #include "IntSize.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include <glib/gi18n-lib.h>
+#include <gtk/gtk.h>
</ins><span class="cx"> #include <wtf/MathExtras.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> static const char* gtkStockLabel(const char* stockID)
</span><span class="lines">@@ -544,9 +543,8 @@
</span><span class="cx">
</span><span class="cx"> String imageTitle(const String& filename, const IntSize& size)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> string(g_strdup_printf(C_("Title string for images", "%s (%dx%d pixels)"),
- filename.utf8().data(),
- size.width(), size.height()));
</del><ins>+ GUniquePtr<gchar> string(g_strdup_printf(C_("Title string for images", "%s (%dx%d pixels)"),
+ filename.utf8().data(), size.width(), size.height()));
</ins><span class="cx">
</span><span class="cx"> return String::fromUTF8(string.get());
</span><span class="cx"> }
</span><span class="lines">@@ -668,21 +666,21 @@
</span><span class="cx"> seconds %= 60;
</span><span class="cx">
</span><span class="cx"> if (days) {
</span><del>- GOwnPtr<gchar> string(g_strdup_printf("%d days %d hours %d minutes %d seconds", days, hours, minutes, seconds));
</del><ins>+ GUniquePtr<gchar> string(g_strdup_printf("%d days %d hours %d minutes %d seconds", days, hours, minutes, seconds));
</ins><span class="cx"> return String::fromUTF8(string.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (hours) {
</span><del>- GOwnPtr<gchar> string(g_strdup_printf("%d hours %d minutes %d seconds", hours, minutes, seconds));
</del><ins>+ GUniquePtr<gchar> string(g_strdup_printf("%d hours %d minutes %d seconds", hours, minutes, seconds));
</ins><span class="cx"> return String::fromUTF8(string.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (minutes) {
</span><del>- GOwnPtr<gchar> string(g_strdup_printf("%d minutes %d seconds", minutes, seconds));
</del><ins>+ GUniquePtr<gchar> string(g_strdup_printf("%d minutes %d seconds", minutes, seconds));
</ins><span class="cx"> return String::fromUTF8(string.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<gchar> string(g_strdup_printf("%d seconds", seconds));
</del><ins>+ GUniquePtr<gchar> string(g_strdup_printf("%d seconds", seconds));
</ins><span class="cx"> return String::fromUTF8(string.get());
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.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">@@ -117,7 +118,7 @@
</span><span class="cx"> static String selectionDataToUTF8String(GtkSelectionData* data)
</span><span class="cx"> {
</span><span class="cx"> // g_strndup guards against selection data that is not null-terminated.
</span><del>- GOwnPtr<gchar> markupString(g_strndup(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)), gtk_selection_data_get_length(data)));
</del><ins>+ GUniquePtr<gchar> markupString(g_strndup(reinterpret_cast<const char*>(gtk_selection_data_get_data(data)), gtk_selection_data_get_length(data)));
</ins><span class="cx"> return String::fromUTF8(markupString.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -127,7 +128,7 @@
</span><span class="cx"> ASSERT(dataObject);
</span><span class="cx">
</span><span class="cx"> if (gtk_clipboard_wait_is_text_available(clipboard)) {
</span><del>- GOwnPtr<gchar> textData(gtk_clipboard_wait_for_text(clipboard));
</del><ins>+ GUniquePtr<gchar> textData(gtk_clipboard_wait_for_text(clipboard));
</ins><span class="cx"> if (textData)
</span><span class="cx"> dataObject->setText(String::fromUTF8(textData.get()));
</span><span class="cx"> }
</span><span class="lines">@@ -176,7 +177,7 @@
</span><span class="cx"> else
</span><span class="cx"> result.append(url);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> resultData(g_strdup(result.utf8().data()));
</del><ins>+ GUniquePtr<gchar> resultData(g_strdup(result.utf8().data()));
</ins><span class="cx"> gtk_selection_data_set(selectionData, netscapeURLAtom, 8,
</span><span class="cx"> reinterpret_cast<const guchar*>(resultData.get()), strlen(resultData.get()));
</span><span class="cx">
</span><span class="lines">@@ -193,12 +194,12 @@
</span><span class="cx"> auto types = dataObject->unknownTypes();
</span><span class="cx"> auto end = types.end();
</span><span class="cx"> for (auto it = types.begin(); it != end; ++it) {
</span><del>- GOwnPtr<gchar> dictItem(g_strdup_printf("{'%s', '%s'}", it->key.utf8().data(), it->value.utf8().data()));
</del><ins>+ GUniquePtr<gchar> dictItem(g_strdup_printf("{'%s', '%s'}", it->key.utf8().data(), it->value.utf8().data()));
</ins><span class="cx"> g_variant_builder_add_parsed(&builder, dictItem.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GRefPtr<GVariant> variant = g_variant_builder_end(&builder);
</span><del>- GOwnPtr<gchar> serializedVariant(g_variant_print(variant.get(), TRUE));
</del><ins>+ GUniquePtr<gchar> serializedVariant(g_variant_print(variant.get(), TRUE));
</ins><span class="cx"> gtk_selection_data_set(selectionData, unknownAtom, 1, reinterpret_cast<const guchar*>(serializedVariant.get()), strlen(serializedVariant.get()));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkPopupMenuGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/PopupMenuGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -28,11 +28,10 @@
</span><span class="cx"> #include "PopupMenuGtk.h"
</span><span class="cx">
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "GOwnPtrGtk.h"
</del><ins>+#include "GUniquePtrGtk.h"
</ins><span class="cx"> #include "GtkUtilities.h"
</span><span class="cx"> #include "HostWindow.h"
</span><span class="cx"> #include <gtk/gtk.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"> namespace WebCore {
</span><span class="lines">@@ -52,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> GtkAction* PopupMenuGtk::createGtkActionForMenuItem(int itemIndex)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> actionName(g_strdup_printf("popup-menu-action-%d", itemIndex));
</del><ins>+ GUniquePtr<char> actionName(g_strdup_printf("popup-menu-action-%d", itemIndex));
</ins><span class="cx"> GtkAction* action = gtk_action_new(actionName.get(), client()->itemText(itemIndex).utf8().data(), client()->itemToolTip(itemIndex).utf8().data(), 0);
</span><span class="cx"> g_object_set_data(G_OBJECT(action), "popup-menu-action-index", GINT_TO_POINTER(itemIndex));
</span><span class="cx"> g_signal_connect(action, "activate", G_CALLBACK(menuItemActivated), this);
</span><span class="lines">@@ -86,7 +85,7 @@
</span><span class="cx"> IntPoint menuPosition = convertWidgetPointToScreenPoint(GTK_WIDGET(view->hostWindow()->platformPageClient()), view->contentsToWindow(rect.location()));
</span><span class="cx"> menuPosition.move(0, rect.height());
</span><span class="cx">
</span><del>- GOwnPtr<GdkEvent> currentEvent(gtk_get_current_event());
</del><ins>+ GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</ins><span class="cx"> m_popup->popUp(rect.size(), menuPosition, size, index, currentEvent.get());
</span><span class="cx">
</span><span class="cx"> // GTK can refuse to actually open the menu when mouse grabs fails.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkWebKitAuthenticationWidgetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/WebKitAuthenticationWidget.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/WebKitAuthenticationWidget.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/gtk/WebKitAuthenticationWidget.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "CredentialBackingStore.h"
</span><span class="cx"> #include "GtkVersioning.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"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> gtk_widget_show(icon);
</span><span class="cx">
</span><span class="cx"> WebKitAuthenticationWidgetPrivate* priv = authWidget->priv;
</span><del>- GOwnPtr<char> prompt(g_strdup_printf(
</del><ins>+ GUniquePtr<char> prompt(g_strdup_printf(
</ins><span class="cx"> _("The site %s:%i requests a username and password"),
</span><span class="cx"> priv->challenge.protectionSpace().host().utf8().data(),
</span><span class="cx"> priv->challenge.protectionSpace().port()));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><ins>+#include "GUniquePtrSoup.h"
</ins><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"> class Frame;
</span><span class="cx"> #endif
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> GRefPtr<GCancellable> m_cancellable;
</span><span class="cx"> GRefPtr<GAsyncResult> m_deferredResult;
</span><span class="cx"> GRefPtr<GSource> m_timeoutSource;
</span><del>- GOwnPtr<SoupBuffer> m_soupBuffer;
</del><ins>+ GUniquePtr<SoupBuffer> m_soupBuffer;
</ins><span class="cx"> unsigned long m_bodySize;
</span><span class="cx"> unsigned long m_bodyDataSent;
</span><span class="cx"> SoupSession* soupSession();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkgtkCredentialBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <libsecret/secret.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -77,7 +78,7 @@
</span><span class="cx"> delete callbackData;
</span><span class="cx">
</span><span class="cx"> GOwnPtr<GError> error;
</span><del>- GOwnPtr<GList> elements(secret_service_search_finish(service, asyncResult, &error.outPtr()));
</del><ins>+ GUniquePtr<GList> elements(secret_service_search_finish(service, asyncResult, &error.outPtr()));
</ins><span class="cx"> if (error || !elements || !elements->data) {
</span><span class="cx"> callback(Credential(), data);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "CookieJarSoup.h"
</span><span class="cx">
</span><span class="cx"> #include "Cookie.h"
</span><del>-#include "GOwnPtrSoup.h"
</del><ins>+#include "GUniquePtrSoup.h"
</ins><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "NetworkingContext.h"
</span><span class="cx"> #include "PlatformCookieJar.h"
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
- GOwnPtr<SoupURI> firstPartyURI(soup_uri_new(firstParty.string().utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> origin(soup_uri_new(url.string().utf8().data()));
+ GUniquePtr<SoupURI> firstPartyURI(soup_uri_new(firstParty.string().utf8().data()));
</ins><span class="cx">
</span><span class="cx"> // Get existing cookies for this origin.
</span><span class="cx"> GSList* existingCookies = soup_cookie_jar_get_cookie_list(jar, origin.get(), TRUE);
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> value.split('\n', cookies);
</span><span class="cx"> const size_t cookiesCount = cookies.size();
</span><span class="cx"> for (size_t i = 0; i < cookiesCount; ++i) {
</span><del>- GOwnPtr<SoupCookie> cookie(soup_cookie_parse(cookies[i].utf8().data(), origin.get()));
</del><ins>+ GUniquePtr<SoupCookie> cookie(soup_cookie_parse(cookies[i].utf8().data(), origin.get()));
</ins><span class="cx"> if (!cookie)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return String();
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
- GOwnPtr<char> cookies(soup_cookie_jar_get_cookies(jar, uri.get(), forHTTPHeader));
</del><ins>+ GUniquePtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
+ GUniquePtr<char> cookies(soup_cookie_jar_get_cookies(jar, uri.get(), forHTTPHeader));
</ins><span class="cx"> return String::fromUTF8(cookies.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -149,8 +149,8 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
- GOwnPtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
</del><ins>+ GUniquePtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
+ GUniquePtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
</ins><span class="cx"> if (!cookies)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -171,8 +171,8 @@
</span><span class="cx"> if (!jar)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
- GOwnPtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
</del><ins>+ GUniquePtr<SoupURI> uri(soup_uri_new(url.string().utf8().data()));
+ GUniquePtr<GSList> cookies(soup_cookie_jar_get_cookie_list(jar, uri.get(), TRUE));
</ins><span class="cx"> if (!cookies)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> void getHostnamesWithCookies(const NetworkStorageSession& session, HashSet<String>& hostnames)
</span><span class="cx"> {
</span><span class="cx"> SoupCookieJar* cookieJar = cookieJarForSession(session);
</span><del>- GOwnPtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
</del><ins>+ GUniquePtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
</ins><span class="cx"> for (GSList* item = cookies.get(); item; item = g_slist_next(item)) {
</span><span class="cx"> SoupCookie* cookie = static_cast<SoupCookie*>(item->data);
</span><span class="cx"> if (cookie->domain)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> {
</span><span class="cx"> CString hostNameString = hostname.utf8();
</span><span class="cx"> SoupCookieJar* cookieJar = cookieJarForSession(session);
</span><del>- GOwnPtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
</del><ins>+ GUniquePtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
</ins><span class="cx"> for (GSList* item = cookies.get(); item; item = g_slist_next(item)) {
</span><span class="cx"> SoupCookie* cookie = static_cast<SoupCookie*>(item->data);
</span><span class="cx"> if (soup_cookie_domain_matches(cookie, hostNameString.data()))
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> void deleteAllCookies(const NetworkStorageSession& session)
</span><span class="cx"> {
</span><span class="cx"> SoupCookieJar* cookieJar = cookieJarForSession(session);
</span><del>- GOwnPtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
</del><ins>+ GUniquePtr<GSList> cookies(soup_cookie_jar_all_cookies(cookieJar));
</ins><span class="cx"> for (GSList* item = cookies.get(); item; item = g_slist_next(item)) {
</span><span class="cx"> SoupCookie* cookie = static_cast<SoupCookie*>(item->data);
</span><span class="cx"> soup_cookie_jar_delete_cookie(cookieJar, cookie);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupDNSSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "DNS.h"
</span><span class="cx"> #include "DNSResolveQueue.h"
</span><span class="cx">
</span><del>-#include "GOwnPtrSoup.h"
</del><span class="cx"> #include "SoupNetworkSession.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupGUniquePtrSouphfromrev162598trunkSourceWebCoreplatformgtkGOwnPtrGtkh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h (from rev 162598, trunk/Source/WebCore/platform/gtk/GOwnPtrGtk.h) (0 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h (rev 0)
+++ trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+/*
+ * Copyright (C) 2014 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 GUniquePtrSoup_h
+#define GUniquePtrSoup_h
+
+#include <libsoup/soup.h>
+#include <wtf/gobject/GUniquePtr.h>
+
+namespace WTF {
+
+WTF_DEFINE_GPTR_DELETER(SoupURI, soup_uri_free)
+WTF_DEFINE_GPTR_DELETER(SoupCookie, soup_cookie_free)
+WTF_DEFINE_GPTR_DELETER(SoupMessageHeaders, soup_message_headers_free)
+WTF_DEFINE_GPTR_DELETER(SoupBuffer, soup_buffer_free)
+
+} // namespace WTF
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceErrorSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LocalizedStrings.h"
</span><span class="cx"> #include <libsoup/soup.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"> namespace WebCore {
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> static String failingURI(SoupURI* soupURI)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(soupURI);
</span><del>- GOwnPtr<char> uri(soup_uri_to_string(soupURI, FALSE));
</del><ins>+ GUniquePtr<char> uri(soup_uri_to_string(soupURI, FALSE));
</ins><span class="cx"> return uri.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/SHA1.h>
</span><ins>+#include <wtf/gobject/GOwnPtr.h>
</ins><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">@@ -286,9 +287,9 @@
</span><span class="cx"> size_t bufferSize;
</span><span class="cx"> char* bufferFromClient = client()->getOrCreateReadBuffer(gDefaultReadBufferSize, bufferSize);
</span><span class="cx"> if (bufferFromClient)
</span><del>- d->m_soupBuffer.set(soup_buffer_new(SOUP_MEMORY_TEMPORARY, bufferFromClient, bufferSize));
</del><ins>+ d->m_soupBuffer.reset(soup_buffer_new(SOUP_MEMORY_TEMPORARY, bufferFromClient, bufferSize));
</ins><span class="cx"> else
</span><del>- d->m_soupBuffer.set(soup_buffer_new(SOUP_MEMORY_TAKE, static_cast<char*>(g_malloc(gDefaultReadBufferSize)), gDefaultReadBufferSize));
</del><ins>+ d->m_soupBuffer.reset(soup_buffer_new(SOUP_MEMORY_TAKE, static_cast<char*>(g_malloc(gDefaultReadBufferSize)), gDefaultReadBufferSize));
</ins><span class="cx">
</span><span class="cx"> ASSERT(d->m_soupBuffer);
</span><span class="cx"> }
</span><span class="lines">@@ -547,7 +548,7 @@
</span><span class="cx"> d->m_inputStream.clear();
</span><span class="cx"> d->m_multipartInputStream.clear();
</span><span class="cx"> d->m_cancellable.clear();
</span><del>- d->m_soupBuffer.clear();
</del><ins>+ d->m_soupBuffer.reset();
</ins><span class="cx">
</span><span class="cx"> if (d->m_soupMessage) {
</span><span class="cx"> g_signal_handlers_disconnect_matched(d->m_soupMessage.get(), G_SIGNAL_MATCH_DATA,
</span><span class="lines">@@ -992,7 +993,7 @@
</span><span class="cx">
</span><span class="cx"> GOwnPtr<GError> error;
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> soupURI(request.soupURI());
</del><ins>+ GUniquePtr<SoupURI> soupURI(request.soupURI());
</ins><span class="cx"> if (!soupURI)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceRequestSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -20,11 +20,10 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx">
</span><del>-#include "GOwnPtrSoup.h"
</del><ins>+#include "GUniquePtrSoup.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "SoupURIUtils.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -36,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> String firstPartyString = firstPartyForCookies().string();
</span><span class="cx"> if (!firstPartyString.isEmpty()) {
</span><del>- GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
</del><ins>+ GUniquePtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
</ins><span class="cx"> soup_message_set_first_party(soupMessage, firstParty.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -71,7 +70,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_object_set(soupMessage, SOUP_MESSAGE_METHOD, httpMethod().utf8().data(), NULL);
</span><span class="cx">
</span><del>- GOwnPtr<SoupURI> uri(soupURI());
</del><ins>+ GUniquePtr<SoupURI> uri(soupURI());
</ins><span class="cx"> soup_message_set_uri(soupMessage, uri.get());
</span><span class="cx">
</span><span class="cx"> updateSoupMessageMembers(soupMessage);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceResponseSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "SoupURIUtils.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupURIUtilscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/network/soup/SoupURIUtils.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SoupURIUtils.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <libsoup/soup.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">@@ -31,7 +31,7 @@
</span><span class="cx"> // not want to break compatibility with previous implementations
</span><span class="cx"> URL soupURIToKURL(SoupURI* soupURI)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> urlString(soup_uri_to_string(soupURI, FALSE));
</del><ins>+ GUniquePtr<gchar> urlString(soup_uri_to_string(soupURI, FALSE));
</ins><span class="cx"> URL url(URL(), String::fromUTF8(urlString.get()));
</span><span class="cx">
</span><span class="cx"> if (!soupURI->password)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupSharedBufferSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx">
</span><span class="cx"> SharedBuffer::SharedBuffer(SoupBuffer* soupBuffer)
</span><span class="cx"> : m_size(0)
</span><ins>+ , m_soupBuffer(soupBuffer)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(soupBuffer);
</span><del>- m_soupBuffer.set(soupBuffer);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> SharedBuffer::wrapSoupBuffer(SoupBuffer* soupBuffer)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> void SharedBuffer::clearPlatformData()
</span><span class="cx"> {
</span><del>- m_soupBuffer.clear();
</del><ins>+ m_soupBuffer.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SharedBuffer::tryReplaceContentsWithPlatformBuffer(SharedBuffer* newContents)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> // Hang on to the m_soupBuffer pointer in a local pointer as append() will re-enter maybeTransferPlatformData()
</span><span class="cx"> // and we need to make sure to early return when it does.
</span><del>- GOwnPtr<SoupBuffer> soupBuffer;
</del><ins>+ GUniquePtr<SoupBuffer> soupBuffer;
</ins><span class="cx"> soupBuffer.swap(m_soupBuffer);
</span><span class="cx">
</span><span class="cx"> append(soupBuffer->data, soupBuffer->length);
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> bool SharedBuffer::hasPlatformData() const
</span><span class="cx"> {
</span><del>- return m_soupBuffer;
</del><ins>+ return m_soupBuffer.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* SharedBuffer::platformData() const
</span></span></pre></div>
<a id="trunkSourceWebCorepluginsgtkPluginPackageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginPackage.h"
</span><span class="cx">
</span><del>-#include "GOwnPtrGtk.h"
</del><span class="cx"> #include "GRefPtrGtk.h"
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "npruntime_impl.h"
</span><span class="cx"> #include "PluginDebug.h"
</span><span class="cx"> #include <gio/gio.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"> namespace WebCore {
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> gchar** mimeDescs = g_strsplit(types, ";", -1);
</span><span class="cx"> for (int i = 0; mimeDescs[i] && mimeDescs[i][0]; i++) {
</span><del>- GOwnPtr<char> mime(g_utf8_strdown(mimeDescs[i], -1));
</del><ins>+ GUniquePtr<char> mime(g_utf8_strdown(mimeDescs[i], -1));
</ins><span class="cx"> gchar** mimeData = g_strsplit(mime.get(), ":", 3);
</span><span class="cx"> if (g_strv_length(mimeData) < 3) {
</span><span class="cx"> g_strfreev(mimeData);
</span><span class="lines">@@ -129,22 +129,22 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<gchar> finalPath(g_strdup(m_path.utf8().data()));
</del><ins>+ GUniquePtr<gchar> finalPath(g_strdup(m_path.utf8().data()));
</ins><span class="cx"> while (g_file_test(finalPath.get(), G_FILE_TEST_IS_SYMLINK)) {
</span><span class="cx"> GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(finalPath.get()));
</span><span class="cx"> GRefPtr<GFile> dir = adoptGRef(g_file_get_parent(file.get()));
</span><del>- GOwnPtr<gchar> linkPath(g_file_read_link(finalPath.get(), 0));
</del><ins>+ GUniquePtr<gchar> linkPath(g_file_read_link(finalPath.get(), 0));
</ins><span class="cx"> GRefPtr<GFile> resolvedFile = adoptGRef(g_file_resolve_relative_path(dir.get(), linkPath.get()));
</span><del>- finalPath.set(g_file_get_path(resolvedFile.get()));
</del><ins>+ finalPath.reset(g_file_get_path(resolvedFile.get()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // No joke. If there is a netscape component in the path, go back
</span><span class="cx"> // to the symlink, as flash breaks otherwise.
</span><span class="cx"> // See http://src.chromium.org/viewvc/chrome/trunk/src/webkit/glue/plugins/plugin_list_posix.cc
</span><del>- GOwnPtr<gchar> baseName(g_path_get_basename(finalPath.get()));
</del><ins>+ GUniquePtr<gchar> baseName(g_path_get_basename(finalPath.get()));
</ins><span class="cx"> if (!g_strcmp0(baseName.get(), "libflashplayer.so")
</span><span class="cx"> && g_strstr_len(finalPath.get(), -1, "/netscape/"))
</span><del>- finalPath.set(g_strdup(m_path.utf8().data()));
</del><ins>+ finalPath.reset(g_strdup(m_path.utf8().data()));
</ins><span class="cx">
</span><span class="cx"> m_module = g_module_open(finalPath.get(), G_MODULE_BIND_LOCAL);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -1,3 +1,54 @@
</span><ins>+2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Use GUniquePtr instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127431
+
+ Reviewed by Martin Robinson.
+
+ GUniquePtr is a template alias of std::unique_ptr with a custom
+ deleter that replaces GOwnPtr. GOwnPtr is still used for the cases
+ where the output pointer is needed, but it will also be replaced soon.
+
+ * WebCoreSupport/ContextMenuClientGtk.cpp:
+ (WebKit::getUnicodeMenuItemPosition):
+ * WebCoreSupport/DragClientGtk.cpp:
+ (WebKit::DragClient::startDrag):
+ * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+ (DumpRenderTreeSupportGtk::setValueForUser):
+ * WebCoreSupport/EditorClientGtk.h:
+ * WebCoreSupport/FrameLoaderClientGtk.cpp:
+ (WebKit::FrameLoaderClient::userAgent):
+ (WebKit::FrameLoaderClient::dispatchDidReceiveAuthenticationChallenge):
+ (WebKit::FrameLoaderClient::dispatchWillSendRequest):
+ (WebKit::FrameLoaderClient::assignIdentifierToInitialRequest):
+ (WebKit::FrameLoaderClient::dispatchDidReceiveResponse):
+ (WebKit::FrameLoaderClient::dispatchDidReceiveContentLength):
+ (WebKit::FrameLoaderClient::dispatchDidFinishLoading):
+ (WebKit::FrameLoaderClient::dispatchDidFailLoading):
+ (WebKit::FrameLoaderClient::dispatchDidFailLoad):
+ * WebCoreSupport/InspectorClientGtk.h:
+ * webkit/webkitfavicondatabase.cpp:
+ (webkit_favicon_database_set_path):
+ * webkit/webkitfilechooserrequest.cpp:
+ * webkit/webkitglobals.cpp:
+ (webkitInit):
+ * webkit/webkithittestresult.cpp:
+ (WebKit::kit):
+ * webkit/webkiticondatabase.cpp:
+ (webkit_icon_database_set_path):
+ * webkit/webkitspellcheckerenchant.cpp:
+ * webkit/webkitwebplugin.cpp:
+ (webkit_web_plugin_get_path):
+ * webkit/webkitwebpluginprivate.h:
+ * webkit/webkitwebsettings.cpp:
+ (webkit_web_settings_class_init):
+ (webkit_web_settings_copy):
+ * webkit/webkitwebview.cpp:
+ (webkit_web_view_forward_context_menu_event):
+ (fileChooserDialogResponseCallback):
+ (webkit_web_view_drag_end):
+ * webkit/webkitwebviewprivate.h:
+
</ins><span class="cx"> 2014-01-22 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
</span><span class="cx">
</span><span class="cx"> [EFL][GTK] Get EFL and GTK compiling with ACCESSIBILITY disabled
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportContextMenuClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> static int getUnicodeMenuItemPosition(GtkMenu* menu)
</span><span class="cx"> {
</span><del>- GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ GUniquePtr<GList> items(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> int unicodeMenuItemPosition = -1;
</span><span class="cx"> GList* iter;
</span><span class="cx"> int i = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportDragClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> #include "DragController.h"
</span><span class="cx"> #include "Element.h"
</span><span class="cx"> #include "Frame.h"
</span><del>-#include "GOwnPtrGtk.h"
</del><span class="cx"> #include "GRefPtrGtk.h"
</span><ins>+#include "GUniquePtrGtk.h"
</ins><span class="cx"> #include "GtkVersioning.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> WebKitWebView* webView = webkit_web_frame_get_web_view(kit(&frame));
</span><span class="cx"> RefPtr<DataObjectGtk> dataObject = clipboard.pasteboard().dataObject();
</span><span class="cx"> GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::defaultPasteboardHelper()->targetListForDataObject(dataObject.get()));
</span><del>- GOwnPtr<GdkEvent> currentEvent(gtk_get_current_event());
</del><ins>+ GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</ins><span class="cx">
</span><span class="cx"> GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(m_webView), targetList.get(), dragOperationToGdkDragActions(clipboard.sourceOperation()), 1, currentEvent.get());
</span><span class="cx"> webView->priv->dragAndDropHelper.startedDrag(context, dataObject.get());
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportDumpRenderTreeSupportGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(value);
</span><del>- GOwnPtr<gchar> valueBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> valueBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(value, valueBuffer.get(), bufferSize);
</span><span class="cx"> inputElement->setValueForUser(String::fromUTF8(valueBuffer.get()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportEditorClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "TextCheckerClient.h"
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SPELLCHECK)
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportFrameLoaderClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><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"> #include <wtf/text/StringConcatenate.h>
</span><span class="cx">
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx"> String FrameLoaderClient::userAgent(const URL& url)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebSettings* settings = webkit_web_view_get_settings(getViewFromFrame(m_frame));
</span><del>- GOwnPtr<gchar> userAgentString(webkitWebSettingsUserAgentForURI(settings, url.string().utf8().data()));
</del><ins>+ GUniquePtr<gchar> userAgentString(webkitWebSettingsUserAgentForURI(settings, url.string().utf8().data()));
</ins><span class="cx"> return String::fromUTF8(userAgentString.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -204,7 +205,7 @@
</span><span class="cx"> if (DumpRenderTreeSupportGtk::dumpRenderTreeModeEnabled()) {
</span><span class="cx"> CString username;
</span><span class="cx"> CString password;
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx"> WebKitWebResource* webResource = webkit_web_view_get_resource(view, identifierString.get());
</span><span class="cx"> if (!DumpRenderTreeSupportGtk::s_authenticationCallback || !DumpRenderTreeSupportGtk::s_authenticationCallback(username, password, webResource)) {
</span><span class="cx"> challenge.authenticationClient()->receivedRequestToContinueWithoutCredential(challenge);
</span><span class="lines">@@ -244,7 +245,7 @@
</span><span class="cx"> networkResponse = adoptGRef(kitNew(redirectResponse));
</span><span class="cx">
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx"> WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
</span><span class="cx"> GRefPtr<WebKitNetworkRequest> networkRequest(adoptGRef(kitNew(request)));
</span><span class="cx">
</span><span class="lines">@@ -270,7 +271,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoaderClient::assignIdentifierToInitialRequest(unsigned long identifier, WebCore::DocumentLoader* loader, const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx">
</span><span class="cx"> WebKitWebResource* webResource = WEBKIT_WEB_RESOURCE(g_object_new(WEBKIT_TYPE_WEB_RESOURCE, "uri", request.url().string().utf8().data(), 0));
</span><span class="cx">
</span><span class="lines">@@ -300,7 +301,7 @@
</span><span class="cx"> m_response = response;
</span><span class="cx">
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx"> WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
</span><span class="cx"> GRefPtr<WebKitNetworkResponse> networkResponse(adoptGRef(kitNew(response)));
</span><span class="cx">
</span><span class="lines">@@ -942,7 +943,7 @@
</span><span class="cx"> void FrameLoaderClient::dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength)
</span><span class="cx"> {
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx"> WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
</span><span class="cx">
</span><span class="cx"> g_signal_emit_by_name(webResource, "content-length-received", dataLength);
</span><span class="lines">@@ -955,7 +956,7 @@
</span><span class="cx"> static_cast<WebKit::DocumentLoader*>(loader)->decreaseLoadCount(identifier);
</span><span class="cx">
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx"> WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
</span><span class="cx">
</span><span class="cx"> // A NULL WebResource means the load has been interrupted, and
</span><span class="lines">@@ -988,7 +989,7 @@
</span><span class="cx"> static_cast<WebKit::DocumentLoader*>(loader)->decreaseLoadCount(identifier);
</span><span class="cx">
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><del>- GOwnPtr<gchar> identifierString(toString(identifier));
</del><ins>+ GUniquePtr<gchar> identifierString(toString(identifier));
</ins><span class="cx"> WebKitWebResource* webResource = webkit_web_view_get_resource(webView, identifierString.get());
</span><span class="cx">
</span><span class="cx"> // A NULL WebResource means the load has been interrupted, and
</span><span class="lines">@@ -996,9 +997,8 @@
</span><span class="cx"> if (!webResource)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<GError> webError(g_error_new_literal(g_quark_from_string(error.domain().utf8().data()),
- error.errorCode(),
- error.localizedDescription().utf8().data()));
</del><ins>+ GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(error.domain().utf8().data()),
+ error.errorCode(), error.localizedDescription().utf8().data()));
</ins><span class="cx">
</span><span class="cx"> g_signal_emit_by_name(webResource, "load-failed", webError.get());
</span><span class="cx"> g_signal_emit_by_name(m_frame, "resource-load-failed", webResource, webError.get());
</span><span class="lines">@@ -1026,7 +1026,7 @@
</span><span class="cx"> notifyStatus(m_frame, WEBKIT_LOAD_FAILED);
</span><span class="cx">
</span><span class="cx"> WebKitWebView* webView = getViewFromFrame(m_frame);
</span><del>- GOwnPtr<GError> webError(g_error_new_literal(
</del><ins>+ GUniquePtr<GError> webError(g_error_new_literal(
</ins><span class="cx"> g_quark_from_string(error.domain().utf8().data()),
</span><span class="cx"> error.errorCode(),
</span><span class="cx"> error.localizedDescription().utf8().data()));
</span><span class="lines">@@ -1039,7 +1039,7 @@
</span><span class="cx"> m_loadingErrorPage = true;
</span><span class="cx">
</span><span class="cx"> String content;
</span><del>- GOwnPtr<gchar> errorPath(g_build_filename(sharedResourcesPath().data(), "resources", "error.html", NULL));
</del><ins>+ GUniquePtr<gchar> errorPath(g_build_filename(sharedResourcesPath().data(), "resources", "error.html", NULL));
</ins><span class="cx"> GRefPtr<GFile> errorFile = adoptGRef(g_file_new_for_path(errorPath.get()));
</span><span class="cx">
</span><span class="cx"> if (!errorFile)
</span></span></pre></div>
<a id="trunkSourceWebKitgtkWebCoreSupportInspectorClientGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/InspectorClientGtk.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include "webkitwebinspector.h"
</span><span class="cx"> #include "webkitwebview.h"
</span><span class="cx"> #include <wtf/Forward.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"> namespace WebCore {
</span><span class="cx"> class Page;
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> WebKitWebView* m_inspectedWebView;
</span><span class="cx"> WebCore::Page* m_frontendPage;
</span><span class="cx"> InspectorFrontendClient* m_frontendClient;
</span><del>- GOwnPtr<gchar> m_inspectorFilesPath;
</del><ins>+ GUniquePtr<gchar> m_inspectorFilesPath;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class InspectorFrontendClient : public WebCore::InspectorFrontendClientLocal {
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitfavicondatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitfavicondatabase.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include "webkitwebframe.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <wtf/MainThread.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"> /**
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> typedef HashMap<String, PendingIconRequestVector*> PendingIconRequestMap;
</span><span class="cx">
</span><span class="cx"> struct _WebKitFaviconDatabasePrivate {
</span><del>- GOwnPtr<gchar> path;
</del><ins>+ GUniquePtr<gchar> path;
</ins><span class="cx"> IconDatabaseClientGtk iconDatabaseClient;
</span><span class="cx"> PendingIconRequestMap pendingIconRequests;
</span><span class="cx"> bool importFinished;
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> database->priv->importFinished = false;
</span><span class="cx"> if (!path || !path[0]) {
</span><del>- database->priv->path.set(0);
</del><ins>+ database->priv->path.reset();
</ins><span class="cx"> iconDatabase().setEnabled(false);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- database->priv->path.set(g_strdup(path));
</del><ins>+ database->priv->path.reset(g_strdup(path));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitfilechooserrequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitfilechooserrequest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitfilechooserrequest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitfilechooserrequest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "webkitfilechooserrequestprivate.h"
</span><span class="cx"> #include "webkitglobalsprivate.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></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitglobalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> #include <runtime/InitializeThreading.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx"> #include <wtf/MainThread.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"> static WebKitCacheModel cacheModel = WEBKIT_CACHE_MODEL_DEFAULT;
</span><span class="cx">
</span><span class="lines">@@ -550,15 +550,15 @@
</span><span class="cx"> // that may only be done by the main thread.
</span><span class="cx"> atomicCanonicalTextEncodingName("UTF-8");
</span><span class="cx">
</span><del>- GOwnPtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL));
</del><ins>+ GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL));
</ins><span class="cx"> webkit_set_web_database_directory_path(databaseDirectory.get());
</span><span class="cx">
</span><del>- GOwnPtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", NULL));
</del><ins>+ GUniquePtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", NULL));
</ins><span class="cx"> WebCore::cacheStorage().setCacheDirectory(cacheDirectory.get());
</span><span class="cx">
</span><span class="cx"> PageGroup::setShouldTrackVisitedLinks(true);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
</del><ins>+ GUniquePtr<gchar> iconDatabasePath(g_build_filename(g_get_user_data_dir(), "webkit", "icondatabase", NULL));
</ins><span class="cx"> webkit_icon_database_set_path(webkit_get_icon_database(), iconDatabasePath.get());
</span><span class="cx">
</span><span class="cx"> WebCore::ResourceHandle::setIgnoreSSLErrors(true);
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkithittestresultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkithittestresult.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> #include "webkitglobals.h"
</span><span class="cx"> #include "webkitglobalsprivate.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><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -283,26 +283,26 @@
</span><span class="cx"> WebKitHitTestResult* kit(const WebCore::HitTestResult& result)
</span><span class="cx"> {
</span><span class="cx"> guint context = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT;
</span><del>- GOwnPtr<char> linkURI(0);
- GOwnPtr<char> imageURI(0);
- GOwnPtr<char> mediaURI(0);
</del><ins>+ GUniquePtr<char> linkURI;
+ GUniquePtr<char> imageURI;
+ GUniquePtr<char> mediaURI;
</ins><span class="cx"> WebKitDOMNode* node = 0;
</span><span class="cx"> WebCore::Frame* innerNodeFrame;
</span><span class="cx"> WebCore::IntPoint point;
</span><span class="cx">
</span><span class="cx"> if (!result.absoluteLinkURL().isEmpty()) {
</span><span class="cx"> context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK;
</span><del>- linkURI.set(g_strdup(result.absoluteLinkURL().string().utf8().data()));
</del><ins>+ linkURI.reset(g_strdup(result.absoluteLinkURL().string().utf8().data()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!result.absoluteImageURL().isEmpty()) {
</span><span class="cx"> context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE;
</span><del>- imageURI.set(g_strdup(result.absoluteImageURL().string().utf8().data()));
</del><ins>+ imageURI.reset(g_strdup(result.absoluteImageURL().string().utf8().data()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!result.absoluteMediaURL().isEmpty()) {
</span><span class="cx"> context |= WEBKIT_HIT_TEST_RESULT_CONTEXT_MEDIA;
</span><del>- mediaURI.set(g_strdup(result.absoluteMediaURL().string().utf8().data()));
</del><ins>+ mediaURI.reset(g_strdup(result.absoluteMediaURL().string().utf8().data()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (result.isSelected())
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkiticondatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkiticondatabase.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "webkitsecurityoriginprivate.h"
</span><span class="cx"> #include "webkitwebframe.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"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> G_DEFINE_TYPE(WebKitIconDatabase, webkit_icon_database, G_TYPE_OBJECT);
</span><span class="cx">
</span><span class="cx"> struct _WebKitIconDatabasePrivate {
</span><del>- GOwnPtr<gchar> path;
</del><ins>+ GUniquePtr<gchar> path;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void webkit_icon_database_finalize(GObject* object)
</span><span class="lines">@@ -234,12 +234,12 @@
</span><span class="cx"> WebCore::iconDatabase().close();
</span><span class="cx">
</span><span class="cx"> if (!(path && path[0])) {
</span><del>- database->priv->path.set(0);
</del><ins>+ database->priv->path.reset();
</ins><span class="cx"> WebCore::iconDatabase().setEnabled(false);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- database->priv->path.set(g_strdup(path));
</del><ins>+ database->priv->path.reset(g_strdup(path));
</ins><span class="cx">
</span><span class="cx"> WebCore::iconDatabase().setEnabled(true);
</span><span class="cx"> WebCore::iconDatabase().open(WebCore::filenameToString(database->priv->path.get()), WebCore::IconDatabase::defaultDatabaseFilename());
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitspellcheckerenchantcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitspellcheckerenchant.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> #include "webkitspellchecker.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/OwnPtr.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="trunkSourceWebKitgtkwebkitwebkitwebplugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebplugin.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,6 +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><ins>+#include <wtf/gobject/GOwnPtr.h>
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * SECTION:webkitwebplugin
</span><span class="lines">@@ -192,14 +193,14 @@
</span><span class="cx"> return priv->path.get();
</span><span class="cx">
</span><span class="cx"> GOwnPtr<GError> error;
</span><del>- priv->path.set(g_filename_from_utf8(priv->corePlugin->path().utf8().data(), -1, 0, 0, &error.outPtr()));
</del><ins>+ priv->path.reset(g_filename_from_utf8(priv->corePlugin->path().utf8().data(), -1, 0, 0, &error.outPtr()));
</ins><span class="cx">
</span><span class="cx"> if (!error)
</span><span class="cx"> return priv->path.get();
</span><span class="cx">
</span><span class="cx"> // In the unlikely case the convertion fails, report the error and make sure we free
</span><span class="cx"> // any partial convertion that ended up in the variable.
</span><del>- priv->path.clear();
</del><ins>+ priv->path.reset();
</ins><span class="cx">
</span><span class="cx"> g_warning("Failed to convert '%s' to system filename encoding: %s", priv->corePlugin->path().utf8().data(), error->message);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebpluginprivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebpluginprivate.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebpluginprivate.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebpluginprivate.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> #include "webkitwebplugin.h"
</span><span class="cx"> #include <glib-object.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"> namespace WebCore {
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> RefPtr<WebCore::PluginPackage> corePlugin;
</span><span class="cx"> CString name;
</span><span class="cx"> CString description;
</span><del>- GOwnPtr<char> path;
</del><ins>+ GUniquePtr<char> path;
</ins><span class="cx"> GSList* mimeTypes;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebsettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebsettings.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "webkitglobalsprivate.h"
</span><span class="cx"> #include "webkitversion.h"
</span><span class="cx"> #include "webkitwebsettingsprivate.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"> #include <wtf/text/StringConcatenate.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Since: 1.5.2
</span><span class="cx"> */
</span><del>- GOwnPtr<gchar> localStoragePath(g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL));
</del><ins>+ GUniquePtr<gchar> localStoragePath(g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL));
</ins><span class="cx"> g_object_class_install_property(gobject_class,
</span><span class="cx"> PROP_HTML5_LOCAL_STORAGE_DATABASE_PATH,
</span><span class="cx"> g_param_spec_string("html5-local-storage-database-path",
</span><span class="lines">@@ -1480,9 +1480,9 @@
</span><span class="cx"> WebKitWebSettings* webkit_web_settings_copy(WebKitWebSettings* original)
</span><span class="cx"> {
</span><span class="cx"> unsigned numberOfProperties = 0;
</span><del>- GOwnPtr<GParamSpec*> properties(g_object_class_list_properties(
</del><ins>+ GUniquePtr<GParamSpec*> properties(g_object_class_list_properties(
</ins><span class="cx"> G_OBJECT_CLASS(WEBKIT_WEB_SETTINGS_GET_CLASS(original)), &numberOfProperties));
</span><del>- GOwnPtr<GParameter> parameters(g_new0(GParameter, numberOfProperties));
</del><ins>+ GUniquePtr<GParameter> parameters(g_new0(GParameter, numberOfProperties));
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < numberOfProperties; i++) {
</span><span class="cx"> GParamSpec* property = properties.get()[i];
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> #include "FrameLoaderClientGtk.h"
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><span class="cx"> #include "FrameView.h"
</span><del>-#include "GOwnPtrGtk.h"
</del><ins>+#include "GUniquePtrGtk.h"
</ins><span class="cx"> #include "GeolocationClientGtk.h"
</span><span class="cx"> #include "GeolocationController.h"
</span><span class="cx"> #include "GraphicsContext.h"
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> g_signal_emit(webView, webkit_web_view_signals[POPULATE_POPUP], 0, defaultMenu);
</span><span class="cx">
</span><span class="cx"> // If the context menu is now empty, don't show it.
</span><del>- GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(defaultMenu)));
</del><ins>+ GUniquePtr<GList> items(gtk_container_get_children(GTK_CONTAINER(defaultMenu)));
</ins><span class="cx"> if (!items)
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><span class="lines">@@ -1304,7 +1304,7 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitFileChooserRequest> adoptedRequest = adoptGRef(request);
</span><span class="cx"> if (responseID == GTK_RESPONSE_ACCEPT) {
</span><del>- GOwnPtr<GSList> filesList(gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)));
</del><ins>+ GUniquePtr<GSList> filesList(gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)));
</ins><span class="cx"> GRefPtr<GPtrArray> filesArray = adoptGRef(g_ptr_array_new());
</span><span class="cx"> for (GSList* file = filesList.get(); file; file = g_slist_next(file))
</span><span class="cx"> g_ptr_array_add(filesArray.get(), file->data);
</span><span class="lines">@@ -1514,7 +1514,7 @@
</span><span class="cx"> Frame& frame = core(webView)->focusController().focusedOrMainFrame();
</span><span class="cx">
</span><span class="cx"> // Synthesize a button release event to send with the drag end action.
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(GDK_BUTTON_RELEASE));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(GDK_BUTTON_RELEASE));
</ins><span class="cx"> int x, y, xRoot, yRoot;
</span><span class="cx"> GdkModifierType modifiers = static_cast<GdkModifierType>(0);
</span><span class="cx"> #ifdef GTK_API_VERSION_2
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitwebviewprivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit/gtk/webkit/webkitwebviewprivate.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> #include "WebViewInputMethodFilter.h"
</span><span class="cx"> #include "WidgetBackingStore.h"
</span><span class="cx"> #include <webkit/webkitwebview.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_STREAM)
</span><span class="cx"> #include "UserMediaClientGtk.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -1,3 +1,84 @@
</span><ins>+2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Use GUniquePtr instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127431
+
+ Reviewed by Martin Robinson.
+
+ GUniquePtr is a template alias of std::unique_ptr with a custom
+ deleter that replaces GOwnPtr. GOwnPtr is still used for the cases
+ where the output pointer is needed, but it will also be replaced soon.
+
+ * Shared/Downloads/soup/DownloadSoup.cpp:
+ (WebKit::DownloadClient::didReceiveResponse):
+ * Shared/NativeWebKeyboardEvent.h:
+ * Shared/NativeWebMouseEvent.h:
+ * Shared/NativeWebWheelEvent.h:
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ (IPC::encodeGKeyFile):
+ (IPC::decodeGKeyFile):
+ (IPC::encode):
+ (IPC::decode):
+ * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+ (webkitContextMenuItemSetSubMenuFromGtkMenu):
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ (webkitDownloadDecideDestination):
+ (webkitDownloadNotifyProgress):
+ (webkitDownloadFailed):
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ (webkit_file_chooser_request_select_files):
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ (didReceiveWebViewMessageFromInjectedBundle):
+ (getInjectedBundleInitializationUserData):
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ (didFailProvisionalLoadWithErrorForFrame):
+ (didFailLoadWithErrorForFrame):
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ (drawPagesForPrintingCompleted):
+ * UIProcess/API/gtk/WebKitURIRequest.cpp:
+ (webkit_uri_request_get_http_headers):
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ (webkit_uri_scheme_request_get_scheme):
+ (webkit_uri_scheme_request_get_path):
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (injectedBundleFilename):
+ (webkit_web_context_set_favicon_database_directory):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkitWebViewLoadFail):
+ (webkitWebViewCreateJavaScriptDialog):
+ (fileChooserDialogResponseCallback):
+ (webkitWebViewLoadChanged):
+ (webkitWebViewLoadFailedWithTLSErrors):
+ (webkitWebViewPopulateContextMenu):
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseButtonPressEvent):
+ (webkitWebViewBaseStartDrag):
+ * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
+ (WebKit::WebInspectorServer::platformResourceForPath):
+ * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
+ (WebKit::connectionCallback):
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformDefaultApplicationCacheDirectory):
+ (WebKit::WebContext::platformDefaultDatabaseDirectory):
+ (WebKit::WebContext::platformDefaultIconDatabasePath):
+ (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+ (WebKit::WebContext::platformDefaultDiskCacheDirectory):
+ * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+ (WebKit::contextMenuItemVisibilityChanged):
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformInspectedURLChanged):
+ * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+ (WebKit::WebPopupMenuProxyGtk::createGtkActionForMenuItem):
+ * WebProcess/WebPage/gtk/WebInspectorGtk.cpp:
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+ (WebKit::WebPage::platformInitialize):
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
+ * WebProcess/gtk/WebProcessMainGtk.cpp:
+ * WebProcess/soup/WebSoupRequestManager.cpp:
+ (WebKit::WebSoupRequestManager::send):
+
</ins><span class="cx"> 2014-01-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Surround fixedVisibleContentRect code with USE(TILED_BACKING_STORE)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><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"> #if PLATFORM(GTK)
</span><span class="lines">@@ -94,7 +95,7 @@
</span><span class="cx"> m_destinationURI = m_download->decideDestinationWithSuggestedFilename(suggestedFilename, overwrite);
</span><span class="cx"> if (m_destinationURI.isEmpty()) {
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- GOwnPtr<char> buffer(g_strdup_printf(_("Cannot determine destination URI for download with suggested filename %s"), suggestedFilename.utf8().data()));
</del><ins>+ GUniquePtr<char> buffer(g_strdup_printf(_("Cannot determine destination URI for download with suggested filename %s"), suggestedFilename.utf8().data()));
</ins><span class="cx"> String errorMessage = String::fromUTF8(buffer.get());
</span><span class="cx"> #else
</span><span class="cx"> String errorMessage = makeString("Cannot determine destination URI for download with suggested filename ", suggestedFilename);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebKeyboardEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/Shared/NativeWebKeyboardEvent.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSView;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-#include <GOwnPtrGtk.h>
</del><span class="cx"> #include <WebCore/CompositionResults.h>
</span><ins>+#include <WebCore/GUniquePtrGtk.h>
</ins><span class="cx"> #include <WebCore/GtkInputMethodFilter.h>
</span><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> RetainPtr<NSEvent> m_nativeEvent;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>- GOwnPtr<GdkEvent> m_nativeEvent;
</del><ins>+ GUniquePtr<GdkEvent> m_nativeEvent;
</ins><span class="cx"> WebCore::CompositionResults m_compositionResults;
</span><span class="cx"> bool m_fakeEventForComposition;
</span><span class="cx"> #elif PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebMouseEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/Shared/NativeWebMouseEvent.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSView;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-#include <GOwnPtrGtk.h>
</del><ins>+#include <WebCore/GUniquePtrGtk.h>
</ins><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> #include <Evas.h>
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> RetainPtr<NSEvent> m_nativeEvent;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>- GOwnPtr<GdkEvent> m_nativeEvent;
</del><ins>+ GUniquePtr<GdkEvent> m_nativeEvent;
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> const void* m_nativeEvent;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNativeWebWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/Shared/NativeWebWheelEvent.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> OBJC_CLASS NSView;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-#include <GOwnPtrGtk.h>
</del><ins>+#include <WebCore/GUniquePtrGtk.h>
</ins><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> #include <Evas.h>
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> RetainPtr<NSEvent> m_nativeEvent;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>- GOwnPtr<GdkEvent> m_nativeEvent;
</del><ins>+ GUniquePtr<GdkEvent> m_nativeEvent;
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> const Evas_Event_Mouse_Wheel* m_nativeEvent;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <WebCore/GraphicsContext.h>
</span><span class="cx"> #include <WebCore/GtkVersioning.h>
</span><span class="cx"> #include <WebCore/PlatformContextCairo.h>
</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"> using namespace WebKit;
</span><span class="lines">@@ -237,11 +237,11 @@
</span><span class="cx"> static void encodeGKeyFile(ArgumentEncoder& encoder, GKeyFile* keyFile)
</span><span class="cx"> {
</span><span class="cx"> gsize dataSize;
</span><del>- GOwnPtr<char> data(g_key_file_to_data(keyFile, &dataSize, 0));
</del><ins>+ GUniquePtr<char> data(g_key_file_to_data(keyFile, &dataSize, 0));
</ins><span class="cx"> encoder << DataReference(reinterpret_cast<uint8_t*>(data.get()), dataSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool decodeGKeyFile(ArgumentDecoder& decoder, GOwnPtr<GKeyFile>& keyFile)
</del><ins>+static bool decodeGKeyFile(ArgumentDecoder& decoder, GUniquePtr<GKeyFile>& keyFile)
</ins><span class="cx"> {
</span><span class="cx"> DataReference dataReference;
</span><span class="cx"> if (!decoder.decode(dataReference))
</span><span class="lines">@@ -250,9 +250,9 @@
</span><span class="cx"> if (!dataReference.size())
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- keyFile.set(g_key_file_new());
</del><ins>+ keyFile.reset(g_key_file_new());
</ins><span class="cx"> if (!g_key_file_load_from_data(keyFile.get(), reinterpret_cast<const gchar*>(dataReference.data()), dataReference.size(), G_KEY_FILE_NONE, 0)) {
</span><del>- keyFile.clear();
</del><ins>+ keyFile.reset();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -261,14 +261,14 @@
</span><span class="cx">
</span><span class="cx"> void encode(ArgumentEncoder& encoder, GtkPrintSettings* printSettings)
</span><span class="cx"> {
</span><del>- GOwnPtr<GKeyFile> keyFile(g_key_file_new());
</del><ins>+ GUniquePtr<GKeyFile> keyFile(g_key_file_new());
</ins><span class="cx"> gtk_print_settings_to_key_file(printSettings, keyFile.get(), "Print Settings");
</span><span class="cx"> encodeGKeyFile(encoder, keyFile.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPrintSettings>& printSettings)
</span><span class="cx"> {
</span><del>- GOwnPtr<GKeyFile> keyFile;
</del><ins>+ GUniquePtr<GKeyFile> keyFile;
</ins><span class="cx"> if (!decodeGKeyFile(decoder, keyFile))
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -284,14 +284,14 @@
</span><span class="cx">
</span><span class="cx"> void encode(ArgumentEncoder& encoder, GtkPageSetup* pageSetup)
</span><span class="cx"> {
</span><del>- GOwnPtr<GKeyFile> keyFile(g_key_file_new());
</del><ins>+ GUniquePtr<GKeyFile> keyFile(g_key_file_new());
</ins><span class="cx"> gtk_page_setup_to_key_file(pageSetup, keyFile.get(), "Page Setup");
</span><span class="cx"> encodeGKeyFile(encoder, keyFile.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool decode(ArgumentDecoder& decoder, GRefPtr<GtkPageSetup>& pageSetup)
</span><span class="cx"> {
</span><del>- GOwnPtr<GKeyFile> keyFile;
</del><ins>+ GUniquePtr<GKeyFile> keyFile;
</ins><span class="cx"> if (!decodeGKeyFile(decoder, keyFile))
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/OwnPtr.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><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> if (!subMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<GList> children(gtk_container_get_children(GTK_CONTAINER(subMenu)));
</del><ins>+ GUniquePtr<GList> children(gtk_container_get_children(GTK_CONTAINER(subMenu)));
</ins><span class="cx"> if (!g_list_length(children.get()))
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> #include <WebCore/ErrorsGtk.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.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><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> CString destinationURI;
</span><span class="cx"> guint64 currentSize;
</span><span class="cx"> bool isCancelled;
</span><del>- GOwnPtr<GTimer> timer;
</del><ins>+ GUniquePtr<GTimer> timer;
</ins><span class="cx"> gdouble lastProgress;
</span><span class="cx"> gdouble lastElapsed;
</span><span class="cx"> };
</span><span class="lines">@@ -113,14 +113,14 @@
</span><span class="cx"> if (!download->priv->destinationURI.isNull())
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- GOwnPtr<char> filename(g_strdelimit(g_strdup(suggestedFilename), G_DIR_SEPARATOR_S, '_'));
</del><ins>+ GUniquePtr<char> filename(g_strdelimit(g_strdup(suggestedFilename), G_DIR_SEPARATOR_S, '_'));
</ins><span class="cx"> const gchar *downloadsDir = g_get_user_special_dir(G_USER_DIRECTORY_DOWNLOAD);
</span><span class="cx"> if (!downloadsDir) {
</span><span class="cx"> // If we don't have XDG user dirs info, set just to HOME.
</span><span class="cx"> downloadsDir = g_get_home_dir();
</span><span class="cx"> }
</span><del>- GOwnPtr<char> destination(g_build_filename(downloadsDir, filename.get(), NULL));
- GOwnPtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
</del><ins>+ GUniquePtr<char> destination(g_build_filename(downloadsDir, filename.get(), NULL));
+ GUniquePtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
</ins><span class="cx"> download->priv->destinationURI = destinationURI.get();
</span><span class="cx"> g_object_notify(G_OBJECT(download), "destination");
</span><span class="cx"> return TRUE;
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!download->priv->timer)
</span><del>- download->priv->timer.set(g_timer_new());
</del><ins>+ download->priv->timer.reset(g_timer_new());
</ins><span class="cx">
</span><span class="cx"> priv->currentSize += bytesReceived;
</span><span class="cx"> g_signal_emit(download, signals[RECEIVED_DATA], 0, bytesReceived);
</span><span class="lines">@@ -339,9 +339,8 @@
</span><span class="cx">
</span><span class="cx"> void webkitDownloadFailed(WebKitDownload* download, const ResourceError& resourceError)
</span><span class="cx"> {
</span><del>- GOwnPtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- resourceError.errorCode(),
- resourceError.localizedDescription().utf8().data()));
</del><ins>+ GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
+ resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> if (download->priv->timer)
</span><span class="cx"> g_timer_stop(download->priv->timer.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "WebOpenPanelResultListenerProxy.h"
</span><span class="cx"> #include <WebCore/FileSystem.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><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">@@ -306,7 +306,7 @@
</span><span class="cx"> // Make sure the file path is presented as an URI (escaped
</span><span class="cx"> // string, with the 'file://' prefix) to WebCore otherwise the
</span><span class="cx"> // FileChooser won't actually choose it.
</span><del>- GOwnPtr<char> uri(g_file_get_uri(filename.get()));
</del><ins>+ GUniquePtr<char> uri(g_file_get_uri(filename.get()));
</ins><span class="cx"> choosenFiles.append(API::URL::create(String::fromUTF8(uri.get())));
</span><span class="cx">
</span><span class="cx"> // Do not use the URI here because this won't reach WebCore.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><span class="cx"> #include "WebKitWebResourcePrivate.h"
</span><span class="cx"> #include "WebKitWebViewPrivate.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> API::Error* webError = static_cast<API::Error*>(message.get(String::fromUTF8("Error")));
</span><span class="cx"> const ResourceError& platformError = webError->platformError();
</span><del>- GOwnPtr<GError> resourceError(g_error_new_literal(g_quark_from_string(platformError.domain().utf8().data()),
</del><ins>+ GUniquePtr<GError> resourceError(g_error_new_literal(g_quark_from_string(platformError.domain().utf8().data()),
</ins><span class="cx"> platformError.errorCode(), platformError.localizedDescription().utf8().data()));
</span><span class="cx">
</span><span class="cx"> webkitWebResourceFailed(resource.get(), resourceError.get());
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> static WKTypeRef getInjectedBundleInitializationUserData(WKContextRef, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<GVariant> data = webkitWebContextInitializeWebExtensions(WEBKIT_WEB_CONTEXT(clientInfo));
</span><del>- GOwnPtr<gchar> dataString(g_variant_print(data.get(), TRUE));
</del><ins>+ GUniquePtr<gchar> dataString(g_variant_print(data.get(), TRUE));
</ins><span class="cx"> return static_cast<WKTypeRef>(WKStringCreateWithUTF8CString(dataString.get()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><span class="cx"> #include "WebKitWebViewBasePrivate.h"
</span><span class="cx"> #include "WebKitWebViewPrivate.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"> using namespace WebKit;
</span><span class="lines">@@ -53,9 +53,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const ResourceError& resourceError = toImpl(error)->platformError();
</span><del>- GOwnPtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- resourceError.errorCode(),
- resourceError.localizedDescription().utf8().data()));
</del><ins>+ GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
+ resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> if (resourceError.tlsErrors()) {
</span><span class="cx"> webkitWebViewLoadFailedWithTLSErrors(WEBKIT_WEB_VIEW(clientInfo), resourceError.failingURL().utf8().data(), webError.get(),
</span><span class="cx"> static_cast<GTlsCertificateFlags>(resourceError.tlsErrors()), resourceError.certificate());
</span><span class="lines">@@ -85,9 +84,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> const ResourceError& resourceError = toImpl(error)->platformError();
</span><del>- GOwnPtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- resourceError.errorCode(),
- resourceError.localizedDescription().utf8().data()));
</del><ins>+ GUniquePtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
+ resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> webkitWebViewLoadFailed(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_COMMITTED,
</span><span class="cx"> resourceError.failingURL().utf8().data(), webError.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/NotImplemented.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><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #ifdef HAVE_GTK_UNIX_PRINTING
</span><span class="lines">@@ -264,9 +264,8 @@
</span><span class="cx">
</span><span class="cx"> const WebCore::ResourceError& resourceError = wkPrintError ? toImpl(wkPrintError)->platformError() : WebCore::ResourceError();
</span><span class="cx"> if (!resourceError.isNull()) {
</span><del>- GOwnPtr<GError> printError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- resourceError.errorCode(),
- resourceError.localizedDescription().utf8().data()));
</del><ins>+ GUniquePtr<GError> printError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
+ resourceError.errorCode(), resourceError.localizedDescription().utf8().data()));
</ins><span class="cx"> g_signal_emit(printOperation.get(), signals[FAILED], 0, printError.get());
</span><span class="cx"> }
</span><span class="cx"> g_signal_emit(printOperation.get(), signals[FINISHED], 0, NULL);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURIRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURIRequest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><del>-#include <WebCore/GOwnPtrSoup.h>
</del><ins>+#include <WebCore/GUniquePtrSoup.h>
</ins><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> struct _WebKitURIRequestPrivate {
</span><span class="cx"> WebCore::ResourceRequest resourceRequest;
</span><span class="cx"> CString uri;
</span><del>- GOwnPtr<SoupMessageHeaders> httpHeaders;
</del><ins>+ GUniquePtr<SoupMessageHeaders> httpHeaders;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitURIRequest, webkit_uri_request, G_TYPE_OBJECT)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> if (!request->priv->resourceRequest.url().protocolIsInHTTPFamily())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- request->priv->httpHeaders.set(soup_message_headers_new(SOUP_MESSAGE_HEADERS_REQUEST));
</del><ins>+ request->priv->httpHeaders.reset(soup_message_headers_new(SOUP_MESSAGE_HEADERS_REQUEST));
</ins><span class="cx"> request->priv->resourceRequest.updateSoupMessageHeaders(request->priv->httpHeaders.get());
</span><span class="cx"> return request->priv->httpHeaders.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -26,9 +26,10 @@
</span><span class="cx"> #include "WebKitWebView.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebSoupRequestManagerProxy.h"
</span><del>-#include <WebCore/GOwnPtrSoup.h>
</del><ins>+#include <WebCore/GUniquePtrSoup.h>
</ins><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><ins>+#include <wtf/gobject/GOwnPtr.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">@@ -58,7 +59,7 @@
</span><span class="cx"> RefPtr<WebPageProxy> initiatingPage;
</span><span class="cx"> uint64_t requestID;
</span><span class="cx"> CString uri;
</span><del>- GOwnPtr<SoupURI> soupURI;
</del><ins>+ GUniquePtr<SoupURI> soupURI;
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GInputStream> stream;
</span><span class="cx"> uint64_t streamLength;
</span><span class="lines">@@ -109,7 +110,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_URI_SCHEME_REQUEST(request), 0);
</span><span class="cx">
</span><span class="cx"> if (!request->priv->soupURI)
</span><del>- request->priv->soupURI.set(soup_uri_new(request->priv->uri.data()));
</del><ins>+ request->priv->soupURI.reset(soup_uri_new(request->priv->uri.data()));
</ins><span class="cx"> return request->priv->soupURI->scheme;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -141,7 +142,7 @@
</span><span class="cx"> g_return_val_if_fail(WEBKIT_IS_URI_SCHEME_REQUEST(request), 0);
</span><span class="cx">
</span><span class="cx"> if (!request->priv->soupURI)
</span><del>- request->priv->soupURI.set(soup_uri_new(request->priv->uri.data()));
</del><ins>+ request->priv->soupURI.reset(soup_uri_new(request->priv->uri.data()));
</ins><span class="cx"> return request->priv->soupURI->path;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> #include <wtf/OwnPtr.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.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">@@ -216,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> static CString injectedBundleFilename()
</span><span class="cx"> {
</span><del>- GOwnPtr<char> bundleFilename(g_build_filename(injectedBundleDirectory().data(), "libwebkit2gtkinjectedbundle.so", NULL));
</del><ins>+ GUniquePtr<char> bundleFilename(g_build_filename(injectedBundleDirectory().data(), "libwebkit2gtkinjectedbundle.so", NULL));
</ins><span class="cx"> return bundleFilename.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -443,9 +443,8 @@
</span><span class="cx"> : directoryPath.utf8();
</span><span class="cx">
</span><span class="cx"> // Build the full path to the icon database file on disk.
</span><del>- GOwnPtr<gchar> faviconDatabasePath(g_build_filename(priv->faviconDatabaseDirectory.data(),
- WebCore::IconDatabase::defaultDatabaseFilename().utf8().data(),
- NULL));
</del><ins>+ GUniquePtr<gchar> faviconDatabasePath(g_build_filename(priv->faviconDatabaseDirectory.data(),
+ WebCore::IconDatabase::defaultDatabaseFilename().utf8().data(), nullptr));
</ins><span class="cx">
</span><span class="cx"> // Setting the path will cause the icon database to be opened.
</span><span class="cx"> priv->context->setIconDatabasePath(WebCore::filenameToString(faviconDatabasePath.get()));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -61,8 +61,8 @@
</span><span class="cx"> #include <JavaScriptCore/APICast.h>
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><span class="cx"> #include <WebCore/DragIcon.h>
</span><del>-#include <WebCore/GOwnPtrGtk.h>
-#include <WebCore/GOwnPtrSoup.h>
</del><ins>+#include <WebCore/GUniquePtrGtk.h>
+#include <WebCore/GUniquePtrSoup.h>
</ins><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><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> || g_error_matches(error, WEBKIT_PLUGIN_ERROR, WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD))
</span><span class="cx"> return FALSE;
</span><span class="cx">
</span><del>- GOwnPtr<char> htmlString(g_strdup_printf("<html><body>%s</body></html>", error->message));
</del><ins>+ GUniquePtr<char> htmlString(g_strdup_printf("<html><body>%s</body></html>", error->message));
</ins><span class="cx"> webkit_web_view_load_alternate_html(webView, htmlString.get(), failingURI, 0);
</span><span class="cx">
</span><span class="cx"> return TRUE;
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> GtkWidget* parent = gtk_widget_get_toplevel(GTK_WIDGET(webView));
</span><span class="cx"> GtkWidget* dialog = gtk_message_dialog_new(widgetIsOnscreenToplevelWindow(parent) ? GTK_WINDOW(parent) : 0,
</span><span class="cx"> GTK_DIALOG_DESTROY_WITH_PARENT, type, buttons, "%s", message);
</span><del>- GOwnPtr<char> title(g_strdup_printf("JavaScript - %s", webkit_web_view_get_uri(webView)));
</del><ins>+ GUniquePtr<char> title(g_strdup_printf("JavaScript - %s", webkit_web_view_get_uri(webView)));
</ins><span class="cx"> gtk_window_set_title(GTK_WINDOW(dialog), title.get());
</span><span class="cx"> gtk_dialog_set_default_response(GTK_DIALOG(dialog), defaultResponse);
</span><span class="cx">
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitFileChooserRequest> adoptedRequest = adoptGRef(request);
</span><span class="cx"> if (responseID == GTK_RESPONSE_ACCEPT) {
</span><del>- GOwnPtr<GSList> filesList(gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)));
</del><ins>+ GUniquePtr<GSList> filesList(gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog)));
</ins><span class="cx"> GRefPtr<GPtrArray> filesArray = adoptGRef(g_ptr_array_new());
</span><span class="cx"> for (GSList* file = filesList.get(); file; file = g_slist_next(file))
</span><span class="cx"> g_ptr_array_add(filesArray.get(), file->data);
</span><span class="lines">@@ -1517,7 +1517,7 @@
</span><span class="cx"> priv->waitingForMainResource = false;
</span><span class="cx"> } else if (loadEvent == WEBKIT_LOAD_COMMITTED) {
</span><span class="cx"> WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(priv->context);
</span><del>- GOwnPtr<char> faviconURI(webkit_favicon_database_get_favicon_uri(database, priv->activeURI.data()));
</del><ins>+ GUniquePtr<char> faviconURI(webkit_favicon_database_get_favicon_uri(database, priv->activeURI.data()));
</ins><span class="cx"> webkitWebViewUpdateFaviconURI(webView, faviconURI.get());
</span><span class="cx">
</span><span class="cx"> if (!priv->mainResource) {
</span><span class="lines">@@ -1552,7 +1552,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitTLSErrorsPolicy tlsErrorsPolicy = webkit_web_context_get_tls_errors_policy(webView->priv->context);
</span><span class="cx"> if (tlsErrorsPolicy == WEBKIT_TLS_ERRORS_POLICY_FAIL) {
</span><del>- GOwnPtr<SoupURI> soupURI(soup_uri_new(failingURI));
</del><ins>+ GUniquePtr<SoupURI> soupURI(soup_uri_new(failingURI));
</ins><span class="cx"> WebKitCertificateInfo info(certificate, tlsErrors);
</span><span class="cx"> gboolean returnValue;
</span><span class="cx"> g_signal_emit(webView, signals[LOAD_FAILED_WITH_TLS_ERRORS], 0, &info, soupURI->host, &returnValue);
</span><span class="lines">@@ -1815,7 +1815,7 @@
</span><span class="cx"> webkitWebViewCreateAndAppendInputMethodsMenuItem(webView, contextMenu.get());
</span><span class="cx">
</span><span class="cx"> GRefPtr<WebKitHitTestResult> hitTestResult = adoptGRef(webkitHitTestResultCreate(webHitTestResult));
</span><del>- GOwnPtr<GdkEvent> contextMenuEvent(webkitWebViewBaseTakeContextMenuEvent(webViewBase));
</del><ins>+ GUniquePtr<GdkEvent> contextMenuEvent(webkitWebViewBaseTakeContextMenuEvent(webViewBase));
</ins><span class="cx">
</span><span class="cx"> gboolean returnValue;
</span><span class="cx"> g_signal_emit(webView, signals[CONTEXT_MENU], 0, contextMenu.get(), contextMenuEvent.get(), hitTestResult.get(), &returnValue);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #include <WebCore/DataObjectGtk.h>
</span><span class="cx"> #include <WebCore/DragData.h>
</span><span class="cx"> #include <WebCore/DragIcon.h>
</span><del>-#include <WebCore/GOwnPtrGtk.h>
</del><ins>+#include <WebCore/GUniquePtrGtk.h>
</ins><span class="cx"> #include <WebCore/GtkClickCounter.h>
</span><span class="cx"> #include <WebCore/GtkDragAndDropHelper.h>
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> #include <gdk/gdkx.h>
</span><span class="cx"> #endif
</span><span class="cx"> #include <wtf/HashMap.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">@@ -108,7 +107,7 @@
</span><span class="cx"> GtkWidget* inspectorView;
</span><span class="cx"> AttachmentSide inspectorAttachmentSide;
</span><span class="cx"> unsigned inspectorViewSize;
</span><del>- GOwnPtr<GdkEvent> contextMenuEvent;
</del><ins>+ GUniquePtr<GdkEvent> contextMenuEvent;
</ins><span class="cx"> WebContextMenuProxyGtk* activeContextMenuProxy;
</span><span class="cx"> WebViewBaseInputMethodFilter inputMethodFilter;
</span><span class="cx">
</span><span class="lines">@@ -667,7 +666,7 @@
</span><span class="cx">
</span><span class="cx"> // If it's a right click event save it as a possible context menu event.
</span><span class="cx"> if (buttonEvent->button == 3)
</span><del>- priv->contextMenuEvent.set(gdk_event_copy(reinterpret_cast<GdkEvent*>(buttonEvent)));
</del><ins>+ priv->contextMenuEvent.reset(gdk_event_copy(reinterpret_cast<GdkEvent*>(buttonEvent)));
</ins><span class="cx"> priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(buttonEvent),
</span><span class="cx"> priv->clickCounter.clickCountForGdkButtonEvent(widget, buttonEvent)));
</span><span class="cx"> return TRUE;
</span><span class="lines">@@ -994,7 +993,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<DataObjectGtk> dataObject = adoptRef(dragData.platformData());
</span><span class="cx"> GRefPtr<GtkTargetList> targetList = adoptGRef(PasteboardHelper::defaultPasteboardHelper()->targetListForDataObject(dataObject.get()));
</span><del>- GOwnPtr<GdkEvent> currentEvent(gtk_get_current_event());
</del><ins>+ GUniquePtr<GdkEvent> currentEvent(gtk_get_current_event());
</ins><span class="cx"> GdkDragContext* context = gtk_drag_begin(GTK_WIDGET(webViewBase),
</span><span class="cx"> targetList.get(),
</span><span class="cx"> dragOperationToGdkDragActions(dragData.draggingSourceOperationMask()),
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/StringConcatenate.h>
</span><span class="lines">@@ -78,7 +79,7 @@
</span><span class="cx"> if (!g_input_stream_read_all(G_INPUT_STREAM(inputStream.get()), data.data(), data.size(), 0, 0, 0))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- contentType = GOwnPtr<gchar>(g_file_info_get_attribute_as_string(fileInfo.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE)).get();
</del><ins>+ contentType = GUniquePtr<gchar>(g_file_info_get_attribute_as_string(fileInfo.get(), G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE)).get();
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.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"> using namespace WebCore;
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> GRefPtr<GSocketAddress> socketAddress = adoptGRef(g_socket_connection_get_remote_address(connection, 0));
</span><del>- GOwnPtr<gchar> addressString(g_inet_address_to_string(g_inet_socket_address_get_address(G_INET_SOCKET_ADDRESS(socketAddress.get()))));
</del><ins>+ GUniquePtr<gchar> addressString(g_inet_address_to_string(g_inet_socket_address_get_address(G_INET_SOCKET_ADDRESS(socketAddress.get()))));
</ins><span class="cx"> LOG(InspectorServer, "New Connection from %s:%d.", addressString.get(), g_inet_socket_address_get_port(G_INET_SOCKET_ADDRESS(socketAddress.get())));
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><span class="cx">
</span><span class="cx"> #if OS(UNIX)
</span><span class="lines">@@ -95,7 +96,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> realExecutablePath = fileSystemRepresentation(executablePath);
</span><del>- GOwnPtr<gchar> socket(g_strdup_printf("%d", sockets[0]));
</del><ins>+ GUniquePtr<gchar> socket(g_strdup_printf("%d", sockets[0]));
</ins><span class="cx">
</span><span class="cx"> unsigned nargs = 4; // size of the argv array for g_spawn_async()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/SchemeRegistry.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"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> WTF::String WebContext::platformDefaultApplicationCacheDirectory() const
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", NULL));
</del><ins>+ GUniquePtr<gchar> cacheDirectory(g_build_filename(g_get_user_cache_dir(), "webkitgtk", "applications", nullptr));
</ins><span class="cx"> return WebCore::filenameToString(cacheDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -125,25 +125,25 @@
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultDatabaseDirectory() const
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "databases", NULL));
</del><ins>+ GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "databases", nullptr));
</ins><span class="cx"> return WebCore::filenameToString(databaseDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultIconDatabasePath() const
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "icondatabase", NULL));
</del><ins>+ GUniquePtr<gchar> databaseDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "icondatabase", nullptr));
</ins><span class="cx"> return WebCore::filenameToString(databaseDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultLocalStorageDirectory() const
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> storageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "localstorage", NULL));
</del><ins>+ GUniquePtr<gchar> storageDirectory(g_build_filename(g_get_user_data_dir(), "webkitgtk", "localstorage", nullptr));
</ins><span class="cx"> return WebCore::filenameToString(storageDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebContext::platformDefaultDiskCacheDirectory() const
</span><span class="cx"> {
</span><del>- GOwnPtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), NULL));
</del><ins>+ GUniquePtr<char> diskCacheDirectory(g_build_filename(g_get_user_cache_dir(), g_get_prgname(), nullptr));
</ins><span class="cx"> return WebCore::filenameToString(diskCacheDirectory.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebContextMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if (!menu)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ GUniquePtr<GList> items(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> bool previousVisibleItemIsNotASeparator = false;
</span><span class="cx"> GtkWidget* lastItemVisibleSeparator = 0;
</span><span class="cx"> for (GList* iter = items.get(); iter; iter = g_list_next(iter)) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <glib/gi18n-lib.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/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_inspectorWindow)
</span><span class="cx"> return;
</span><del>- GOwnPtr<gchar> title(g_strdup_printf("%s - %s", _("Web Inspector"), url.utf8().data()));
</del><ins>+ GUniquePtr<gchar> title(g_strdup_printf("%s - %s", _("Web Inspector"), url.utf8().data()));
</ins><span class="cx"> gtk_window_set_title(GTK_WINDOW(m_inspectorWindow), title.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "WebPopupItem.h"
</span><span class="cx"> #include <WebCore/GtkUtilities.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/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> GtkAction* WebPopupMenuProxyGtk::createGtkActionForMenuItem(const WebPopupItem& item, int itemIndex)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> actionName(g_strdup_printf("popup-menu-action-%d", itemIndex));
</del><ins>+ GUniquePtr<char> actionName(g_strdup_printf("popup-menu-action-%d", itemIndex));
</ins><span class="cx"> GtkAction* action = gtk_action_new(actionName.get(), item.m_text.utf8().data(), item.m_toolTip.utf8().data(), 0);
</span><span class="cx"> g_object_set_data(G_OBJECT(action), "popup-menu-action-index", GINT_TO_POINTER(itemIndex));
</span><span class="cx"> g_signal_connect(action, "activate", G_CALLBACK(menuItemActivated), this);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebInspectorGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebInspectorGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #include <WebCore/PasteboardHelper.h>
</span><span class="cx"> #include <WebCore/PlatformKeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Settings.h>
</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">@@ -55,7 +55,7 @@
</span><span class="cx"> // process to connect the two worlds through the accessibility
</span><span class="cx"> // object there specifically placed for that purpose (the socket).
</span><span class="cx"> m_accessibilityObject = adoptGRef(webPageAccessibilityObjectNew(this));
</span><del>- GOwnPtr<gchar> plugID(atk_plug_get_id(ATK_PLUG(m_accessibilityObject.get())));
</del><ins>+ GUniquePtr<gchar> plugID(atk_plug_get_id(ATK_PLUG(m_accessibilityObject.get())));
</ins><span class="cx"> send(Messages::WebPageProxy::BindAccessibilityTree(String(plugID.get())));
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef HAVE_GTK_UNIX_PRINTING
</span><span class="cx"> #include "PrinterListGtk.h"
</span><span class="lines">@@ -75,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> static int jobNumber = 0;
</span><span class="cx"> const char* applicationName = g_get_application_name();
</span><del>- GOwnPtr<char>jobName(g_strdup_printf("%s job #%d", applicationName ? applicationName : "WebKit", ++jobNumber));
</del><ins>+ GUniquePtr<char>jobName(g_strdup_printf("%s job #%d", applicationName ? applicationName : "WebKit", ++jobNumber));
</ins><span class="cx"> m_printJob = adoptGRef(gtk_print_job_new(jobName.get(), printer, m_printSettings.get(), m_pageSetup.get()));
</span><span class="cx">
</span><span class="cx"> GOwnPtr<GError> error;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebProcessMainGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebProcessMainGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <unistd.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><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebSoupRequestManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <WebCore/ResourceHandle.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.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"> namespace WebKit {
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitSoupRequestGeneric* request = WEBKIT_SOUP_REQUEST_GENERIC(g_task_get_source_object(task));
</span><span class="cx"> SoupRequest* soupRequest = SOUP_REQUEST(request);
</span><del>- GOwnPtr<char> uriString(soup_uri_to_string(soup_request_get_uri(soupRequest), FALSE));
</del><ins>+ GUniquePtr<char> uriString(soup_uri_to_string(soup_request_get_uri(soupRequest), FALSE));
</ins><span class="cx">
</span><span class="cx"> uint64_t requestID = generateSoupRequestID();
</span><span class="cx"> m_requestMap.set(requestID, adoptPtr(new WebSoupRequestAsyncData(task, request)));
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/ChangeLog 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -1,3 +1,194 @@
</span><ins>+2014-01-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GLIB] Use GUniquePtr instead of GOwnPtr
+ https://bugs.webkit.org/show_bug.cgi?id=127431
+
+ Reviewed by Martin Robinson.
+
+ GUniquePtr is a template alias of std::unique_ptr with a custom
+ deleter that replaces GOwnPtr. GOwnPtr is still used for the cases
+ where the output pointer is needed, but it will also be replaced soon.
+
+ * DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp:
+ (printAccessibilityEvent):
+ (axObjectEventListener):
+ * DumpRenderTree/atk/AccessibilityUIElementAtk.cpp:
+ (indexRangeInTable):
+ (AccessibilityUIElement::role):
+ (AccessibilityUIElement::title):
+ (AccessibilityUIElement::description):
+ (AccessibilityUIElement::stringValue):
+ (AccessibilityUIElement::language):
+ (AccessibilityUIElement::lineForIndex):
+ (AccessibilityUIElement::selectedTextRange):
+ (AccessibilityUIElement::url):
+ * DumpRenderTree/efl/AccessibilityControllerEfl.cpp:
+ (AccessibilityController::accessibleElementById):
+ * DumpRenderTree/gtk/AccessibilityControllerGtk.cpp:
+ (AccessibilityController::accessibleElementById):
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (getOutputDir):
+ (getFontsPath):
+ (initializeFonts):
+ (dumpFramesAsText):
+ (compareHistoryItems):
+ (dumpHistoryItem):
+ (soupURIToStringPreservingPassword):
+ (resetDefaultsToConsistentValues):
+ (temporaryDatabaseDirectory):
+ (webViewTitleChanged):
+ (webFrameLoadStatusNotified):
+ (pathFromSoupURI):
+ (convertWebResourceToURLPath):
+ (urlSuitableForTestResult):
+ (descriptionSuitableForTestResult):
+ (willSendRequestCallback):
+ (frameLoadEventCallback):
+ * DumpRenderTree/gtk/EditingCallbacks.cpp:
+ (dumpNodePath):
+ (dumpRange):
+ (shouldApplyStyle):
+ * DumpRenderTree/gtk/EventSender.cpp:
+ (contextClickCallback):
+ (beginDragWithFilesCallback):
+ * DumpRenderTree/gtk/TestRunnerGtk.cpp:
+ (TestRunner::pathToLocalResource):
+ (TestRunner::queueLoad):
+ (TestRunner::removeOriginAccessWhitelistEntry):
+ (TestRunner::setMockGeolocationPositionUnavailableError):
+ (TestRunner::setIconDatabaseEnabled):
+ (TestRunner::findString):
+ (TestRunner::setDomainRelaxationForbiddenForURLScheme):
+ (TestRunner::overridePreference):
+ (TestRunner::addUserScript):
+ (TestRunner::addUserStyleSheet):
+ (TestRunner::setTextDirection):
+ * DumpRenderTree/gtk/TextInputController.cpp:
+ (setMarkedTextCallback):
+ (insertTextCallback):
+ (doCommandCallback):
+ * DumpRenderTree/gtk/WorkQueueItemGtk.cpp:
+ (LoadHTMLStringItem::invoke):
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
+ (WebKitDOMNodeTest::testTagNames):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp:
+ (testBackForwardListLimitAndCache):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp:
+ (testContextMenuSmartSeparators):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp:
+ (testDownloadLocalFile):
+ (testDownloadLocalFileError):
+ (addContentDispositionHTTPHeaderToResponse):
+ (serverCallback):
+ (testDownloadRemoteFileError):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
+ (startTestServer):
+ (testInspectorServerPageList):
+ (openRemoteDebuggingSession):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp:
+ (testPrintOperationPrint):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
+ (addCacheHTTPHeadersToResponse):
+ (serverCallback):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp:
+ (httpsServerCallback):
+ (httpServerCallback):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
+ (testWebViewJavaScriptDialogs):
+ (testWebViewWindowProperties):
+ (testWebViewFileChooserRequest):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
+ (testWebExtensionWindowObjectCleared):
+ (testWebExtensionIsolatedWorld):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp:
+ (startTestServer):
+ (checkAtspiAccessible):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp:
+ (serverCallback):
+ (testClearDatabase):
+ (testGetFaviconURI):
+ (webkitFaviconDatabaseFinalizedCallback):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ (testWebContextGetPlugins):
+ (testWebContextURIScheme):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
+ (testWebViewRunJavaScript):
+ (testWebViewMode):
+ (testWebViewPageVisibility):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp:
+ (isStyleSheetInjectedForURLAtPath):
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
+ (testWebViewEditorCutCopyPasteNonEditable):
+ (testWebViewEditorCutCopyPasteEditable):
+ (testWebViewEditorSelectAllNonEditable):
+ (testWebViewEditorSelectAllEditable):
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ (sendRequestCallback):
+ (methodCallCallback):
+ * TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:
+ (TestWebKitAPI::Util::createInjectedBundlePath):
+ (TestWebKitAPI::Util::createURLForResource):
+ * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
+ (TestWebKitAPI::doKeyStroke):
+ (TestWebKitAPI::doMouseButtonEvent):
+ (TestWebKitAPI::PlatformWebView::simulateMouseMove):
+ * TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp:
+ (loadFailedCallback):
+ (LoadTrackingTest::loadURI):
+ (LoadTrackingTest::loadHtml):
+ (LoadTrackingTest::loadPlainText):
+ (LoadTrackingTest::loadRequest):
+ (LoadTrackingTest::reload):
+ (LoadTrackingTest::goBack):
+ (LoadTrackingTest::goForward):
+ * TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h:
+ * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp:
+ (registerGResource):
+ (removeNonEmptyDirectory):
+ (main):
+ * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
+ (Test::getWebKit1TestResoucesDir):
+ (Test::getResourcesDir):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp:
+ (WebKitTestBus::run):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp:
+ (WebKitTestServer::WebKitTestServer):
+ (WebKitTestServer::getURIForPath):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp:
+ (WebProcessTestRunner::runTest):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp:
+ (resourceGetDataCallback):
+ (WebViewTest::mainResourceData):
+ (WebViewTest::mouseMoveTo):
+ (WebViewTest::keyStroke):
+ (WebViewTest::doMouseButtonEvent):
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+ (WTR::AccessibilityController::accessibleElementById):
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ (WTR::AccessibilityUIElement::role):
+ (WTR::AccessibilityUIElement::title):
+ (WTR::AccessibilityUIElement::description):
+ (WTR::AccessibilityUIElement::stringValue):
+ (WTR::AccessibilityUIElement::language):
+ (WTR::AccessibilityUIElement::lineForIndex):
+ (WTR::AccessibilityUIElement::selectedTextRange):
+ (WTR::AccessibilityUIElement::url):
+ * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+ (WTR::getOutputDir):
+ (WTR::getFontsPath):
+ (WTR::initializeFontConfigSetting):
+ * WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp:
+ (WTR::topLevelPath):
+ * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+ (WTR::TestRunner::pathToLocalResource):
+ * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+ (WTR::TestController::initializeInjectedBundlePath):
+ (WTR::TestController::initializeTestPluginDirectory):
+
</ins><span class="cx"> 2014-01-05 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] run-webkit-tests should support the CMake build
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeatkAccessibilityCallbacksAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityCallbacksAtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "DumpRenderTree.h"
</span><span class="cx"> #include "JSRetainPtr.h"
</span><span class="cx"> #include <atk/atk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> if (!objectName || *objectName == '\0')
</span><span class="cx"> objectName = "(No name)";
</span><span class="cx">
</span><del>- GOwnPtr<gchar> signalNameAndValue(signalValue ? g_strdup_printf("%s = %s", signalName, signalValue) : g_strdup(signalName));
</del><ins>+ GUniquePtr<gchar> signalNameAndValue(signalValue ? g_strdup_printf("%s = %s", signalName, signalValue) : g_strdup(signalName));
</ins><span class="cx"> printf("Accessibility object emitted \"%s\" / Name: \"%s\" / Role: %d\n", signalNameAndValue.get(), objectName, objectRole);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -94,37 +94,37 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> GSignalQuery signalQuery;
</span><del>- GOwnPtr<gchar> signalName;
- GOwnPtr<gchar> signalValue;
</del><ins>+ GUniquePtr<gchar> signalName;
+ GUniquePtr<gchar> signalValue;
</ins><span class="cx"> String notificationName;
</span><span class="cx">
</span><span class="cx"> g_signal_query(signalHint->signal_id, &signalQuery);
</span><span class="cx">
</span><span class="cx"> if (!g_strcmp0(signalQuery.signal_name, "state-change")) {
</span><del>- signalName.set(g_strdup_printf("state-change:%s", g_value_get_string(&paramValues[1])));
- signalValue.set(g_strdup_printf("%d", g_value_get_boolean(&paramValues[2])));
</del><ins>+ signalName.reset(g_strdup_printf("state-change:%s", g_value_get_string(&paramValues[1])));
+ signalValue.reset(g_strdup_printf("%d", g_value_get_boolean(&paramValues[2])));
</ins><span class="cx"> if (!g_strcmp0(g_value_get_string(&paramValues[1]), "checked"))
</span><span class="cx"> notificationName = "CheckedStateChanged";
</span><span class="cx"> else if (!g_strcmp0(g_value_get_string(&paramValues[1]), "invalid-entry"))
</span><span class="cx"> notificationName = "AXInvalidStatusChanged";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "focus-event")) {
</span><del>- signalName.set(g_strdup("focus-event"));
- signalValue.set(g_strdup_printf("%d", g_value_get_boolean(&paramValues[1])));
</del><ins>+ signalName.reset(g_strdup("focus-event"));
+ signalValue.reset(g_strdup_printf("%d", g_value_get_boolean(&paramValues[1])));
</ins><span class="cx"> if (g_value_get_boolean(&paramValues[1]))
</span><span class="cx"> notificationName = "AXFocusedUIElementChanged";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "children-changed")) {
</span><span class="cx"> const gchar* childrenChangedDetail = g_quark_to_string(signalHint->detail);
</span><del>- signalName.set(g_strdup_printf("children-changed:%s", childrenChangedDetail));
- signalValue.set(g_strdup_printf("%d", g_value_get_uint(&paramValues[1])));
</del><ins>+ signalName.reset(g_strdup_printf("children-changed:%s", childrenChangedDetail));
+ signalValue.reset(g_strdup_printf("%d", g_value_get_uint(&paramValues[1])));
</ins><span class="cx"> notificationName = !g_strcmp0(childrenChangedDetail, "add") ? "AXChildrenAdded" : "AXChildrenRemoved";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "property-change")) {
</span><del>- signalName.set(g_strdup_printf("property-change:%s", g_quark_to_string(signalHint->detail)));
</del><ins>+ signalName.reset(g_strdup_printf("property-change:%s", g_quark_to_string(signalHint->detail)));
</ins><span class="cx"> if (!g_strcmp0(g_quark_to_string(signalHint->detail), "accessible-value"))
</span><span class="cx"> notificationName = "AXValueChanged";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "load-complete"))
</span><span class="cx"> notificationName = "AXLoadComplete";
</span><span class="cx"> else
</span><del>- signalName.set(g_strdup(signalQuery.signal_name));
</del><ins>+ signalName.reset(g_strdup(signalQuery.signal_name));
</ins><span class="cx">
</span><span class="cx"> if (loggingAccessibilityEvents)
</span><span class="cx"> printAccessibilityEvent(accessible, signalName.get(), signalValue.get());
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/atk/AccessibilityUIElementAtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include <JavaScriptCore/OpaqueJSString.h>
</span><span class="cx"> #include <atk/atk.h>
</span><span class="cx"> #include <wtf/Assertions.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"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> String jsStringToWTFString(JSStringRef attribute)
</span><span class="cx"> {
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(attribute);
</span><del>- GOwnPtr<gchar> buffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> buffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(attribute, buffer.get(), bufferSize);
</span><span class="cx">
</span><span class="cx"> return String::fromUTF8(buffer.get());
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> StringBuilder builder;
</span><span class="cx"> for (AtkAttributeSet* attributes = attributeSet; attributes; attributes = attributes->next) {
</span><span class="cx"> AtkAttribute* attribute = static_cast<AtkAttribute*>(attributes->data);
</span><del>- GOwnPtr<gchar> attributeData(g_strconcat(attribute->name, ":", attribute->value, NULL));
</del><ins>+ GUniquePtr<gchar> attributeData(g_strconcat(attribute->name, ":", attribute->value, NULL));
</ins><span class="cx"> builder.append(attributeData.get());
</span><span class="cx"> if (attributes->next)
</span><span class="cx"> builder.append(", ");
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx">
</span><span class="cx"> JSStringRef indexRangeInTable(PlatformUIElement element, bool isRowRange)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> rangeString(g_strdup("{0, 0}"));
</del><ins>+ GUniquePtr<gchar> rangeString(g_strdup("{0, 0}"));
</ins><span class="cx">
</span><span class="cx"> if (!ATK_IS_OBJECT(element))
</span><span class="cx"> return JSStringCreateWithUTF8CString(rangeString.get());
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> base = column;
</span><span class="cx"> length = atk_table_get_column_extent_at(ATK_TABLE(axTable), row, column);
</span><span class="cx"> }
</span><del>- rangeString.set(g_strdup_printf("{%d, %d}", base, length));
</del><ins>+ rangeString.reset(g_strdup_printf("{%d, %d}", base, length));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(rangeString.get());
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx"> if (!atk_object_get_role(ATK_OBJECT(m_element)))
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<char> roleStringWithPrefix(g_strdup_printf("AXRole: %s", roleToString(ATK_OBJECT(m_element))));
</del><ins>+ GUniquePtr<char> roleStringWithPrefix(g_strdup_printf("AXRole: %s", roleToString(ATK_OBJECT(m_element))));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(roleStringWithPrefix.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><span class="cx"> const gchar* name = atk_object_get_name(ATK_OBJECT(m_element));
</span><del>- GOwnPtr<gchar> axTitle(g_strdup_printf("AXTitle: %s", name ? name : ""));
</del><ins>+ GUniquePtr<gchar> axTitle(g_strdup_printf("AXTitle: %s", name ? name : ""));
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(axTitle.get());
</span><span class="cx"> }
</span><span class="lines">@@ -771,7 +771,7 @@
</span><span class="cx"> if (!description)
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> axDesc(g_strdup_printf("AXDescription: %s", description));
</del><ins>+ GUniquePtr<gchar> axDesc(g_strdup_printf("AXDescription: %s", description));
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(axDesc.get());
</span><span class="cx"> }
</span><span class="lines">@@ -781,9 +781,9 @@
</span><span class="cx"> if (!ATK_IS_TEXT(m_element))
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element), 0, -1));
- GOwnPtr<gchar> textWithReplacedCharacters(replaceCharactersForResults(text.get()));
- GOwnPtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get()));
</del><ins>+ GUniquePtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element), 0, -1));
+ GUniquePtr<gchar> textWithReplacedCharacters(replaceCharactersForResults(text.get()));
+ GUniquePtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get()));
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(axValue.get());
</span><span class="cx"> }
</span><span class="lines">@@ -797,7 +797,7 @@
</span><span class="cx"> if (!locale)
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<char> axValue(g_strdup_printf("AXLanguage: %s", locale));
</del><ins>+ GUniquePtr<char> axValue(g_strdup_printf("AXLanguage: %s", locale));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(axValue.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx"> if (index < 0 || index > atk_text_get_character_count(ATK_TEXT(m_element)))
</span><span class="cx"> return -1;
</span><span class="cx">
</span><del>- GOwnPtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element), 0, index));
</del><ins>+ GUniquePtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element), 0, index));
</ins><span class="cx"> int lineNo = 0;
</span><span class="cx"> for (gchar* offset = text.get(); *offset; ++offset) {
</span><span class="cx"> if (*offset == '\n')
</span><span class="lines">@@ -1195,7 +1195,7 @@
</span><span class="cx"> gint start, end;
</span><span class="cx"> g_free(atk_text_get_selection(ATK_TEXT(m_element), 0, &start, &end));
</span><span class="cx">
</span><del>- GOwnPtr<gchar> selection(g_strdup_printf("{%d, %d}", start, end - start));
</del><ins>+ GUniquePtr<gchar> selection(g_strdup_printf("{%d, %d}", start, end - start));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(selection.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1387,7 +1387,7 @@
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><span class="cx"> AtkHyperlink* hyperlink = atk_hyperlink_impl_get_hyperlink(ATK_HYPERLINK_IMPL(m_element));
</span><del>- GOwnPtr<char> hyperlinkURI(atk_hyperlink_get_uri(hyperlink, 0));
</del><ins>+ GUniquePtr<char> hyperlinkURI(atk_hyperlink_get_uri(hyperlink, 0));
</ins><span class="cx">
</span><span class="cx"> // Build the result string, stripping the absolute URL paths if present.
</span><span class="cx"> char* localURI = g_strstr_len(hyperlinkURI.get(), -1, "LayoutTests");
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeeflAccessibilityControllerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/efl/AccessibilityControllerEfl.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/efl/AccessibilityControllerEfl.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/efl/AccessibilityControllerEfl.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include "WebCoreSupport/DumpRenderTreeSupportEfl.h"
</span><span class="cx">
</span><span class="cx"> #include <atk/atk.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> AccessibilityUIElement AccessibilityController::focusedElement()
</span><span class="cx"> {
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(id);
</span><del>- GOwnPtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(id, idBuffer.get(), bufferSize);
</span><span class="cx">
</span><span class="cx"> AtkObject* result = childElementById(root, idBuffer.get());
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkAccessibilityControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/AccessibilityControllerGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <atk/atk.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit/webkit.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> AccessibilityUIElement AccessibilityController::focusedElement()
</span><span class="cx"> {
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(id);
</span><del>- GOwnPtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(id, idBuffer.get(), bufferSize);
</span><span class="cx">
</span><span class="cx"> AtkObject* result = childElementById(root, idBuffer.get());
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkDumpRenderTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include "WorkQueue.h"
</span><span class="cx"> #include "WorkQueueItem.h"
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><del>-#include <WebCore/platform/network/soup/GOwnPtrSoup.h>
</del><ins>+#include <WebCore/platform/network/soup/GUniquePtrSoup.h>
</ins><span class="cx"> #include <cassert>
</span><span class="cx"> #include <cstdlib>
</span><span class="cx"> #include <cstring>
</span><span class="lines">@@ -205,19 +205,19 @@
</span><span class="cx"> return webkitOutputDir;
</span><span class="cx">
</span><span class="cx"> CString topLevelPath = getTopLevelPath();
</span><del>- GOwnPtr<char> outputDir(g_build_filename(topLevelPath.data(), "WebKitBuild", NULL));
</del><ins>+ GUniquePtr<char> outputDir(g_build_filename(topLevelPath.data(), "WebKitBuild", NULL));
</ins><span class="cx"> return outputDir.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CString getFontsPath()
</span><span class="cx"> {
</span><span class="cx"> CString webkitOutputDir = getOutputDir();
</span><del>- GOwnPtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", NULL));
</del><ins>+ GUniquePtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", NULL));
</ins><span class="cx"> if (g_file_test(fontsPath.get(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
</span><span class="cx"> return fontsPath.get();
</span><span class="cx">
</span><span class="cx"> // Try alternative fonts path.
</span><del>- fontsPath.set(g_build_filename(webkitOutputDir.data(), "webkitgtk-test-fonts", NULL));
</del><ins>+ fontsPath.reset(g_build_filename(webkitOutputDir.data(), "webkitgtk-test-fonts", NULL));
</ins><span class="cx"> if (g_file_test(fontsPath.get(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
</span><span class="cx"> return fontsPath.get();
</span><span class="cx">
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> // Load our configuration file, which sets up proper aliases for family
</span><span class="cx"> // names like sans, serif and monospace.
</span><span class="cx"> FcConfig* config = FcConfigCreate();
</span><del>- GOwnPtr<gchar> fontConfigFilename(g_build_filename(FONTS_CONF_DIR, "fonts.conf", NULL));
</del><ins>+ GUniquePtr<gchar> fontConfigFilename(g_build_filename(FONTS_CONF_DIR, "fonts.conf", nullptr));
</ins><span class="cx"> if (!FcConfigParseAndLoad(config, reinterpret_cast<FcChar8*>(fontConfigFilename.get()), true))
</span><span class="cx"> g_error("Couldn't load font configuration file from: %s", fontConfigFilename.get());
</span><span class="cx">
</span><span class="lines">@@ -249,30 +249,30 @@
</span><span class="cx"> if (fontsPath.isNull())
</span><span class="cx"> g_error("Could not locate test fonts at %s. Is WEBKIT_TOP_LEVEL set?", fontsPath.data());
</span><span class="cx">
</span><del>- GOwnPtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, 0));
</del><ins>+ GUniquePtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, nullptr));
</ins><span class="cx"> while (const char* directoryEntry = g_dir_read_name(fontsDirectory.get())) {
</span><span class="cx"> if (!g_str_has_suffix(directoryEntry, ".ttf") && !g_str_has_suffix(directoryEntry, ".otf"))
</span><span class="cx"> continue;
</span><del>- GOwnPtr<gchar> fontPath(g_build_filename(fontsPath.data(), directoryEntry, NULL));
</del><ins>+ GUniquePtr<gchar> fontPath(g_build_filename(fontsPath.data(), directoryEntry, nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(fontPath.get())))
</span><span class="cx"> g_error("Could not load font at %s!", fontPath.get());
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ahem is used by many layout tests.
</span><del>- GOwnPtr<gchar> ahemFontFilename(g_build_filename(FONTS_CONF_DIR, "AHEM____.TTF", NULL));
</del><ins>+ GUniquePtr<gchar> ahemFontFilename(g_build_filename(FONTS_CONF_DIR, "AHEM____.TTF", nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<FcChar8*>(ahemFontFilename.get())))
</span><span class="cx"> g_error("Could not load font at %s!", ahemFontFilename.get());
</span><span class="cx">
</span><span class="cx"> for (int i = 1; i <= 9; i++) {
</span><del>- GOwnPtr<gchar> fontFilename(g_strdup_printf("WebKitWeightWatcher%i00.ttf", i));
- GOwnPtr<gchar> fontPath(g_build_filename(FONTS_CONF_DIR, "..", "..", "fonts", fontFilename.get(), NULL));
</del><ins>+ GUniquePtr<gchar> fontFilename(g_strdup_printf("WebKitWeightWatcher%i00.ttf", i));
+ GUniquePtr<gchar> fontPath(g_build_filename(FONTS_CONF_DIR, "..", "..", "fonts", fontFilename.get(), nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<FcChar8*>(fontPath.get())))
</span><span class="cx"> g_error("Could not load font at %s!", fontPath.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // A font with no valid Fontconfig encoding to test https://bugs.webkit.org/show_bug.cgi?id=47452
</span><del>- GOwnPtr<gchar> fontWithNoValidEncodingFilename(g_build_filename(FONTS_CONF_DIR, "FontWithNoValidEncoding.fon", NULL));
</del><ins>+ GUniquePtr<gchar> fontWithNoValidEncodingFilename(g_build_filename(FONTS_CONF_DIR, "FontWithNoValidEncoding.fon", nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<FcChar8*>(fontWithNoValidEncodingFilename.get())))
</span><span class="cx"> g_error("Could not load font at %s!", fontWithNoValidEncodingFilename.get());
</span><span class="cx">
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> if (gTestRunner->dumpChildFramesAsText()) {
</span><span class="cx"> GSList* children = DumpRenderTreeSupportGtk::getFrameChildren(frame);
</span><span class="cx"> for (GSList* child = children; child; child = g_slist_next(child)) {
</span><del>- GOwnPtr<gchar> childData(dumpFramesAsText(static_cast<WebKitWebFrame*>(child->data)));
</del><ins>+ GUniquePtr<gchar> childData(dumpFramesAsText(static_cast<WebKitWebFrame*>(child->data)));
</ins><span class="cx"> appendString(result, childData.get());
</span><span class="cx"> }
</span><span class="cx"> g_slist_free(children);
</span><span class="lines">@@ -312,8 +312,8 @@
</span><span class="cx">
</span><span class="cx"> static gint compareHistoryItems(gpointer* item1, gpointer* item2)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> firstItemTarget(webkit_web_history_item_get_target(WEBKIT_WEB_HISTORY_ITEM(item1)));
- GOwnPtr<gchar> secondItemTarget(webkit_web_history_item_get_target(WEBKIT_WEB_HISTORY_ITEM(item2)));
</del><ins>+ GUniquePtr<gchar> firstItemTarget(webkit_web_history_item_get_target(WEBKIT_WEB_HISTORY_ITEM(item1)));
+ GUniquePtr<gchar> secondItemTarget(webkit_web_history_item_get_target(WEBKIT_WEB_HISTORY_ITEM(item2)));
</ins><span class="cx"> return g_ascii_strcasecmp(firstItemTarget.get(), secondItemTarget.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx">
</span><span class="cx"> g_free(uriScheme);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> target(webkit_web_history_item_get_target(item));
</del><ins>+ GUniquePtr<gchar> target(webkit_web_history_item_get_target(item));
</ins><span class="cx"> if (target.get() && strlen(target.get()) > 0)
</span><span class="cx"> printf(" (in frame \"%s\")", target.get());
</span><span class="cx"> if (webkit_web_history_item_is_target_item(item))
</span><span class="lines">@@ -431,19 +431,19 @@
</span><span class="cx"> CString soupURIToStringPreservingPassword(SoupURI* soupURI)
</span><span class="cx"> {
</span><span class="cx"> if (!soupURI->password) {
</span><del>- GOwnPtr<char> uriString(soup_uri_to_string(soupURI, FALSE));
</del><ins>+ GUniquePtr<char> uriString(soup_uri_to_string(soupURI, FALSE));
</ins><span class="cx"> return uriString.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // soup_uri_to_string does not insert the password into the string, so we need to create the
</span><span class="cx"> // URI string and then reinsert any credentials that were present in the SoupURI. All tests that
</span><span class="cx"> // use URL-embedded credentials use HTTP, so it's safe here.
</span><del>- GOwnPtr<char> password(soupURI->password);
- GOwnPtr<char> user(soupURI->user);
</del><ins>+ GUniquePtr<char> password(soupURI->password);
+ GUniquePtr<char> user(soupURI->user);
</ins><span class="cx"> soupURI->password = 0;
</span><span class="cx"> soupURI->user = 0;
</span><span class="cx">
</span><del>- GOwnPtr<char> uriString(soup_uri_to_string(soupURI, FALSE));
</del><ins>+ GUniquePtr<char> uriString(soup_uri_to_string(soupURI, FALSE));
</ins><span class="cx"> String absoluteURIWithoutCredentialString = String::fromUTF8(uriString.get());
</span><span class="cx"> String protocolAndCredential = String::format("http://%s:%s@", user ? user.get() : "", password.get());
</span><span class="cx"> return absoluteURIWithoutCredentialString.replace("http://", protocolAndCredential).utf8();
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> static void resetDefaultsToConsistentValues()
</span><span class="cx"> {
</span><span class="cx"> WebKitWebSettings* settings = webkit_web_view_get_settings(webView);
</span><del>- GOwnPtr<gchar> localStoragePath(g_build_filename(g_get_user_data_dir(), "DumpRenderTreeGtk", "databases", NULL));
</del><ins>+ GUniquePtr<gchar> localStoragePath(g_build_filename(g_get_user_data_dir(), "DumpRenderTreeGtk", "databases", nullptr));
</ins><span class="cx"> g_object_set(G_OBJECT(settings),
</span><span class="cx"> "enable-accelerated-compositing", FALSE,
</span><span class="cx"> "enable-private-browsing", FALSE,
</span><span class="lines">@@ -683,7 +683,7 @@
</span><span class="cx"> const char* directoryFromEnvironment = g_getenv("DUMPRENDERTREE_TEMP");
</span><span class="cx"> if (directoryFromEnvironment)
</span><span class="cx"> return directoryFromEnvironment;
</span><del>- GOwnPtr<char> fallback(g_build_filename(g_get_user_data_dir(), "gtkwebkitdrt", "databases", NULL));
</del><ins>+ GUniquePtr<char> fallback(g_build_filename(g_get_user_data_dir(), "gtkwebkitdrt", "databases", NULL));
</ins><span class="cx"> return fallback.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -990,7 +990,7 @@
</span><span class="cx"> static void webViewTitleChanged(WebKitWebView* view, WebKitWebFrame* frame, const gchar* title, gpointer data)
</span><span class="cx"> {
</span><span class="cx"> if (gTestRunner->dumpFrameLoadCallbacks() && !done) {
</span><del>- GOwnPtr<char> frameName(getFrameNameSuitableForTestResult(view, frame));
</del><ins>+ GUniquePtr<char> frameName(getFrameNameSuitableForTestResult(view, frame));
</ins><span class="cx"> printf("%s - didReceiveTitle: %s\n", frameName.get(), title ? title : "");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> WebKitLoadStatus loadStatus = webkit_web_frame_get_load_status(frame);
</span><span class="cx">
</span><span class="cx"> if (gTestRunner->dumpFrameLoadCallbacks()) {
</span><del>- GOwnPtr<char> frameName(getFrameNameSuitableForTestResult(webkit_web_frame_get_web_view(frame), frame));
</del><ins>+ GUniquePtr<char> frameName(getFrameNameSuitableForTestResult(webkit_web_frame_get_web_view(frame), frame));
</ins><span class="cx">
</span><span class="cx"> switch (loadStatus) {
</span><span class="cx"> case WEBKIT_LOAD_PROVISIONAL:
</span><span class="lines">@@ -1182,10 +1182,10 @@
</span><span class="cx"> return soupURIToStringPreservingPassword(uri).data();
</span><span class="cx">
</span><span class="cx"> String pathString = uri->path;
</span><del>- GOwnPtr<gchar> pathBasename(g_path_get_basename(pathString.utf8().data()));
</del><ins>+ GUniquePtr<gchar> pathBasename(g_path_get_basename(pathString.utf8().data()));
</ins><span class="cx">
</span><span class="cx"> WebKitWebFrame* mainFrame = webkit_web_view_get_main_frame(webView);
</span><del>- GOwnPtr<SoupURI> mainFrameUri(soup_uri_new(webkit_web_frame_get_uri(mainFrame)));
</del><ins>+ GUniquePtr<SoupURI> mainFrameUri(soup_uri_new(webkit_web_frame_get_uri(mainFrame)));
</ins><span class="cx">
</span><span class="cx"> String mainFrameUriPathString = mainFrameUri.get()->path;
</span><span class="cx"> String basePath = mainFrameUriPathString.substring(0, mainFrameUriPathString.reverseFind('/') + 1);
</span><span class="lines">@@ -1212,7 +1212,7 @@
</span><span class="cx">
</span><span class="cx"> static CString convertWebResourceToURLPath(WebKitWebResource* webResource)
</span><span class="cx"> {
</span><del>- GOwnPtr<SoupURI> uri(soup_uri_new(webkit_web_resource_get_uri(webResource)));
</del><ins>+ GUniquePtr<SoupURI> uri(soup_uri_new(webkit_web_resource_get_uri(webResource)));
</ins><span class="cx"> return pathFromSoupURI(uri.get()).utf8();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1221,7 +1221,7 @@
</span><span class="cx"> if (!g_str_has_prefix(uriString, "file://"))
</span><span class="cx"> return CString(uriString);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> basename(g_path_get_basename(uriString));
</del><ins>+ GUniquePtr<gchar> basename(g_path_get_basename(uriString));
</ins><span class="cx"> return CString(basename.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1230,7 +1230,7 @@
</span><span class="cx"> if (!uri)
</span><span class="cx"> return CString("(null)");
</span><span class="cx">
</span><del>- GOwnPtr<char> uriString(soup_uri_to_string(uri, false));
</del><ins>+ GUniquePtr<char> uriString(soup_uri_to_string(uri, false));
</ins><span class="cx"> return urlSuitableForTestResult(uriString.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1246,7 +1246,7 @@
</span><span class="cx"> errorDomain = "WebKitErrorDomain";
</span><span class="cx">
</span><span class="cx"> // TODO: the other ports get the failingURL from the ResourceError
</span><del>- GOwnPtr<char> errorString(g_strdup_printf("<NSError domain %s, code %d, failing URL \"%s\">",
</del><ins>+ GUniquePtr<char> errorString(g_strdup_printf("<NSError domain %s, code %d, failing URL \"%s\">",
</ins><span class="cx"> errorDomain, error->code, resourceURIString.data()));
</span><span class="cx"> return CString(errorString.get());
</span><span class="cx"> }
</span><span class="lines">@@ -1261,7 +1261,7 @@
</span><span class="cx"> SoupURI* mainDocumentURI = soup_message_get_first_party(soupMessage);
</span><span class="cx"> CString mainDocumentURIString(descriptionSuitableForTestResult(mainDocumentURI));
</span><span class="cx"> CString path(convertNetworkRequestToURLPath(request));
</span><del>- GOwnPtr<char> description(g_strdup_printf("<NSURLRequest URL %s, main document URL %s, http method %s>",
</del><ins>+ GUniquePtr<char> description(g_strdup_printf("<NSURLRequest URL %s, main document URL %s, http method %s>",
</ins><span class="cx"> path.data(), mainDocumentURIString.data(), soupMessage->method));
</span><span class="cx"> return CString(description.get());
</span><span class="cx"> }
</span><span class="lines">@@ -1282,7 +1282,7 @@
</span><span class="cx"> } else
</span><span class="cx"> path = CString("(null)");
</span><span class="cx">
</span><del>- GOwnPtr<char> description(g_strdup_printf("<NSURLResponse %s, http status code %d>", path.data(), statusCode));
</del><ins>+ GUniquePtr<char> description(g_strdup_printf("<NSURLResponse %s, http status code %d>", path.data(), statusCode));
</ins><span class="cx"> return CString(description.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1306,7 +1306,7 @@
</span><span class="cx"> SoupURI* uri = soup_uri_new(webkit_network_request_get_uri(request));
</span><span class="cx">
</span><span class="cx"> if (SOUP_URI_IS_VALID(uri)) {
</span><del>- GOwnPtr<char> uriString(soup_uri_to_string(uri, FALSE));
</del><ins>+ GUniquePtr<char> uriString(soup_uri_to_string(uri, FALSE));
</ins><span class="cx">
</span><span class="cx"> if (SOUP_URI_VALID_FOR_HTTP(uri) && g_strcmp0(uri->host, "127.0.0.1")
</span><span class="cx"> && g_strcmp0(uri->host, "255.255.255.255")
</span><span class="lines">@@ -1380,7 +1380,7 @@
</span><span class="cx"> if (done || !gTestRunner->dumpFrameLoadCallbacks())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<char> frameName(getFrameNameSuitableForTestResult(webkit_web_frame_get_web_view(frame), frame));
</del><ins>+ GUniquePtr<char> frameName(getFrameNameSuitableForTestResult(webkit_web_frame_get_web_view(frame), frame));
</ins><span class="cx"> switch (event) {
</span><span class="cx"> case DumpRenderTreeSupportGtk::WillPerformClientRedirectToURL:
</span><span class="cx"> ASSERT(url);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkEditingCallbackscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/EditingCallbacks.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -33,24 +33,24 @@
</span><span class="cx"> #include "TestRunner.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit/webkit.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"> static CString dumpNodePath(WebKitDOMNode* node)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> nodeName(webkit_dom_node_get_node_name(node));
</del><ins>+ GUniquePtr<gchar> nodeName(webkit_dom_node_get_node_name(node));
</ins><span class="cx"> GString* path = g_string_new(nodeName.get());
</span><span class="cx">
</span><span class="cx"> WebKitDOMNode* parent = webkit_dom_node_get_parent_node(node);
</span><span class="cx"> while (parent) {
</span><del>- GOwnPtr<gchar> parentName(webkit_dom_node_get_node_name(parent));
</del><ins>+ GUniquePtr<gchar> parentName(webkit_dom_node_get_node_name(parent));
</ins><span class="cx">
</span><span class="cx"> g_string_append(path, " > ");
</span><span class="cx"> g_string_append(path, parentName.get());
</span><span class="cx"> parent = webkit_dom_node_get_parent_node(parent);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<gchar> pathBuffer(g_string_free(path, FALSE));
</del><ins>+ GUniquePtr<gchar> pathBuffer(g_string_free(path, FALSE));
</ins><span class="cx"> return pathBuffer.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> if (!range)
</span><span class="cx"> return "(null)";
</span><span class="cx">
</span><del>- GOwnPtr<gchar> dump(g_strdup_printf("range from %li of %s to %li of %s",
</del><ins>+ GUniquePtr<gchar> dump(g_strdup_printf("range from %li of %s to %li of %s",
</ins><span class="cx"> webkit_dom_range_get_start_offset(range, 0),
</span><span class="cx"> dumpNodePath(webkit_dom_range_get_start_container(range, 0)).data(),
</span><span class="cx"> webkit_dom_range_get_end_offset(range, 0),
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> gboolean shouldApplyStyle(WebKitWebView* webView, WebKitDOMCSSStyleDeclaration* style, WebKitDOMRange* range)
</span><span class="cx"> {
</span><span class="cx"> if (!done && gTestRunner->dumpEditingCallbacks()) {
</span><del>- GOwnPtr<gchar> styleText(webkit_dom_css_style_declaration_get_css_text(style));
</del><ins>+ GUniquePtr<gchar> styleText(webkit_dom_css_style_declaration_get_css_text(style));
</ins><span class="cx"> printf("EDITING DELEGATE: shouldApplyStyle:%s toElementsInDOMRange:%s\n",
</span><span class="cx"> styleText.get(), dumpRange(range).data());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkEventSendercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/EventSender.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/EventSender.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/EventSender.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx">
</span><span class="cx"> #include "DumpRenderTree.h"
</span><span class="cx"> #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
</span><del>-#include <GOwnPtrGtk.h>
</del><span class="cx"> #include <GRefPtrGtk.h>
</span><span class="cx"> #include <GtkVersioning.h>
</span><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><span class="lines">@@ -48,6 +47,8 @@
</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><ins>+#include <wtf/gobject/GOwnPtr.h>
+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="lines">@@ -220,7 +221,7 @@
</span><span class="cx"> WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
</span><span class="cx"> GtkMenu* gtkMenu = webkit_web_view_get_context_menu(view);
</span><span class="cx"> if (gtkMenu) {
</span><del>- GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(gtkMenu)));
</del><ins>+ GUniquePtr<GList> items(gtk_container_get_children(GTK_CONTAINER(gtkMenu)));
</ins><span class="cx"> JSValueRef arrayValues[g_list_length(items.get())];
</span><span class="cx"> int index = 0;
</span><span class="cx"> for (GList* item = g_list_first(items.get()); item; item = g_list_next(item)) {
</span><span class="lines">@@ -542,9 +543,9 @@
</span><span class="cx"> // If this is an HTTP test, we still need to pass a local file path
</span><span class="cx"> // to WebCore. Even though the file doesn't exist, this should be fine
</span><span class="cx"> // for most tests.
</span><del>- GOwnPtr<gchar> scheme(g_file_get_uri_scheme(parentDirectory.get()));
</del><ins>+ GUniquePtr<gchar> scheme(g_file_get_uri_scheme(parentDirectory.get()));
</ins><span class="cx"> if (g_str_equal(scheme.get(), "http") || g_str_equal(scheme.get(), "https")) {
</span><del>- GOwnPtr<gchar> currentDirectory(g_get_current_dir());
</del><ins>+ GUniquePtr<gchar> currentDirectory(g_get_current_dir());
</ins><span class="cx"> parentDirectory = adoptGRef(g_file_new_for_path(currentDirectory.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -557,7 +558,7 @@
</span><span class="cx"> JSStringRef filenameString = JSValueToStringCopy(context,
</span><span class="cx"> JSObjectGetPropertyAtIndex(context, filesArray, i, 0), 0);
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(filenameString);
</span><del>- GOwnPtr<gchar> filenameBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> filenameBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(filenameString, filenameBuffer.get(), bufferSize);
</span><span class="cx"> JSStringRelease(filenameString);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/TestRunnerGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <webkit/webkit.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"> extern "C" {
</span><span class="lines">@@ -132,19 +132,19 @@
</span><span class="cx">
</span><span class="cx"> JSStringRef TestRunner::pathToLocalResource(JSContextRef context, JSStringRef url)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> urlCString(JSStringCopyUTF8CString(url));
</del><ins>+ GUniquePtr<char> urlCString(JSStringCopyUTF8CString(url));
</ins><span class="cx"> if (!g_str_has_prefix(urlCString.get(), "file:///tmp/LayoutTests/"))
</span><span class="cx"> return JSStringRetain(url);
</span><span class="cx">
</span><span class="cx"> const char* layoutTestsSuffix = urlCString.get() + strlen("file:///tmp/");
</span><del>- GOwnPtr<char> testPath(g_build_filename(getTopLevelPath().data(), layoutTestsSuffix, NULL));
- GOwnPtr<char> testURI(g_filename_to_uri(testPath.get(), 0, 0));
</del><ins>+ GUniquePtr<char> testPath(g_build_filename(getTopLevelPath().data(), layoutTestsSuffix, nullptr));
+ GUniquePtr<char> testURI(g_filename_to_uri(testPath.get(), 0, 0));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(testURI.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::queueLoad(JSStringRef url, JSStringRef target)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> relativeURL(JSStringCopyUTF8CString(url));
</del><ins>+ GUniquePtr<gchar> relativeURL(JSStringCopyUTF8CString(url));
</ins><span class="cx"> SoupURI* baseURI = soup_uri_new(webkit_web_frame_get_uri(mainFrame));
</span><span class="cx"> SoupURI* absoluteURI = soup_uri_new_with_base(baseURI, relativeURL.get());
</span><span class="cx"> soup_uri_free(baseURI);
</span><span class="lines">@@ -219,9 +219,9 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::removeOriginAccessWhitelistEntry(JSStringRef sourceOrigin, JSStringRef protocol, JSStringRef host, bool includeSubdomains)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> sourceOriginGChar(JSStringCopyUTF8CString(sourceOrigin));
- GOwnPtr<gchar> protocolGChar(JSStringCopyUTF8CString(protocol));
- GOwnPtr<gchar> hostGChar(JSStringCopyUTF8CString(host));
</del><ins>+ GUniquePtr<gchar> sourceOriginGChar(JSStringCopyUTF8CString(sourceOrigin));
+ GUniquePtr<gchar> protocolGChar(JSStringCopyUTF8CString(protocol));
+ GUniquePtr<gchar> hostGChar(JSStringCopyUTF8CString(host));
</ins><span class="cx"> DumpRenderTreeSupportGtk::removeWhiteListAccessFromOrigin(sourceOriginGChar.get(), protocolGChar.get(), hostGChar.get(), includeSubdomains);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> view = webkit_web_frame_get_web_view(mainFrame);
</span><span class="cx"> ASSERT(view);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> cMessage(JSStringCopyUTF8CString(message));
</del><ins>+ GUniquePtr<gchar> cMessage(JSStringCopyUTF8CString(message));
</ins><span class="cx"> DumpRenderTreeSupportGtk::setMockGeolocationPositionUnavailableError(view, cMessage.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> {
</span><span class="cx"> WebKitIconDatabase* database = webkit_get_icon_database();
</span><span class="cx"> if (enabled) {
</span><del>- GOwnPtr<gchar> iconDatabasePath(g_build_filename(g_get_tmp_dir(), "DumpRenderTree", "icondatabase", NULL));
</del><ins>+ GUniquePtr<gchar> iconDatabasePath(g_build_filename(g_get_tmp_dir(), "DumpRenderTree", "icondatabase", nullptr));
</ins><span class="cx"> webkit_icon_database_set_path(database, iconDatabasePath.get());
</span><span class="cx"> } else
</span><span class="cx"> webkit_icon_database_set_path(database, 0);
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> if (!JSValueIsNumber(context, lengthValue))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- GOwnPtr<gchar> targetString(JSStringCopyUTF8CString(target));
</del><ins>+ GUniquePtr<gchar> targetString(JSStringCopyUTF8CString(target));
</ins><span class="cx">
</span><span class="cx"> size_t length = static_cast<size_t>(JSValueToNumber(context, lengthValue, 0));
</span><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setDomainRelaxationForbiddenForURLScheme(bool forbidden, JSStringRef scheme)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> urlScheme(JSStringCopyUTF8CString(scheme));
</del><ins>+ GUniquePtr<gchar> urlScheme(JSStringCopyUTF8CString(scheme));
</ins><span class="cx"> DumpRenderTreeSupportGtk::setDomainRelaxationForbiddenForURLScheme(forbidden, urlScheme.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -659,8 +659,8 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::overridePreference(JSStringRef key, JSStringRef value)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> originalName(JSStringCopyUTF8CString(key));
- GOwnPtr<gchar> valueAsString(JSStringCopyUTF8CString(value));
</del><ins>+ GUniquePtr<gchar> originalName(JSStringCopyUTF8CString(key));
+ GUniquePtr<gchar> valueAsString(JSStringCopyUTF8CString(value));
</ins><span class="cx">
</span><span class="cx"> WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
</span><span class="cx"> ASSERT(view);
</span><span class="lines">@@ -734,13 +734,13 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::addUserScript(JSStringRef source, bool runAtStart, bool allFrames)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> sourceCode(JSStringCopyUTF8CString(source));
</del><ins>+ GUniquePtr<gchar> sourceCode(JSStringCopyUTF8CString(source));
</ins><span class="cx"> DumpRenderTreeSupportGtk::addUserScript(mainFrame, sourceCode.get(), runAtStart, allFrames);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::addUserStyleSheet(JSStringRef source, bool allFrames)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> sourceCode(JSStringCopyUTF8CString(source));
</del><ins>+ GUniquePtr<gchar> sourceCode(JSStringCopyUTF8CString(source));
</ins><span class="cx"> DumpRenderTreeSupportGtk::addUserStyleSheet(mainFrame, sourceCode.get(), allFrames);
</span><span class="cx"> // FIXME: needs more investigation why userscripts/user-style-top-frame-only.html fails when allFrames is false.
</span><span class="cx">
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setTextDirection(JSStringRef direction)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> writingDirection(JSStringCopyUTF8CString(direction));
</del><ins>+ GUniquePtr<gchar> writingDirection(JSStringCopyUTF8CString(direction));
</ins><span class="cx">
</span><span class="cx"> WebKitWebView* view = webkit_web_frame_get_web_view(mainFrame);
</span><span class="cx"> ASSERT(view);
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkTextInputControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/TextInputController.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include "DumpRenderTree.h"
</span><span class="cx"> #include "WebCoreSupport/DumpRenderTreeSupportGtk.h"
</span><del>-#include <GOwnPtrGtk.h>
</del><ins>+#include <GUniquePtrGtk.h>
</ins><span class="cx"> #include <JavaScriptCore/JSObjectRef.h>
</span><span class="cx"> #include <JavaScriptCore/JSRetainPtr.h>
</span><span class="cx"> #include <JavaScriptCore/JSStringRef.h>
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> ASSERT(!exception || !*exception);
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(string);
</span><del>- GOwnPtr<gchar> stringBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> stringBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(string, stringBuffer.get(), bufferSize);
</span><span class="cx"> JSStringRelease(string);
</span><span class="cx">
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> ASSERT(!exception || !*exception);
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(string);
</span><del>- GOwnPtr<gchar> stringBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> stringBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(string, stringBuffer.get(), bufferSize);
</span><span class="cx"> JSStringRelease(string);
</span><span class="cx">
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> ASSERT(!exception || !*exception);
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(string);
</span><del>- GOwnPtr<gchar> stringBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> stringBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(string, stringBuffer.get(), bufferSize);
</span><span class="cx"> JSStringRelease(string);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreegtkWorkQueueItemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <webkit/webkit.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> // Returns a newly allocated UTF-8 character buffer which must be freed with g_free()
</span><span class="cx"> gchar* JSStringCopyUTF8CString(JSStringRef jsString)
</span><span class="lines">@@ -59,11 +59,11 @@
</span><span class="cx">
</span><span class="cx"> bool LoadHTMLStringItem::invoke() const
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> content(JSStringCopyUTF8CString(m_content.get()));
- GOwnPtr<gchar> baseURL(JSStringCopyUTF8CString(m_baseURL.get()));
</del><ins>+ GUniquePtr<gchar> content(JSStringCopyUTF8CString(m_content.get()));
+ GUniquePtr<gchar> baseURL(JSStringCopyUTF8CString(m_baseURL.get()));
</ins><span class="cx">
</span><span class="cx"> if (m_unreachableURL) {
</span><del>- GOwnPtr<gchar> unreachableURL(JSStringCopyUTF8CString(m_unreachableURL.get()));
</del><ins>+ GUniquePtr<gchar> unreachableURL(JSStringCopyUTF8CString(m_unreachableURL.get()));
</ins><span class="cx"> webkit_web_frame_load_alternate_string(mainFrame, content.get(), baseURL.get(), unreachableURL.get());
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/gtk/PlatformUtilitiesGtk.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
</span><span class="cx"> ${TESTWEBKITAPI_DIR}/gtk/PlatformWebViewGtk.cpp
</span><del>- ../../Source/WebCore/platform/gtk/GOwnPtrGtk.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND test_wtf_LIBRARIES
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "WebProcessTest.h"
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <webkit2/webkit-web-extension.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> class WebKitDOMNodeTest : public WebProcessTest {
</span><span class="cx"> public:
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> for (unsigned i = 0; i < nodeCount; i++) {
</span><span class="cx"> WebKitDOMNode* node = webkit_dom_node_list_item(list, i);
</span><span class="cx"> g_assert(WEBKIT_DOM_IS_NODE(node));
</span><del>- GOwnPtr<char> tagName(webkit_dom_node_get_node_name(node));
</del><ins>+ GUniquePtr<char> tagName(webkit_dom_node_get_node_name(node));
</ins><span class="cx"> g_assert_cmpstr(tagName.get(), ==, expectedTagNames[i]);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestBackForwardList.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> static void testBackForwardListLimitAndCache(BackForwardListTest* test, gconstpointer)
</span><span class="cx"> {
</span><span class="cx"> for (int i = 0; i < kBackForwardListLimit; i++) {
</span><del>- GOwnPtr<char> path(g_strdup_printf("/Page%d", i));
</del><ins>+ GUniquePtr<char> path(g_strdup_printf("/Page%d", i));
</ins><span class="cx"> test->m_changedFlags = BackForwardListTest::CurrentItem | BackForwardListTest::AddedItem;
</span><span class="cx"> test->loadURI(kServer->getURIForPath(path.get()).data());
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="lines">@@ -254,9 +254,9 @@
</span><span class="cx">
</span><span class="cx"> g_assert_cmpuint(webkit_back_forward_list_get_length(test->m_list), ==, kBackForwardListLimit);
</span><span class="cx"> WebKitBackForwardListItem* itemPageFirst = webkit_back_forward_list_get_nth_item(test->m_list, -(kBackForwardListLimit - 1));
</span><del>- GOwnPtr<GList> removedItems(g_list_prepend(0, itemPageFirst));
</del><ins>+ GUniquePtr<GList> removedItems(g_list_prepend(0, itemPageFirst));
</ins><span class="cx">
</span><del>- GOwnPtr<char> path(g_strdup_printf("/Page%d", kBackForwardListLimit));
</del><ins>+ GUniquePtr<char> path(g_strdup_printf("/Page%d", kBackForwardListLimit));
</ins><span class="cx"> test->m_changedFlags = BackForwardListTest::CurrentItem | BackForwardListTest::AddedItem | BackForwardListTest::RemovedItems;
</span><span class="cx"> test->loadURI(kServer->getURIForPath(path.get()).data());
</span><span class="cx"> test->waitUntilLoadFinishedAndCheckRemovedItems(removedItems.get());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> GtkMenu* getPopupMenu()
</span><span class="cx"> {
</span><del>- GOwnPtr<GList> toplevels(gtk_window_list_toplevels());
</del><ins>+ GUniquePtr<GList> toplevels(gtk_window_list_toplevels());
</ins><span class="cx"> for (GList* iter = toplevels.get(); iter; iter = g_list_next(iter)) {
</span><span class="cx"> if (!GTK_IS_WINDOW(iter->data))
</span><span class="cx"> continue;
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx">
</span><span class="cx"> GtkMenuItem* getMenuItem(GtkMenu* menu, const gchar* itemLabel)
</span><span class="cx"> {
</span><del>- GOwnPtr<GList> items(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ GUniquePtr<GList> items(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> for (GList* iter = items.get(); iter; iter = g_list_next(iter)) {
</span><span class="cx"> GtkMenuItem* child = GTK_MENU_ITEM(iter->data);
</span><span class="cx"> if (g_str_equal(itemLabel, gtk_menu_item_get_label(child)))
</span><span class="lines">@@ -785,7 +785,7 @@
</span><span class="cx"> g_assert(menu);
</span><span class="cx">
</span><span class="cx"> // Leading and trailing separators are not added to the context menu.
</span><del>- GOwnPtr<GList> menuItems(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ GUniquePtr<GList> menuItems(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> g_assert_cmpuint(g_list_length(menuItems.get()), ==, 6);
</span><span class="cx"> GtkWidget* item = GTK_WIDGET(g_list_nth_data(menuItems.get(), 0));
</span><span class="cx"> g_assert(!GTK_IS_SEPARATOR_MENU_ITEM(item) && gtk_widget_get_visible(item));
</span><span class="lines">@@ -803,7 +803,7 @@
</span><span class="cx"> // Hiding a menu item between two separators hides the following separator.
</span><span class="cx"> GtkAction* action = gtk_activatable_get_related_action(GTK_ACTIVATABLE(g_list_nth_data(menuItems.get(), 3)));
</span><span class="cx"> gtk_action_set_visible(action, FALSE);
</span><del>- menuItems.set(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ menuItems.reset(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> g_assert_cmpuint(g_list_length(menuItems.get()), ==, 6);
</span><span class="cx"> item = GTK_WIDGET(g_list_nth_data(menuItems.get(), 0));
</span><span class="cx"> g_assert(!GTK_IS_SEPARATOR_MENU_ITEM(item) && gtk_widget_get_visible(item));
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx"> // Trailing separators are hidden too.
</span><span class="cx"> action = gtk_activatable_get_related_action(GTK_ACTIVATABLE(g_list_nth_data(menuItems.get(), 5)));
</span><span class="cx"> gtk_action_set_visible(action, FALSE);
</span><del>- menuItems.set(gtk_container_get_children(GTK_CONTAINER(menu)));
</del><ins>+ menuItems.reset(gtk_container_get_children(GTK_CONTAINER(menu)));
</ins><span class="cx"> item = GTK_WIDGET(g_list_nth_data(menuItems.get(), 0));
</span><span class="cx"> g_assert(!GTK_IS_SEPARATOR_MENU_ITEM(item) && gtk_widget_get_visible(item));
</span><span class="cx"> item = GTK_WIDGET(g_list_nth_data(menuItems.get(), 1));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestCookieManager.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -72,12 +72,12 @@
</span><span class="cx"> switch (storage) {
</span><span class="cx"> case WEBKIT_COOKIE_PERSISTENT_STORAGE_TEXT:
</span><span class="cx"> if (!m_cookiesTextFile)
</span><del>- m_cookiesTextFile.set(g_build_filename(kTempDirectory, "cookies.txt", NULL));
</del><ins>+ m_cookiesTextFile.reset(g_build_filename(kTempDirectory, "cookies.txt", NULL));
</ins><span class="cx"> filename = m_cookiesTextFile.get();
</span><span class="cx"> break;
</span><span class="cx"> case WEBKIT_COOKIE_PERSISTENT_STORAGE_SQLITE:
</span><span class="cx"> if (!m_cookiesSQLiteFile)
</span><del>- m_cookiesSQLiteFile.set(g_build_filename(kTempDirectory, "cookies.db", NULL));
</del><ins>+ m_cookiesSQLiteFile.reset(g_build_filename(kTempDirectory, "cookies.db", NULL));
</ins><span class="cx"> filename = m_cookiesSQLiteFile.get();
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -166,8 +166,8 @@
</span><span class="cx"> char** m_domains;
</span><span class="cx"> bool m_cookiesChanged;
</span><span class="cx"> bool m_finishLoopWhenCookiesChange;
</span><del>- GOwnPtr<char> m_cookiesTextFile;
- GOwnPtr<char> m_cookiesSQLiteFile;
</del><ins>+ GUniquePtr<char> m_cookiesTextFile;
+ GUniquePtr<char> m_cookiesSQLiteFile;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void testCookieManagerAcceptPolicy(CookieManagerTest* test, gconstpointer)
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestDownloadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><span class="cx"> #include <wtf/Vector.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"> static char* kTempDirectory;
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void decideDestination(WebKitDownload* download, const gchar* suggestedFilename)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> destination(g_build_filename(kTempDirectory, suggestedFilename, NULL));
- GOwnPtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
</del><ins>+ GUniquePtr<char> destination(g_build_filename(kTempDirectory, suggestedFilename, NULL));
+ GUniquePtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
</ins><span class="cx"> webkit_download_set_destination(download, destinationURI.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if (!webkit_download_get_destination(download))
</span><span class="cx"> return;
</span><span class="cx"> GRefPtr<GFile> destFile = adoptGRef(g_file_new_for_uri(webkit_download_get_destination(download)));
</span><del>- GOwnPtr<char> destBasename(g_file_get_basename(destFile.get()));
</del><ins>+ GUniquePtr<char> destBasename(g_file_get_basename(destFile.get()));
</ins><span class="cx"> g_assert_cmpstr(destBasename.get(), ==, expectedName);
</span><span class="cx">
</span><span class="cx"> g_file_delete(destFile.get(), 0, 0);
</span><span class="lines">@@ -182,10 +182,10 @@
</span><span class="cx">
</span><span class="cx"> static void testDownloadLocalFile(DownloadTest* test, gconstpointer)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> sourcePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "test.pdf", NULL));
</del><ins>+ GUniquePtr<char> sourcePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "test.pdf", NULL));
</ins><span class="cx"> GRefPtr<GFile> source = adoptGRef(g_file_new_for_path(sourcePath.get()));
</span><span class="cx"> GRefPtr<GFileInfo> sourceInfo = adoptGRef(g_file_query_info(source.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE, static_cast<GFileQueryInfoFlags>(0), 0, 0));
</span><del>- GOwnPtr<char> sourceURI(g_file_get_uri(source.get()));
</del><ins>+ GUniquePtr<char> sourceURI(g_file_get_uri(source.get()));
</ins><span class="cx"> GRefPtr<WebKitDownload> download = adoptGRef(test->downloadURIAndWaitUntilFinishes(sourceURI.get()));
</span><span class="cx"> g_assert(!webkit_download_get_web_view(download.get()));
</span><span class="cx">
</span><span class="lines">@@ -262,9 +262,9 @@
</span><span class="cx"> g_assert_cmpfloat(webkit_download_get_estimated_progress(download.get()), <, 1);
</span><span class="cx">
</span><span class="cx"> test->m_expectedError = WEBKIT_DOWNLOAD_ERROR_DESTINATION;
</span><del>- GOwnPtr<char> path(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "test.pdf", NULL));
</del><ins>+ GUniquePtr<char> path(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "test.pdf", NULL));
</ins><span class="cx"> GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(path.get()));
</span><del>- GOwnPtr<char> uri(g_file_get_uri(file.get()));
</del><ins>+ GUniquePtr<char> uri(g_file_get_uri(file.get()));
</ins><span class="cx"> download = adoptGRef(test->downloadURIAndWaitUntilFinishes(uri.get()));
</span><span class="cx"> g_assert(!webkit_download_get_web_view(download.get()));
</span><span class="cx">
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx">
</span><span class="cx"> static void addContentDispositionHTTPHeaderToResponse(SoupMessage* message)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> contentDisposition(g_strdup_printf("filename=%s", kServerSuggestedFilename));
</del><ins>+ GUniquePtr<char> contentDisposition(g_strdup_printf("filename=%s", kServerSuggestedFilename));
</ins><span class="cx"> soup_message_headers_append(message->response_headers, "Content-Disposition", contentDisposition.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<char> filePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), path, NULL));
</del><ins>+ GUniquePtr<char> filePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), path, NULL));
</ins><span class="cx"> char* contents;
</span><span class="cx"> gsize contentsLength;
</span><span class="cx"> if (!g_file_get_contents(filePath.get(), &contents, &contentsLength, 0)) {
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> events.clear();
</span><span class="cx"> g_assert_cmpfloat(webkit_download_get_estimated_progress(download.get()), <, 1);
</span><span class="cx"> // Check the intermediate file is deleted when the download is cancelled.
</span><del>- GOwnPtr<char> intermediateURI(g_strdup_printf("%s.wkdownload", webkit_download_get_destination(download.get())));
</del><ins>+ GUniquePtr<char> intermediateURI(g_strdup_printf("%s.wkdownload", webkit_download_get_destination(download.get())));
</ins><span class="cx"> GRefPtr<GFile> intermediateFile = adoptGRef(g_file_new_for_uri(intermediateURI.get()));
</span><span class="cx"> g_assert(!g_file_query_exists(intermediateFile.get(), nullptr));
</span><span class="cx"> }
</span><span class="lines">@@ -444,8 +444,8 @@
</span><span class="cx">
</span><span class="cx"> static gboolean downloadDecideDestinationCallback(WebKitDownload* download, const gchar* suggestedFilename, WebViewDownloadTest* test)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> destination(g_build_filename(kTempDirectory, suggestedFilename, NULL));
- GOwnPtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
</del><ins>+ GUniquePtr<char> destination(g_build_filename(kTempDirectory, suggestedFilename, NULL));
+ GUniquePtr<char> destinationURI(g_filename_to_uri(destination.get(), 0, 0));
</ins><span class="cx"> webkit_download_set_destination(download, destinationURI.get());
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestInspectorServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> static void startTestServer()
</span><span class="cx"> {
</span><span class="cx"> // Prepare argv[] for spawning the server process.
</span><del>- GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", gTestServerAppName, NULL));
</del><ins>+ GUniquePtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", gTestServerAppName, NULL));
</ins><span class="cx">
</span><span class="cx"> // We install a handler to ensure that we kill the child process
</span><span class="cx"> // if the parent dies because of whatever the reason is.
</span><span class="lines">@@ -173,17 +173,17 @@
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx"> int pageId = WebViewTest::javascriptResultToNumber(javascriptResult);
</span><span class="cx">
</span><del>- GOwnPtr<char> valueString;
</del><ins>+ GUniquePtr<char> valueString;
</ins><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("pages[0].url;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "http://127.0.0.1:2999/");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("pages[0].inspectorUrl;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> String validInspectorURL = String("/Main.html?page=") + String::number(pageId);
</span><span class="cx"> ASSERT_CMP_CSTRING(valueString.get(), ==, validInspectorURL.utf8());
</span><span class="cx"> }
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx">
</span><del>- GOwnPtr<char> title(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> title(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(title.get(), ==, "http://127.0.0.1:2999/");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestPrintingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -134,9 +134,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<char> outputFilename(g_build_filename(kTempDirectory, "webkit-print.pdf", NULL));
</del><ins>+ GUniquePtr<char> outputFilename(g_build_filename(kTempDirectory, "webkit-print.pdf", NULL));
</ins><span class="cx"> GRefPtr<GFile> outputFile = adoptGRef(g_file_new_for_path(outputFilename.get()));
</span><del>- GOwnPtr<char> outputURI(g_file_get_uri(outputFile.get()));
</del><ins>+ GUniquePtr<char> outputURI(g_file_get_uri(outputFile.get()));
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GtkPrintSettings> printSettings = adoptGRef(gtk_print_settings_new());
</span><span class="cx"> gtk_print_settings_set_printer(printSettings.get(), gtk_printer_get_name(printer.get()));
</span><span class="lines">@@ -247,9 +247,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<char> outputFilename(g_build_filename(kTempDirectory, "webkit-close-after-print.pdf", NULL));
</del><ins>+ GUniquePtr<char> outputFilename(g_build_filename(kTempDirectory, "webkit-close-after-print.pdf", NULL));
</ins><span class="cx"> m_outputFile = adoptGRef(g_file_new_for_path(outputFilename.get()));
</span><del>- GOwnPtr<char> outputURI(g_file_get_uri(m_outputFile.get()));
</del><ins>+ GUniquePtr<char> outputURI(g_file_get_uri(m_outputFile.get()));
</ins><span class="cx">
</span><span class="cx"> GRefPtr<GtkPrintSettings> printSettings = adoptGRef(gtk_print_settings_new());
</span><span class="cx"> gtk_print_settings_set_printer(printSettings.get(), gtk_printer_get_name(printer.get()));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> g_assert_cmpint(dataSize, >, 0);
</span><span class="cx">
</span><span class="cx"> ResourcesTest* test = static_cast<ResourcesTest*>(userData);
</span><del>- test->m_resourceData.set(reinterpret_cast<char*>(data));
</del><ins>+ test->m_resourceData.reset(reinterpret_cast<char*>(data));
</ins><span class="cx"> test->m_resourceDataSize = dataSize;
</span><span class="cx"> g_main_loop_quit(test->m_mainLoop);
</span><span class="cx"> }
</span><span class="lines">@@ -191,12 +191,12 @@
</span><span class="cx"> g_assert(!strncmp(m_resourceData.get(), kJavascript, m_resourceDataSize));
</span><span class="cx"> } else
</span><span class="cx"> g_assert_not_reached();
</span><del>- m_resourceData.clear();
</del><ins>+ m_resourceData.reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t m_resourcesLoaded;
</span><span class="cx"> size_t m_resourcesToLoad;
</span><del>- GOwnPtr<char> m_resourceData;
</del><ins>+ GUniquePtr<char> m_resourceData;
</ins><span class="cx"> size_t m_resourceDataSize;
</span><span class="cx"> GList* m_subresources;
</span><span class="cx"> };
</span><span class="lines">@@ -671,12 +671,12 @@
</span><span class="cx"> {
</span><span class="cx"> // The actual date doesn't really matter.
</span><span class="cx"> SoupDate* soupDate = soup_date_new_from_now(0);
</span><del>- GOwnPtr<char> date(soup_date_to_string(soupDate, SOUP_DATE_HTTP));
</del><ins>+ GUniquePtr<char> date(soup_date_to_string(soupDate, SOUP_DATE_HTTP));
</ins><span class="cx"> soup_message_headers_append(message->response_headers, "Last-Modified", date.get());
</span><span class="cx"> soup_date_free(soupDate);
</span><span class="cx"> soup_message_headers_append(message->response_headers, "Cache-control", "public, max-age=31536000");
</span><span class="cx"> soupDate = soup_date_new_from_now(3600);
</span><del>- date.set(soup_date_to_string(soupDate, SOUP_DATE_HTTP));
</del><ins>+ date.reset(soup_date_to_string(soupDate, SOUP_DATE_HTTP));
</ins><span class="cx"> soup_message_headers_append(message->response_headers, "Expires", date.get());
</span><span class="cx"> soup_date_free(soupDate);
</span><span class="cx"> }
</span><span class="lines">@@ -734,7 +734,7 @@
</span><span class="cx"> static const char* javascriptRelativeHTML = "<html><head><script language='javascript' src='/redirected-to-cancel.js'></script></head><body></body></html>";
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, javascriptRelativeHTML, strlen(javascriptRelativeHTML));
</span><span class="cx"> } else if (g_str_equal(path, "/blank.ico")) {
</span><del>- GOwnPtr<char> filePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), path, NULL));
</del><ins>+ GUniquePtr<char> filePath(g_build_filename(Test::getWebKit1TestResoucesDir().data(), path, NULL));
</ins><span class="cx"> char* contents;
</span><span class="cx"> gsize contentsLength;
</span><span class="cx"> g_file_get_contents(filePath.get(), &contents, &contentsLength, 0);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestSSLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestSSL.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> if (m_certificateInfo)
</span><span class="cx"> webkit_certificate_info_free(m_certificateInfo);
</span><span class="cx"> m_certificateInfo = webkit_certificate_info_copy(info);
</span><del>- m_host.set(g_strdup(host));
</del><ins>+ m_host.reset(g_strdup(host));
</ins><span class="cx"> g_main_loop_quit(m_mainLoop);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebKitCertificateInfo* m_certificateInfo;
</span><del>- GOwnPtr<char> m_host;
</del><ins>+ GUniquePtr<char> m_host;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static void testLoadFailedWithTLSErrors(TLSErrorsTest* test, gconstpointer)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, indexHTML, strlen(indexHTML));
</span><span class="cx"> soup_message_body_complete(message->response_body);
</span><span class="cx"> } else if (g_str_equal(path, "/insecure-content/")) {
</span><del>- GOwnPtr<char> responseHTML(g_strdup_printf(insecureContentHTML, kHttpServer->getURIForPath("/test-script").data(), kHttpServer->getURIForPath("/test-image").data()));
</del><ins>+ GUniquePtr<char> responseHTML(g_strdup_printf(insecureContentHTML, kHttpServer->getURIForPath("/test-script").data(), kHttpServer->getURIForPath("/test-image").data()));
</ins><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, responseHTML.get(), strlen(responseHTML.get()));
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_OK);
</span><span class="cx"> soup_message_body_complete(message->response_body);
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (g_str_equal(path, "/test-script")) {
</span><del>- GOwnPtr<char> pathToFile(g_build_filename(Test::getResourcesDir().data(), "link-title.js", NULL));
</del><ins>+ GUniquePtr<char> pathToFile(g_build_filename(Test::getResourcesDir().data(), "link-title.js", NULL));
</ins><span class="cx"> char* contents;
</span><span class="cx"> gsize length;
</span><span class="cx"> g_file_get_contents(pathToFile.get(), &contents, &length, 0);
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_OK);
</span><span class="cx"> soup_message_body_complete(message->response_body);
</span><span class="cx"> } else if (g_str_equal(path, "/test-image")) {
</span><del>- GOwnPtr<char> pathToFile(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "blank.ico", NULL));
</del><ins>+ GUniquePtr<char> pathToFile(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "blank.ico", NULL));
</ins><span class="cx"> char* contents;
</span><span class="cx"> gsize length;
</span><span class="cx"> g_file_get_contents(pathToFile.get(), &contents, &length, 0);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -377,20 +377,20 @@
</span><span class="cx"> static const char* jsPromptFormat = "alert(prompt('%s', 'default'));";
</span><span class="cx">
</span><span class="cx"> test->m_scriptDialogType = WEBKIT_SCRIPT_DIALOG_ALERT;
</span><del>- GOwnPtr<char> alertDialogMessage(g_strdup_printf(jsAlertFormat, kAlertDialogMessage));
- GOwnPtr<char> alertHTML(g_strdup_printf(htmlOnLoadFormat, alertDialogMessage.get()));
</del><ins>+ GUniquePtr<char> alertDialogMessage(g_strdup_printf(jsAlertFormat, kAlertDialogMessage));
+ GUniquePtr<char> alertHTML(g_strdup_printf(htmlOnLoadFormat, alertDialogMessage.get()));
</ins><span class="cx"> test->loadHtml(alertHTML.get(), 0);
</span><span class="cx"> test->waitUntilMainLoopFinishes();
</span><span class="cx">
</span><span class="cx"> test->m_scriptDialogType = WEBKIT_SCRIPT_DIALOG_CONFIRM;
</span><del>- GOwnPtr<char> confirmDialogMessage(g_strdup_printf(jsConfirmFormat, kConfirmDialogMessage));
- GOwnPtr<char> confirmHTML(g_strdup_printf(htmlOnLoadFormat, confirmDialogMessage.get()));
</del><ins>+ GUniquePtr<char> confirmDialogMessage(g_strdup_printf(jsConfirmFormat, kConfirmDialogMessage));
+ GUniquePtr<char> confirmHTML(g_strdup_printf(htmlOnLoadFormat, confirmDialogMessage.get()));
</ins><span class="cx"> test->loadHtml(confirmHTML.get(), 0);
</span><span class="cx"> test->waitUntilMainLoopFinishes();
</span><span class="cx">
</span><span class="cx"> test->m_scriptDialogType = WEBKIT_SCRIPT_DIALOG_PROMPT;
</span><del>- GOwnPtr<char> promptDialogMessage(g_strdup_printf(jsPromptFormat, kPromptDialogMessage));
- GOwnPtr<char> promptHTML(g_strdup_printf(htmlOnLoadFormat, promptDialogMessage.get()));
</del><ins>+ GUniquePtr<char> promptDialogMessage(g_strdup_printf(jsPromptFormat, kPromptDialogMessage));
+ GUniquePtr<char> promptHTML(g_strdup_printf(htmlOnLoadFormat, promptDialogMessage.get()));
</ins><span class="cx"> test->loadHtml(promptHTML.get(), 0);
</span><span class="cx"> test->waitUntilMainLoopFinishes();
</span><span class="cx"> }
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> GdkRectangle geometry = { 100, 150, 400, 400 };
</span><span class="cx"> test->setExpectedWindowProperties(UIClientTest::WindowProperties(&geometry, false, false, false, false, false, true, false));
</span><span class="cx">
</span><del>- GOwnPtr<char> htmlString(g_strdup_printf("<html><body onLoad=\"window.open('', '', '%s').close();\"></body></html>", windowProrpertiesString));
</del><ins>+ GUniquePtr<char> htmlString(g_strdup_printf("<html><body onLoad=\"window.open('', '', '%s').close();\"></body></html>", windowProrpertiesString));
</ins><span class="cx"> test->loadHtml(htmlString.get(), 0);
</span><span class="cx"> test->waitUntilMainLoopFinishes();
</span><span class="cx">
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> static const char* fileChooserHTMLFormat = "<html><body><input style='position:absolute;left:0;top:0;margin:0;padding:0' type='file' %s/></body></html>";
</span><span class="cx">
</span><span class="cx"> // Multiple selections not allowed, no MIME filtering.
</span><del>- GOwnPtr<char> simpleFileUploadHTML(g_strdup_printf(fileChooserHTMLFormat, ""));
</del><ins>+ GUniquePtr<char> simpleFileUploadHTML(g_strdup_printf(fileChooserHTMLFormat, ""));
</ins><span class="cx"> test->loadHtml(simpleFileUploadHTML.get(), 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> WebKitFileChooserRequest* fileChooserRequest = test->clickMouseButtonAndWaitForFileChooserRequest(5, 5);
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx"> webkit_file_chooser_request_cancel(fileChooserRequest);
</span><span class="cx">
</span><span class="cx"> // Multiple selections allowed, no MIME filtering, some pre-selected files.
</span><del>- GOwnPtr<char> multipleSelectionFileUploadHTML(g_strdup_printf(fileChooserHTMLFormat, "multiple"));
</del><ins>+ GUniquePtr<char> multipleSelectionFileUploadHTML(g_strdup_printf(fileChooserHTMLFormat, "multiple"));
</ins><span class="cx"> test->loadHtml(multipleSelectionFileUploadHTML.get(), 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> fileChooserRequest = test->clickMouseButtonAndWaitForFileChooserRequest(5, 5);
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx"> webkit_file_chooser_request_cancel(fileChooserRequest);
</span><span class="cx">
</span><span class="cx"> // Multiple selections not allowed, only accept images, audio and video files..
</span><del>- GOwnPtr<char> mimeFilteredFileUploadHTML(g_strdup_printf(fileChooserHTMLFormat, "accept='audio/*,video/*,image/*'"));
</del><ins>+ GUniquePtr<char> mimeFilteredFileUploadHTML(g_strdup_printf(fileChooserHTMLFormat, "accept='audio/*,video/*,image/*'"));
</ins><span class="cx"> test->loadHtml(mimeFilteredFileUploadHTML.get(), 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> fileChooserRequest = test->clickMouseButtonAndWaitForFileChooserRequest(5, 5);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><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><del>- GOwnPtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "Foo");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">
</span><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.getElementById('console').innerHTML", 0);
</span><span class="cx"> g_assert(javascriptResult);
</span><del>- GOwnPtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "Foo");
</span><span class="cx">
</span><span class="cx"> static const char* isolatedWorldScript =
</span><span class="lines">@@ -170,7 +170,7 @@
</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 class="cx"> g_assert(javascriptResult);
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "undefined");
</span><span class="cx">
</span><span class="cx"> g_signal_handler_disconnect(test->m_webView, scriptDialogID);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitAccessibilitycpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> #include <signal.h>
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <wtf/PassRefPtr.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"> // Name of the test server application creating the webView object.
</span><span class="cx"> static const char* kTestServerAppName = "AccessibilityTestServer";
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> static void startTestServer()
</span><span class="cx"> {
</span><span class="cx"> // Prepare argv[] for spawning the server process.
</span><del>- GOwnPtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", kTestServerAppName, NULL));
</del><ins>+ GUniquePtr<char> testServerPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", kTestServerAppName, nullptr));
</ins><span class="cx">
</span><span class="cx"> char* testServerArgv[2];
</span><span class="cx"> testServerArgv[0] = testServerPath.get();
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> {
</span><span class="cx"> g_assert(ATSPI_IS_ACCESSIBLE(accessible));
</span><span class="cx">
</span><del>- GOwnPtr<char> name(atspi_accessible_get_name(accessible, 0));
</del><ins>+ GUniquePtr<char> name(atspi_accessible_get_name(accessible, 0));
</ins><span class="cx"> g_assert_cmpstr(targetName, ==, name.get());
</span><span class="cx"> g_assert_cmpint(targetRole, ==, atspi_accessible_get_role(accessible, 0));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitFaviconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span><span class="cx"> static char* kTempDirectory;
</span><span class="lines">@@ -118,7 +119,7 @@
</span><span class="cx"> char* contents;
</span><span class="cx"> gsize length;
</span><span class="cx"> if (g_str_equal(path, "/icon/favicon.ico")) {
</span><del>- GOwnPtr<char> pathToFavicon(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "blank.ico", NULL));
</del><ins>+ GUniquePtr<char> pathToFavicon(g_build_filename(Test::getWebKit1TestResoucesDir().data(), "blank.ico", NULL));
</ins><span class="cx"> g_file_get_contents(pathToFavicon.get(), &contents, &length, 0);
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_TAKE, contents, length);
</span><span class="cx"> } else if (g_str_equal(path, "/nofavicon")) {
</span><span class="lines">@@ -153,7 +154,7 @@
</span><span class="cx"> WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(test->m_webContext);
</span><span class="cx"> webkit_favicon_database_clear(database);
</span><span class="cx">
</span><del>- GOwnPtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, kServer->getURIForPath("/foo").data()));
</del><ins>+ GUniquePtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, kServer->getURIForPath("/foo").data()));
</ins><span class="cx"> g_assert(!iconURI);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -203,7 +204,7 @@
</span><span class="cx"> WebKitFaviconDatabase* database = webkit_web_context_get_favicon_database(test->m_webContext);
</span><span class="cx">
</span><span class="cx"> CString baseURI = kServer->getURIForPath("/foo");
</span><del>- GOwnPtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, baseURI.data()));
</del><ins>+ GUniquePtr<char> iconURI(webkit_favicon_database_get_favicon_uri(database, baseURI.data()));
</ins><span class="cx"> ASSERT_CMP_CSTRING(iconURI.get(), ==, kServer->getURIForPath("/icon/favicon.ico"));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,7 +258,7 @@
</span><span class="cx"> if (!g_file_test(kTempDirectory, G_FILE_TEST_IS_DIR))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- GOwnPtr<char> filename(g_build_filename(kTempDirectory, "WebpageIcons.db", NULL));
</del><ins>+ GUniquePtr<char> filename(g_build_filename(kTempDirectory, "WebpageIcons.db", nullptr));
</ins><span class="cx"> g_unlink(filename.get());
</span><span class="cx">
</span><span class="cx"> g_rmdir(kTempDirectory);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><span class="cx"> #include <wtf/HashMap.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/StringHash.h>
</span><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> }
</span><span class="cx"> g_assert(WEBKIT_IS_PLUGIN(testPlugin.get()));
</span><span class="cx">
</span><del>- GOwnPtr<char> pluginPath(g_build_filename(WEBKIT_TEST_PLUGIN_DIR, "libTestNetscapePlugin.so", NULL));
</del><ins>+ GUniquePtr<char> pluginPath(g_build_filename(WEBKIT_TEST_PLUGIN_DIR, "libTestNetscapePlugin.so", nullptr));
</ins><span class="cx"> g_assert_cmpstr(webkit_plugin_get_path(testPlugin.get()), ==, pluginPath.get());
</span><span class="cx"> g_assert_cmpstr(webkit_plugin_get_description(testPlugin.get()), ==, "Simple Netscape® plug-in that handles test content for WebKit");
</span><span class="cx"> GList* mimeInfoList = webkit_plugin_get_mime_info_list(testPlugin.get());
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> g_assert(test->m_handlersMap.contains(String::fromUTF8(scheme)));
</span><span class="cx">
</span><span class="cx"> if (!g_strcmp0(scheme, "error")) {
</span><del>- GOwnPtr<GError> error(g_error_new_literal(g_quark_from_string(errorDomain), errorCode, errorMessage));
</del><ins>+ GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(errorDomain), errorCode, errorMessage));
</ins><span class="cx"> webkit_uri_scheme_request_finish_error(request, error.get());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> test->registerURISchemeHandler("echo", kEchoHTMLFormat, -1, "text/html");
</span><span class="cx"> test->loadURI("echo:hello world");
</span><span class="cx"> test->waitUntilLoadFinished();
</span><del>- GOwnPtr<char> echoHTML(g_strdup_printf(kEchoHTMLFormat, webkit_uri_scheme_request_get_path(test->m_uriSchemeRequest.get())));
</del><ins>+ GUniquePtr<char> echoHTML(g_strdup_printf(kEchoHTMLFormat, webkit_uri_scheme_request_get_path(test->m_uriSchemeRequest.get())));
</ins><span class="cx"> mainResourceDataSize = 0;
</span><span class="cx"> mainResourceData = test->mainResourceData(mainResourceDataSize);
</span><span class="cx"> g_assert_cmpint(mainResourceDataSize, ==, strlen(echoHTML.get()));
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -90,19 +90,19 @@
</span><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><del>- GOwnPtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "WebKitGTK+ Title");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.getElementById('WebKitLink').href;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "http://www.webkitgtk.org/");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.getElementById('WebKitLink').textContent", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "WebKitGTK+ Website");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("a = 25;", &error.outPtr());
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> javascriptResult = test->runJavaScriptFromGResourceAndWaitUntilFinished("/org/webkit/webkit2gtk/tests/link-title.js", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "WebKitGTK+ Title");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptFromGResourceAndWaitUntilFinished("/wrong/path/to/resource.js", &error.outPtr());
</span><span class="lines">@@ -371,14 +371,14 @@
</span><span class="cx">
</span><span class="cx"> void saveAndWaitForFile()
</span><span class="cx"> {
</span><del>- m_saveDestinationFilePath.set(g_build_filename(m_tempDirectory.get(), "testWebViewSaveResult.mht", NULL));
</del><ins>+ m_saveDestinationFilePath.reset(g_build_filename(m_tempDirectory.get(), "testWebViewSaveResult.mht", NULL));
</ins><span class="cx"> m_file = adoptGRef(g_file_new_for_path(m_saveDestinationFilePath.get()));
</span><span class="cx"> webkit_web_view_save_to_file(m_webView, m_file.get(), WEBKIT_SAVE_MODE_MHTML, 0, reinterpret_cast<GAsyncReadyCallback>(webViewSavedToFileCallback), this);
</span><span class="cx"> g_main_loop_run(m_mainLoop);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- GOwnPtr<char> m_tempDirectory;
- GOwnPtr<char> m_saveDestinationFilePath;
</del><ins>+ GUniquePtr<char> m_tempDirectory;
+ GUniquePtr<char> m_saveDestinationFilePath;
</ins><span class="cx"> GRefPtr<GInputStream> m_inputStream;
</span><span class="cx"> GRefPtr<GFile> m_file;
</span><span class="cx"> };
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> test->loadHtml(indexHTML, 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> WebKitJavascriptResult* javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.body.textContent;", 0);
</span><del>- GOwnPtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "Test Web View Mode");
</span><span class="cx">
</span><span class="cx"> // Source mode.
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx"> test->loadHtml(indexHTML, 0);
</span><span class="cx"> test->waitUntilLoadFinished();
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("window.document.body.textContent;", 0);
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, indexHTML);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -462,7 +462,7 @@
</span><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><del>- GOwnPtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> valueString(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "hidden");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.hidden;", &error.outPtr());
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.visibilityState;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "visible");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.hidden;", &error.outPtr());
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.visibilityState;", &error.outPtr());
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><del>- valueString.set(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ valueString.reset(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> g_assert_cmpstr(valueString.get(), ==, "hidden");
</span><span class="cx">
</span><span class="cx"> javascriptResult = test->runJavaScriptAndWaitUntilFinished("document.hidden;", &error.outPtr());
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebViewGroup.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> g_assert(javascriptResult);
</span><span class="cx"> g_assert(!error.get());
</span><span class="cx">
</span><del>- GOwnPtr<char> resultString(WebViewTest::javascriptResultToCString(javascriptResult));
</del><ins>+ GUniquePtr<char> resultString(WebViewTest::javascriptResultToCString(javascriptResult));
</ins><span class="cx"> return !g_strcmp0(resultString.get(), kStyleSheetTestScriptResult);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> g_assert(!test->canExecuteEditingCommand(WEBKIT_EDITING_COMMAND_PASTE));
</span><span class="cx">
</span><span class="cx"> test->copyClipboard();
</span><del>- GOwnPtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</del><ins>+ GUniquePtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</ins><span class="cx"> g_assert_cmpstr(clipboardText.get(), ==, "make Jack a dull");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> g_assert(test->canExecuteEditingCommand(WEBKIT_EDITING_COMMAND_PASTE));
</span><span class="cx">
</span><span class="cx"> test->copyClipboard();
</span><del>- GOwnPtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</del><ins>+ GUniquePtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</ins><span class="cx"> g_assert_cmpstr(clipboardText.get(), ==, "All work and no play make Jack a dull boy.");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,14 +147,14 @@
</span><span class="cx"> g_assert(test->canExecuteEditingCommand(WEBKIT_EDITING_COMMAND_SELECT_ALL));
</span><span class="cx">
</span><span class="cx"> test->copyClipboard();
</span><del>- GOwnPtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</del><ins>+ GUniquePtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</ins><span class="cx">
</span><span class="cx"> // Initially only the subspan is selected.
</span><span class="cx"> g_assert_cmpstr(clipboardText.get(), ==, "make Jack a dull");
</span><span class="cx">
</span><span class="cx"> webkit_web_view_execute_editing_command(test->m_webView, WEBKIT_EDITING_COMMAND_SELECT_ALL);
</span><span class="cx"> test->copyClipboard();
</span><del>- clipboardText.set(gtk_clipboard_wait_for_text(test->m_clipboard));
</del><ins>+ clipboardText.reset(gtk_clipboard_wait_for_text(test->m_clipboard));
</ins><span class="cx">
</span><span class="cx"> // The mainspan should be selected after calling SELECT_ALL.
</span><span class="cx"> g_assert_cmpstr(clipboardText.get(), ==, "All work and no play make Jack a dull boy.");
</span><span class="lines">@@ -176,14 +176,14 @@
</span><span class="cx"> g_assert(test->canExecuteEditingCommand(WEBKIT_EDITING_COMMAND_SELECT_ALL));
</span><span class="cx">
</span><span class="cx"> test->copyClipboard();
</span><del>- GOwnPtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</del><ins>+ GUniquePtr<char> clipboardText(gtk_clipboard_wait_for_text(test->m_clipboard));
</ins><span class="cx">
</span><span class="cx"> // Initially only the subspan is selected.
</span><span class="cx"> g_assert_cmpstr(clipboardText.get(), ==, "make Jack a dull");
</span><span class="cx">
</span><span class="cx"> webkit_web_view_execute_editing_command(test->m_webView, WEBKIT_EDITING_COMMAND_SELECT_ALL);
</span><span class="cx"> test->copyClipboard();
</span><del>- clipboardText.set(gtk_clipboard_wait_for_text(test->m_clipboard));
</del><ins>+ clipboardText.reset(gtk_clipboard_wait_for_text(test->m_clipboard));
</ins><span class="cx">
</span><span class="cx"> // The mainspan should be selected after calling SELECT_ALL.
</span><span class="cx"> g_assert_cmpstr(clipboardText.get(), ==, "All work and no play make Jack a dull boy.");
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><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"> static const char introspectionXML[] =
</span><span class="lines">@@ -131,8 +132,8 @@
</span><span class="cx"> g_assert(requestURI);
</span><span class="cx">
</span><span class="cx"> if (const char* suffix = g_strrstr(requestURI, "/remove-this/javascript.js")) {
</span><del>- GOwnPtr<char> prefix(g_strndup(requestURI, strlen(requestURI) - strlen(suffix)));
- GOwnPtr<char> newURI(g_strdup_printf("%s/javascript.js", prefix.get()));
</del><ins>+ GUniquePtr<char> prefix(g_strndup(requestURI, strlen(requestURI) - strlen(suffix)));
+ GUniquePtr<char> newURI(g_strdup_printf("%s/javascript.js", prefix.get()));
</ins><span class="cx"> webkit_uri_request_set_uri(request, newURI.get());
</span><span class="cx"> } else if (g_str_has_suffix(requestURI, "/add-do-not-track-header")) {
</span><span class="cx"> SoupMessageHeaders* headers = webkit_uri_request_get_http_headers(request);
</span><span class="lines">@@ -199,7 +200,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
</span><del>- GOwnPtr<char> title(webkit_dom_document_get_title(document));
</del><ins>+ GUniquePtr<char> title(webkit_dom_document_get_title(document));
</ins><span class="cx"> g_dbus_method_invocation_return_value(invocation, g_variant_new("(s)", title.get()));
</span><span class="cx"> } else if (!g_strcmp0(methodName, "RunJavaScriptInIsolatedWorld")) {
</span><span class="cx"> uint64_t pageID;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkPlatformUtilitiesGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include "PlatformUtilities.h"
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.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"> namespace TestWebKitAPI {
</span><span class="cx"> namespace Util {
</span><span class="lines">@@ -67,18 +67,18 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef createInjectedBundlePath()
</span><span class="cx"> {
</span><del>- GOwnPtr<char> injectedBundlePath(getFilenameFromEnvironmentVariableAsUTF8("TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"));
- GOwnPtr<char> injectedBundleFilename(g_build_filename(injectedBundlePath.get(), "libTestWebKitAPIInjectedBundle.la", NULL));
</del><ins>+ GUniquePtr<char> injectedBundlePath(getFilenameFromEnvironmentVariableAsUTF8("TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"));
+ GUniquePtr<char> injectedBundleFilename(g_build_filename(injectedBundlePath.get(), "libTestWebKitAPIInjectedBundle.la", nullptr));
</ins><span class="cx"> return WKStringCreateWithUTF8CString(injectedBundleFilename.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef createURLForResource(const char* resource, const char* extension)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> testResourcesPath(getFilenameFromEnvironmentVariableAsUTF8("TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"));
- GOwnPtr<char> resourceBasename(g_strdup_printf("%s.%s", resource, extension));
- GOwnPtr<char> resourceFilename(g_build_filename(testResourcesPath.get(), resourceBasename.get(), NULL));
</del><ins>+ GUniquePtr<char> testResourcesPath(getFilenameFromEnvironmentVariableAsUTF8("TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"));
+ GUniquePtr<char> resourceBasename(g_strdup_printf("%s.%s", resource, extension));
+ GUniquePtr<char> resourceFilename(g_build_filename(testResourcesPath.get(), resourceBasename.get(), nullptr));
</ins><span class="cx"> GRefPtr<GFile> resourceFile = adoptGRef(g_file_new_for_path(resourceFilename.get()));
</span><del>- GOwnPtr<char> resourceURI(g_file_get_uri(resourceFile.get()));
</del><ins>+ GUniquePtr<char> resourceURI(g_file_get_uri(resourceFile.get()));
</ins><span class="cx"> return WKURLCreateWithUTF8CString(resourceURI.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PlatformWebView.h"
</span><span class="cx">
</span><del>-#include <WebCore/GOwnPtrGtk.h>
</del><ins>+#include <WebCore/GUniquePtrGtk.h>
</ins><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> static void doKeyStroke(GtkWidget* viewWidget, unsigned int keyVal)
</span><span class="cx"> {
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(GDK_KEY_PRESS));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(GDK_KEY_PRESS));
</ins><span class="cx"> event->key.keyval = keyVal;
</span><span class="cx"> event->key.time = GDK_CURRENT_TIME;
</span><span class="cx"> event->key.state = 0;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> static void doMouseButtonEvent(GtkWidget* viewWidget, GdkEventType eventType, int x, int y, unsigned int button)
</span><span class="cx"> {
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(eventType));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(eventType));
</ins><span class="cx"> event->button.x = x;
</span><span class="cx"> event->button.y = y;
</span><span class="cx"> event->button.button = button;
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> void PlatformWebView::simulateMouseMove(unsigned x, unsigned y)
</span><span class="cx"> {
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(GDK_MOTION_NOTIFY));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(GDK_MOTION_NOTIFY));
</ins><span class="cx"> event->motion.x = x;
</span><span class="cx"> event->motion.y = y;
</span><span class="cx"> event->motion.time = GDK_CURRENT_TIME;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkLoadTrackingTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> static void loadFailedCallback(WebKitWebView* webView, WebKitLoadEvent loadEvent, const char* failingURI, GError* error, LoadTrackingTest* test)
</span><span class="cx"> {
</span><span class="cx"> test->m_loadFailed = true;
</span><del>- test->m_error.set(g_error_copy(error));
</del><ins>+ test->m_error.reset(g_error_copy(error));
</ins><span class="cx">
</span><span class="cx"> switch (loadEvent) {
</span><span class="cx"> case WEBKIT_LOAD_STARTED:
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> WebViewTest::loadURI(uri);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> WebViewTest::loadHtml(html, baseURI);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> WebViewTest::loadPlainText(plainText);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> WebViewTest::loadRequest(request);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> webkit_web_view_reload(m_webView);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> WebViewTest::goBack();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -202,6 +202,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_loadEvents.clear();
</span><span class="cx"> m_estimatedProgress = 0;
</span><del>- m_error.clear();
</del><ins>+ m_error.reset();
</ins><span class="cx"> WebViewTest::goForward();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkLoadTrackingTesth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/LoadTrackingTest.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> };
</span><span class="cx"> bool m_runLoadUntilCompletion;
</span><span class="cx"> bool m_loadFailed;
</span><del>- GOwnPtr<GError> m_error;
</del><ins>+ GUniquePtr<GError> m_error;
</ins><span class="cx"> Vector<LoadEvents> m_loadEvents;
</span><span class="cx"> float m_estimatedProgress;
</span><span class="cx"> CString m_redirectURI;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkTestMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -23,14 +23,14 @@
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> void beforeAll();
</span><span class="cx"> void afterAll();
</span><span class="cx">
</span><span class="cx"> static void registerGResource(void)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", "resources", "webkit2gtk-tests-resources.gresource", NULL));
</del><ins>+ GUniquePtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", "resources", "webkit2gtk-tests-resources.gresource", nullptr));
</ins><span class="cx"> GResource* resource = g_resource_load(resourcesPath.get(), 0);
</span><span class="cx"> g_assert(resource);
</span><span class="cx">
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> g_assert(directory);
</span><span class="cx"> const char* fileName;
</span><span class="cx"> while ((fileName = g_dir_read_name(directory))) {
</span><del>- GOwnPtr<char> filePath(g_build_filename(directoryPath, fileName, NULL));
</del><ins>+ GUniquePtr<char> filePath(g_build_filename(directoryPath, fileName, nullptr));
</ins><span class="cx"> g_unlink(filePath.get());
</span><span class="cx"> }
</span><span class="cx"> g_dir_close(directory);
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> registerGResource();
</span><span class="cx">
</span><del>- GOwnPtr<char> diskCacheTempDirectory(g_dir_make_tmp("WebKit2TestsDiskCache-XXXXXX", 0));
</del><ins>+ GUniquePtr<char> diskCacheTempDirectory(g_dir_make_tmp("WebKit2TestsDiskCache-XXXXXX", 0));
</ins><span class="cx"> g_assert(diskCacheTempDirectory.get());
</span><span class="cx"> webkit_web_context_set_disk_cache_directory(webkit_web_context_get_default(), diskCacheTempDirectory.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkTestMainh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.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"> #define MAKE_GLIB_TEST_FIXTURE(ClassName) \
</span><span class="lines">@@ -37,7 +38,7 @@
</span><span class="cx"> } \
</span><span class="cx"> static void add(const char* suiteName, const char* testName, void (*testFunc)(ClassName*, const void*)) \
</span><span class="cx"> { \
</span><del>- GOwnPtr<gchar> testPath(g_strdup_printf("/webkit2/%s/%s", suiteName, testName)); \
</del><ins>+ GUniquePtr<gchar> testPath(g_strdup_printf("/webkit2/%s/%s", suiteName, testName)); \
</ins><span class="cx"> g_test_add(testPath.get(), ClassName, 0, ClassName::setUp, testFunc, ClassName::tearDown); \
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -83,13 +84,13 @@
</span><span class="cx">
</span><span class="cx"> static CString getWebKit1TestResoucesDir()
</span><span class="cx"> {
</span><del>- GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKitGtk", "resources", NULL));
</del><ins>+ GUniquePtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKitGtk", "resources", nullptr));
</ins><span class="cx"> return resourcesDir.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CString getResourcesDir()
</span><span class="cx"> {
</span><del>- GOwnPtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKit2Gtk", "resources", NULL));
</del><ins>+ GUniquePtr<char> resourcesDir(g_build_filename(WEBKIT_SRC_DIR, "Tools", "TestWebKitAPI", "Tests", "WebKit2Gtk", "resources", nullptr));
</ins><span class="cx"> return resourcesDir.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> #include "WebKitTestBus.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/gobject/GOwnPtr.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> WebKitTestBus::WebKitTestBus()
</span><span class="lines">@@ -31,7 +32,7 @@
</span><span class="cx"> bool WebKitTestBus::run()
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Use GTestDBus when we bump glib to 2.34.
</span><del>- GOwnPtr<char> dbusLaunch(g_find_program_in_path("dbus-launch"));
</del><ins>+ GUniquePtr<char> dbusLaunch(g_find_program_in_path("dbus-launch"));
</ins><span class="cx"> if (!dbusLaunch) {
</span><span class="cx"> g_warning("Error starting DBUS daemon: dbus-launch not found in path");
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -21,16 +21,16 @@
</span><span class="cx"> #include "WebKitTestServer.h"
</span><span class="cx">
</span><span class="cx"> #include "TestMain.h"
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> WebKitTestServer::WebKitTestServer(ServerType type)
</span><span class="cx"> {
</span><del>- GOwnPtr<char> sslCertificateFile;
- GOwnPtr<char> sslKeyFile;
</del><ins>+ GUniquePtr<char> sslCertificateFile;
+ GUniquePtr<char> sslKeyFile;
</ins><span class="cx"> if (type == ServerHTTPS) {
</span><span class="cx"> CString resourcesDir = Test::getResourcesDir();
</span><del>- sslCertificateFile.set(g_build_filename(resourcesDir.data(), "test-cert.pem", NULL));
- sslKeyFile.set(g_build_filename(resourcesDir.data(), "test-key.pem", NULL));
</del><ins>+ sslCertificateFile.reset(g_build_filename(resourcesDir.data(), "test-cert.pem", NULL));
+ sslKeyFile.reset(g_build_filename(resourcesDir.data(), "test-key.pem", NULL));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GRefPtr<SoupAddress> address = adoptGRef(soup_address_new("127.0.0.1", SOUP_ADDRESS_ANY_PORT));
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> CString WebKitTestServer::getURIForPath(const char* path)
</span><span class="cx"> {
</span><span class="cx"> SoupURI* uri = soup_uri_new_with_base(m_baseURI, path);
</span><del>- GOwnPtr<gchar> uriString(soup_uri_to_string(uri, FALSE));
</del><ins>+ GUniquePtr<gchar> uriString(soup_uri_to_string(uri, FALSE));
</ins><span class="cx"> soup_uri_free(uri);
</span><span class="cx"> return uriString.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebProcessTestRunnercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebProcessTestRunner.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebProcessTestRunner.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> WebProcessTestRunner::WebProcessTestRunner()
</span><span class="cx"> : m_mainLoop(g_main_loop_new(0, TRUE))
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> g_main_loop_run(m_mainLoop);
</span><span class="cx">
</span><span class="cx"> m_testResult = false;
</span><del>- GOwnPtr<char> testPath(g_strdup_printf("%s/%s", suiteName, testName));
</del><ins>+ GUniquePtr<char> testPath(g_strdup_printf("%s/%s", suiteName, testName));
</ins><span class="cx"> g_dbus_proxy_call(
</span><span class="cx"> proxy(),
</span><span class="cx"> "RunTest",
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebViewTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JSRetainPtr.h>
</span><del>-#include <WebCore/GOwnPtrGtk.h>
</del><ins>+#include <WebCore/GUniquePtrGtk.h>
</ins><span class="cx">
</span><span class="cx"> WebViewTest::WebViewTest()
</span><span class="cx"> : m_webView(WEBKIT_WEB_VIEW(g_object_ref_sink(webkit_web_view_new())))
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> g_assert(data);
</span><span class="cx">
</span><span class="cx"> WebViewTest* test = static_cast<WebViewTest*>(userData);
</span><del>- test->m_resourceData.set(reinterpret_cast<char*>(data));
</del><ins>+ test->m_resourceData.reset(reinterpret_cast<char*>(data));
</ins><span class="cx"> test->m_resourceDataSize = dataSize;
</span><span class="cx"> g_main_loop_quit(test->m_mainLoop);
</span><span class="cx"> }
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> const char* WebViewTest::mainResourceData(size_t& mainResourceDataSize)
</span><span class="cx"> {
</span><span class="cx"> m_resourceDataSize = 0;
</span><del>- m_resourceData.clear();
</del><ins>+ m_resourceData.reset();
</ins><span class="cx"> WebKitWebResource* resource = webkit_web_view_get_main_resource(m_webView);
</span><span class="cx"> g_assert(resource);
</span><span class="cx">
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> GtkWidget* viewWidget = GTK_WIDGET(m_webView);
</span><span class="cx"> g_assert(gtk_widget_get_realized(viewWidget));
</span><span class="cx">
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(GDK_MOTION_NOTIFY));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(GDK_MOTION_NOTIFY));
</ins><span class="cx"> event->motion.x = x;
</span><span class="cx"> event->motion.y = y;
</span><span class="cx">
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx"> GtkWidget* viewWidget = GTK_WIDGET(m_webView);
</span><span class="cx"> g_assert(gtk_widget_get_realized(viewWidget));
</span><span class="cx">
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(GDK_KEY_PRESS));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(GDK_KEY_PRESS));
</ins><span class="cx"> event->key.keyval = keyVal;
</span><span class="cx">
</span><span class="cx"> event->key.time = GDK_CURRENT_TIME;
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> GtkWidget* viewWidget = GTK_WIDGET(m_webView);
</span><span class="cx"> g_assert(gtk_widget_get_realized(viewWidget));
</span><span class="cx">
</span><del>- GOwnPtr<GdkEvent> event(gdk_event_new(eventType));
</del><ins>+ GUniquePtr<GdkEvent> event(gdk_event_new(eventType));
</ins><span class="cx"> event->button.window = gtk_widget_get_window(viewWidget);
</span><span class="cx"> g_object_ref(event->button.window);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebViewTesth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebViewTest.h 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> CString m_expectedTitle;
</span><span class="cx"> WebKitJavascriptResult* m_javascriptResult;
</span><span class="cx"> GError** m_javascriptError;
</span><del>- GOwnPtr<char> m_resourceData;
</del><ins>+ GUniquePtr<char> m_resourceData;
</ins><span class="cx"> size_t m_resourceDataSize;
</span><span class="cx"> cairo_surface_t* m_surface;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <WebKit2/WKBundlePagePrivate.h>
</span><span class="cx"> #include <atk/atk.h>
</span><span class="cx"> #include <cstdio>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(id);
</span><del>- GOwnPtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> idBuffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(id, idBuffer.get(), bufferSize);
</span><span class="cx">
</span><span class="cx"> AtkObject* result = childElementById(root, idBuffer.get());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <WebKit2/WKBundlePage.h>
</span><span class="cx"> #include <WebKit2/WKBundlePagePrivate.h>
</span><span class="cx"> #include <wtf/HashMap.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"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -67,8 +67,8 @@
</span><span class="cx"> if (!objectName || *objectName == '\0')
</span><span class="cx"> objectName = "(No name)";
</span><span class="cx">
</span><del>- GOwnPtr<char> signalNameAndValue(signalValue ? g_strdup_printf("%s = %s", signalName, signalValue) : g_strdup(signalName));
- GOwnPtr<char> accessibilityEventString(g_strdup_printf("Accessibility object emitted \"%s\" / Name: \"%s\" / Role: %d\n", signalNameAndValue.get(), objectName, objectRole));
</del><ins>+ GUniquePtr<char> signalNameAndValue(signalValue ? g_strdup_printf("%s = %s", signalName, signalValue) : g_strdup(signalName));
+ GUniquePtr<char> accessibilityEventString(g_strdup_printf("Accessibility object emitted \"%s\" / Name: \"%s\" / Role: %d\n", signalNameAndValue.get(), objectName, objectRole));
</ins><span class="cx"> InjectedBundle::shared().outputText(String::fromUTF8(accessibilityEventString.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -83,37 +83,37 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> GSignalQuery signalQuery;
</span><del>- GOwnPtr<char> signalName;
- GOwnPtr<char> signalValue;
</del><ins>+ GUniquePtr<char> signalName;
+ GUniquePtr<char> signalValue;
</ins><span class="cx"> const char* notificationName = nullptr;
</span><span class="cx">
</span><span class="cx"> g_signal_query(signalHint->signal_id, &signalQuery);
</span><span class="cx">
</span><span class="cx"> if (!g_strcmp0(signalQuery.signal_name, "state-change")) {
</span><del>- signalName.set(g_strdup_printf("state-change:%s", g_value_get_string(&paramValues[1])));
- signalValue.set(g_strdup_printf("%d", g_value_get_boolean(&paramValues[2])));
</del><ins>+ signalName.reset(g_strdup_printf("state-change:%s", g_value_get_string(&paramValues[1])));
+ signalValue.reset(g_strdup_printf("%d", g_value_get_boolean(&paramValues[2])));
</ins><span class="cx"> if (!g_strcmp0(g_value_get_string(&paramValues[1]), "checked"))
</span><span class="cx"> notificationName = "CheckedStateChanged";
</span><span class="cx"> else if (!g_strcmp0(g_value_get_string(&paramValues[1]), "invalid-entry"))
</span><span class="cx"> notificationName = "AXInvalidStatusChanged";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "focus-event")) {
</span><del>- signalName.set(g_strdup("focus-event"));
- signalValue.set(g_strdup_printf("%d", g_value_get_boolean(&paramValues[1])));
</del><ins>+ signalName.reset(g_strdup("focus-event"));
+ signalValue.reset(g_strdup_printf("%d", g_value_get_boolean(&paramValues[1])));
</ins><span class="cx"> if (g_value_get_boolean(&paramValues[1]))
</span><span class="cx"> notificationName = "AXFocusedUIElementChanged";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "children-changed")) {
</span><span class="cx"> const gchar* childrenChangedDetail = g_quark_to_string(signalHint->detail);
</span><del>- signalName.set(g_strdup_printf("children-changed:%s", childrenChangedDetail));
- signalValue.set(g_strdup_printf("%d", g_value_get_uint(&paramValues[1])));
</del><ins>+ signalName.reset(g_strdup_printf("children-changed:%s", childrenChangedDetail));
+ signalValue.reset(g_strdup_printf("%d", g_value_get_uint(&paramValues[1])));
</ins><span class="cx"> notificationName = !g_strcmp0(childrenChangedDetail, "add") ? "AXChildrenAdded" : "AXChildrenRemoved";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "property-change")) {
</span><del>- signalName.set(g_strdup_printf("property-change:%s", g_quark_to_string(signalHint->detail)));
</del><ins>+ signalName.reset(g_strdup_printf("property-change:%s", g_quark_to_string(signalHint->detail)));
</ins><span class="cx"> if (!g_strcmp0(g_quark_to_string(signalHint->detail), "accessible-value"))
</span><span class="cx"> notificationName = "AXValueChanged";
</span><span class="cx"> } else if (!g_strcmp0(signalQuery.signal_name, "load-complete"))
</span><span class="cx"> notificationName = "AXLoadComplete";
</span><span class="cx"> else
</span><del>- signalName.set(g_strdup(signalQuery.signal_name));
</del><ins>+ signalName.reset(g_strdup(signalQuery.signal_name));
</ins><span class="cx">
</span><span class="cx"> if (loggingAccessibilityEvents)
</span><span class="cx"> printAccessibilityEvent(accessible, signalName.get(), signalValue.get());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> #include <JavaScriptCore/OpaqueJSString.h>
</span><span class="cx"> #include <atk/atk.h>
</span><span class="cx"> #include <wtf/Assertions.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"> #include <wtf/text/StringBuilder.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> String jsStringToWTFString(JSStringRef attribute)
</span><span class="cx"> {
</span><span class="cx"> size_t bufferSize = JSStringGetMaximumUTF8CStringSize(attribute);
</span><del>- GOwnPtr<gchar> buffer(static_cast<gchar*>(g_malloc(bufferSize)));
</del><ins>+ GUniquePtr<gchar> buffer(static_cast<gchar*>(g_malloc(bufferSize)));
</ins><span class="cx"> JSStringGetUTF8CString(attribute, buffer.get(), bufferSize);
</span><span class="cx">
</span><span class="cx"> return String::fromUTF8(buffer.get());
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> StringBuilder builder;
</span><span class="cx"> for (AtkAttributeSet* attributes = attributeSet; attributes; attributes = attributes->next) {
</span><span class="cx"> AtkAttribute* attribute = static_cast<AtkAttribute*>(attributes->data);
</span><del>- GOwnPtr<gchar> attributeData(g_strconcat(attribute->name, ":", attribute->value, NULL));
</del><ins>+ GUniquePtr<gchar> attributeData(g_strconcat(attribute->name, ":", attribute->value, NULL));
</ins><span class="cx"> builder.append(attributeData.get());
</span><span class="cx"> if (attributes->next)
</span><span class="cx"> builder.append(", ");
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx">
</span><span class="cx"> JSStringRef indexRangeInTable(PlatformUIElement element, bool isRowRange)
</span><span class="cx"> {
</span><del>- GOwnPtr<gchar> rangeString(g_strdup("{0, 0}"));
</del><ins>+ GUniquePtr<gchar> rangeString(g_strdup("{0, 0}"));
</ins><span class="cx">
</span><span class="cx"> if (!ATK_IS_OBJECT(element.get()))
</span><span class="cx"> return JSStringCreateWithUTF8CString(rangeString.get());
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> base = column;
</span><span class="cx"> length = atk_table_get_column_extent_at(ATK_TABLE(axTable), row, column);
</span><span class="cx"> }
</span><del>- rangeString.set(g_strdup_printf("{%d, %d}", base, length));
</del><ins>+ rangeString.reset(g_strdup_printf("{%d, %d}", base, length));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(rangeString.get());
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> if (!atk_object_get_role(ATK_OBJECT(m_element.get())))
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<char> roleStringWithPrefix(g_strdup_printf("AXRole: %s", roleToString(ATK_OBJECT(m_element.get()))));
</del><ins>+ GUniquePtr<char> roleStringWithPrefix(g_strdup_printf("AXRole: %s", roleToString(ATK_OBJECT(m_element.get()))));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(roleStringWithPrefix.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><span class="cx"> const gchar* name = atk_object_get_name(ATK_OBJECT(m_element.get()));
</span><del>- GOwnPtr<gchar> axTitle(g_strdup_printf("AXTitle: %s", name ? name : ""));
</del><ins>+ GUniquePtr<gchar> axTitle(g_strdup_printf("AXTitle: %s", name ? name : ""));
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(axTitle.get());
</span><span class="cx"> }
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> if (!description)
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> axDesc(g_strdup_printf("AXDescription: %s", description));
</del><ins>+ GUniquePtr<gchar> axDesc(g_strdup_printf("AXDescription: %s", description));
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(axDesc.get());
</span><span class="cx"> }
</span><span class="lines">@@ -938,9 +938,9 @@
</span><span class="cx"> if (!ATK_IS_TEXT(m_element.get()))
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element.get()), 0, -1));
- GOwnPtr<gchar> textWithReplacedCharacters(replaceCharactersForResults(text.get()));
- GOwnPtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get()));
</del><ins>+ GUniquePtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element.get()), 0, -1));
+ GUniquePtr<gchar> textWithReplacedCharacters(replaceCharactersForResults(text.get()));
+ GUniquePtr<gchar> axValue(g_strdup_printf("AXValue: %s", textWithReplacedCharacters.get()));
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithUTF8CString(axValue.get());
</span><span class="cx"> }
</span><span class="lines">@@ -954,7 +954,7 @@
</span><span class="cx"> if (!locale)
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><del>- GOwnPtr<char> axValue(g_strdup_printf("AXLanguage: %s", locale));
</del><ins>+ GUniquePtr<char> axValue(g_strdup_printf("AXLanguage: %s", locale));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(axValue.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1193,7 +1193,7 @@
</span><span class="cx"> if (index < 0 || index > atk_text_get_character_count(ATK_TEXT(m_element.get())))
</span><span class="cx"> return -1;
</span><span class="cx">
</span><del>- GOwnPtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element.get()), 0, index));
</del><ins>+ GUniquePtr<gchar> text(atk_text_get_text(ATK_TEXT(m_element.get()), 0, index));
</ins><span class="cx"> int lineNo = 0;
</span><span class="cx"> for (gchar* offset = text.get(); *offset; ++offset) {
</span><span class="cx"> if (*offset == '\n')
</span><span class="lines">@@ -1364,7 +1364,7 @@
</span><span class="cx"> gint start, end;
</span><span class="cx"> g_free(atk_text_get_selection(ATK_TEXT(m_element.get()), 0, &start, &end));
</span><span class="cx">
</span><del>- GOwnPtr<gchar> selection(g_strdup_printf("{%d, %d}", start, end - start));
</del><ins>+ GUniquePtr<gchar> selection(g_strdup_printf("{%d, %d}", start, end - start));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(selection.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1441,7 +1441,7 @@
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx">
</span><span class="cx"> AtkHyperlink* hyperlink = atk_hyperlink_impl_get_hyperlink(ATK_HYPERLINK_IMPL(m_element.get()));
</span><del>- GOwnPtr<char> hyperlinkURI(atk_hyperlink_get_uri(hyperlink, 0));
</del><ins>+ GUniquePtr<char> hyperlinkURI(atk_hyperlink_get_uri(hyperlink, 0));
</ins><span class="cx">
</span><span class="cx"> // Build the result string, stripping the absolute URL paths if present.
</span><span class="cx"> char* localURI = g_strstr_len(hyperlinkURI.get(), -1, "LayoutTests");
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkActivateFontsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> #include "InjectedBundleUtilities.h"
</span><span class="cx"> #include <fontconfig/fontconfig.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><ins>+#include <wtf/gobject/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/gobject/GlibUtilities.h>
</span><del>-#include <wtf/gobject/GOwnPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><span class="lines">@@ -61,19 +61,19 @@
</span><span class="cx"> return webkitOutputDir;
</span><span class="cx">
</span><span class="cx"> CString topLevelPath = WTR::topLevelPath();
</span><del>- GOwnPtr<char> outputDir(g_build_filename(topLevelPath.data(), "WebKitBuild", NULL));
</del><ins>+ GUniquePtr<char> outputDir(g_build_filename(topLevelPath.data(), "WebKitBuild", nullptr));
</ins><span class="cx"> return outputDir.get();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static CString getFontsPath()
</span><span class="cx"> {
</span><span class="cx"> CString webkitOutputDir = getOutputDir();
</span><del>- GOwnPtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", NULL));
</del><ins>+ GUniquePtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", nullptr));
</ins><span class="cx"> if (g_file_test(fontsPath.get(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
</span><span class="cx"> return fontsPath.get();
</span><span class="cx">
</span><span class="cx"> // Try alternative fonts path.
</span><del>- fontsPath.set(g_build_filename(webkitOutputDir.data(), "webkitgtk-test-fonts", NULL));
</del><ins>+ fontsPath.reset(g_build_filename(webkitOutputDir.data(), "webkitgtk-test-fonts", NULL));
</ins><span class="cx"> if (g_file_test(fontsPath.get(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
</span><span class="cx"> return fontsPath.get();
</span><span class="cx">
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> // Load our configuration file, which sets up proper aliases for family
</span><span class="cx"> // names like sans, serif and monospace.
</span><span class="cx"> FcConfig* config = FcConfigCreate();
</span><del>- GOwnPtr<gchar> fontConfigFilename(g_build_filename(FONTS_CONF_DIR, "fonts.conf", NULL));
</del><ins>+ GUniquePtr<gchar> fontConfigFilename(g_build_filename(FONTS_CONF_DIR, "fonts.conf", nullptr));
</ins><span class="cx"> if (!g_file_test(fontConfigFilename.get(), G_FILE_TEST_IS_REGULAR))
</span><span class="cx"> g_error("Cannot find fonts.conf at %s\n", fontConfigFilename.get());
</span><span class="cx"> if (!FcConfigParseAndLoad(config, reinterpret_cast<FcChar8*>(fontConfigFilename.get()), true))
</span><span class="lines">@@ -107,17 +107,17 @@
</span><span class="cx"> if (fontsPath.isNull())
</span><span class="cx"> g_error("Could not locate test fonts at %s. Is WEBKIT_TOP_LEVEL set?", fontsPath.data());
</span><span class="cx">
</span><del>- GOwnPtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, 0));
</del><ins>+ GUniquePtr<GDir> fontsDirectory(g_dir_open(fontsPath.data(), 0, nullptr));
</ins><span class="cx"> while (const char* directoryEntry = g_dir_read_name(fontsDirectory.get())) {
</span><span class="cx"> if (!g_str_has_suffix(directoryEntry, ".ttf") && !g_str_has_suffix(directoryEntry, ".otf"))
</span><span class="cx"> continue;
</span><del>- GOwnPtr<gchar> fontPath(g_build_filename(fontsPath.data(), directoryEntry, NULL));
</del><ins>+ GUniquePtr<gchar> fontPath(g_build_filename(fontsPath.data(), directoryEntry, nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<const FcChar8*>(fontPath.get())))
</span><span class="cx"> g_error("Could not load font at %s!", fontPath.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Ahem is used by many layout tests.
</span><del>- GOwnPtr<gchar> ahemFontFilename(g_build_filename(FONTS_CONF_DIR, "AHEM____.TTF", NULL));
</del><ins>+ GUniquePtr<gchar> ahemFontFilename(g_build_filename(FONTS_CONF_DIR, "AHEM____.TTF", nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<FcChar8*>(ahemFontFilename.get())))
</span><span class="cx"> g_error("Could not load font at %s!", ahemFontFilename.get());
</span><span class="cx">
</span><span class="lines">@@ -135,13 +135,13 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; fontFilenames[i]; ++i) {
</span><del>- GOwnPtr<gchar> fontFilename(g_build_filename(FONTS_CONF_DIR, "..", "..", "fonts", fontFilenames[i], NULL));
</del><ins>+ GUniquePtr<gchar> fontFilename(g_build_filename(FONTS_CONF_DIR, "..", "..", "fonts", fontFilenames[i], nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<FcChar8*>(fontFilename.get())))
</span><span class="cx"> g_error("Could not load font at %s!", fontFilename.get());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // A font with no valid Fontconfig encoding to test https://bugs.webkit.org/show_bug.cgi?id=47452
</span><del>- GOwnPtr<gchar> fontWithNoValidEncodingFilename(g_build_filename(FONTS_CONF_DIR, "FontWithNoValidEncoding.fon", NULL));
</del><ins>+ GUniquePtr<gchar> fontWithNoValidEncodingFilename(g_build_filename(FONTS_CONF_DIR, "FontWithNoValidEncoding.fon", nullptr));
</ins><span class="cx"> if (!FcConfigAppFontAddFile(config, reinterpret_cast<FcChar8*>(fontWithNoValidEncodingFilename.get())))
</span><span class="cx"> g_error("Could not load font at %s!", fontWithNoValidEncodingFilename.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkInjectedBundleUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "InjectedBundleUtilities.h"
</span><span class="cx">
</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/GlibUtilities.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> // If the environment variable wasn't provided then assume we were built into
</span><span class="cx"> // WebKitBuild/Debug or WebKitBuild/Release. Obviously this will fail if the build
</span><span class="cx"> // directory is non-standard, but we can't do much more about this.
</span><del>- GOwnPtr<char> parentPath(g_path_get_dirname(getCurrentExecutablePath().data()));
- GOwnPtr<char> layoutTestsPath(g_build_filename(parentPath.get(), "..", "..", "..", NULL));
- GOwnPtr<char> absoluteTopLevelPath(realpath(layoutTestsPath.get(), 0));
</del><ins>+ GUniquePtr<char> parentPath(g_path_get_dirname(getCurrentExecutablePath().data()));
+ GUniquePtr<char> layoutTestsPath(g_build_filename(parentPath.get(), "..", "..", "..", nullptr));
+ GUniquePtr<char> absoluteTopLevelPath(realpath(layoutTestsPath.get(), 0));
</ins><span class="cx"> return absoluteTopLevelPath.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "InjectedBundleUtilities.h"
</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">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span><span class="lines">@@ -66,15 +66,15 @@
</span><span class="cx"> JSRetainPtr<JSStringRef> TestRunner::pathToLocalResource(JSStringRef url)
</span><span class="cx"> {
</span><span class="cx"> size_t urlSize = JSStringGetMaximumUTF8CStringSize(url);
</span><del>- GOwnPtr<gchar> urlString(static_cast<gchar*>(g_malloc(urlSize)));
</del><ins>+ GUniquePtr<gchar> urlString(static_cast<gchar*>(g_malloc(urlSize)));
</ins><span class="cx"> JSStringGetUTF8CString(url, urlString.get(), urlSize);
</span><span class="cx">
</span><span class="cx"> if (!g_str_has_prefix(urlString.get(), "file:///tmp/LayoutTests/"))
</span><span class="cx"> return JSStringRetain(url);
</span><span class="cx">
</span><span class="cx"> const gchar* layoutTestsSuffix = urlString.get() + strlen("file:///tmp/");
</span><del>- GOwnPtr<gchar> testPath(g_build_filename(WTR::topLevelPath().data(), layoutTestsSuffix, NULL));
- GOwnPtr<gchar> testURI(g_filename_to_uri(testPath.get(), 0, 0));
</del><ins>+ GUniquePtr<gchar> testPath(g_build_filename(WTR::topLevelPath().data(), layoutTestsSuffix, nullptr));
+ GUniquePtr<gchar> testURI(g_filename_to_uri(testPath.get(), 0, 0));
</ins><span class="cx"> return JSStringCreateWithUTF8CString(testURI.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkTestControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (162598 => 162599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2014-01-23 07:39:58 UTC (rev 162598)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2014-01-23 07:53:48 UTC (rev 162599)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/Platform.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">@@ -88,13 +88,13 @@
</span><span class="cx">
</span><span class="cx"> void TestController::initializeInjectedBundlePath()
</span><span class="cx"> {
</span><del>- GOwnPtr<char> utf8BundlePath(getEnvironmentVariableAsUTF8String("TEST_RUNNER_INJECTED_BUNDLE_FILENAME"));
</del><ins>+ GUniquePtr<char> utf8BundlePath(getEnvironmentVariableAsUTF8String("TEST_RUNNER_INJECTED_BUNDLE_FILENAME"));
</ins><span class="cx"> m_injectedBundlePath.adopt(WKStringCreateWithUTF8CString(utf8BundlePath.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::initializeTestPluginDirectory()
</span><span class="cx"> {
</span><del>- GOwnPtr<char> testPluginPath(getEnvironmentVariableAsUTF8String("TEST_RUNNER_TEST_PLUGIN_PATH"));
</del><ins>+ GUniquePtr<char> testPluginPath(getEnvironmentVariableAsUTF8String("TEST_RUNNER_TEST_PLUGIN_PATH"));
</ins><span class="cx"> m_testPluginDirectory.adopt(WKStringCreateWithUTF8CString(testPluginPath.get()));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>