<!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>[185502] 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/185502">185502</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-06-12 06:32:03 -0700 (Fri, 12 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
https://bugs.webkit.org/show_bug.cgi?id=145799
Reviewed by Carlos Garcia Campos.
Source/WebCore:
Update header inclusions for headers that have been moved
to Source/WTF/wtf/glib/.
* accessibility/atk/AXObjectCacheAtk.cpp:
* accessibility/atk/WebKitAccessibleInterfaceText.cpp:
* bindings/gobject/DOMObjectCache.cpp:
* bindings/gobject/GObjectEventListener.h:
* bindings/gobject/GObjectNodeFilterCondition.h:
* bindings/gobject/GObjectXPathNSResolver.h:
* bindings/gobject/WebKitDOMEventTarget.cpp:
* platform/Pasteboard.h:
* platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
* platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
* platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
* platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
* platform/audio/gtk/AudioBusGtk.cpp:
* platform/geoclue/GeolocationProviderGeoclue.h:
* platform/geoclue/GeolocationProviderGeoclue2.cpp:
* platform/glib/BatteryProviderUPower.cpp:
* platform/glib/BatteryProviderUPower.h:
* platform/graphics/gstreamer/GRefPtrGStreamer.h:
* platform/graphics/gstreamer/GStreamerUtilities.cpp:
* platform/graphics/gstreamer/GUniquePtrGStreamer.h:
* platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
* platform/graphics/gstreamer/MediaSourceGStreamer.cpp:
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h:
* platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
* platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
* platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
* platform/graphics/gtk/ImageBufferGtk.cpp:
* platform/graphics/gtk/ImageGtk.cpp:
* platform/gtk/ContextMenuGtk.cpp:
* platform/gtk/ContextMenuItemGtk.cpp:
* platform/gtk/DataObjectGtk.cpp:
* platform/gtk/DataObjectGtk.h:
* platform/gtk/FileSystemGtk.cpp:
* platform/gtk/GRefPtrGtk.h:
* platform/gtk/GUniquePtrGtk.h:
* platform/gtk/GamepadsGtk.cpp:
* platform/gtk/GtkUtilities.cpp:
* platform/gtk/LanguageGtk.cpp:
* platform/gtk/LocalizedStringsGtk.cpp:
* platform/gtk/PasteboardHelper.cpp:
* platform/gtk/ScrollbarThemeGtk.cpp:
* platform/gtk/SharedBufferGtk.cpp:
* platform/gtk/SharedTimerGtk.cpp:
* platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
* platform/network/ResourceHandleInternal.h:
* platform/network/gtk/CredentialBackingStore.cpp:
* platform/network/soup/CertificateInfo.h:
* platform/network/soup/CookieJarSoup.cpp:
* platform/network/soup/DNSSoup.cpp:
* platform/network/soup/GRefPtrSoup.h:
* platform/network/soup/GUniquePtrSoup.h:
* platform/network/soup/ResourceError.h:
* platform/network/soup/ResourceErrorSoup.cpp:
* platform/network/soup/ResourceHandleSoup.cpp:
* platform/network/soup/ResourceResponse.h:
* platform/network/soup/SocketStreamHandle.h:
* platform/network/soup/SocketStreamHandleSoup.cpp:
* platform/network/soup/SoupNetworkSession.h:
* platform/text/gtk/HyphenationLibHyphen.cpp:
* rendering/RenderThemeGtk.cpp:
Source/WebKit2:
Update header inclusions for headers that have been moved
to Source/WTF/wtf/glib/.
* NetworkProcess/cache/NetworkCacheFileSystemPosix.h:
* NetworkProcess/cache/NetworkCacheIOChannel.h:
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
* NetworkProcess/soup/NetworkProcessSoup.cpp:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* Shared/Downloads/soup/DownloadSoup.cpp:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
* Shared/PrintInfo.h:
* Shared/gtk/ArgumentCodersGtk.cpp:
* Shared/gtk/ArgumentCodersGtk.h:
* Shared/gtk/KeyedDecoder.h:
* Shared/gtk/KeyedEncoder.h:
* Shared/gtk/ProcessExecutablePathGtk.cpp:
* UIProcess/API/gtk/WebKitBackForwardList.cpp:
* UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
* UIProcess/API/gtk/WebKitColorChooser.h:
* UIProcess/API/gtk/WebKitContextMenu.cpp:
* UIProcess/API/gtk/WebKitContextMenuItem.cpp:
* UIProcess/API/gtk/WebKitCookieManager.cpp:
* UIProcess/API/gtk/WebKitDownload.cpp:
* UIProcess/API/gtk/WebKitDownloadClient.cpp:
* UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
* UIProcess/API/gtk/WebKitFindController.cpp:
* UIProcess/API/gtk/WebKitFormClient.cpp:
* UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
* UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
* UIProcess/API/gtk/WebKitJavascriptResult.cpp:
* UIProcess/API/gtk/WebKitLoaderClient.cpp:
* UIProcess/API/gtk/WebKitMimeInfo.cpp:
* UIProcess/API/gtk/WebKitNavigationAction.cpp:
* UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
* UIProcess/API/gtk/WebKitPolicyClient.cpp:
* UIProcess/API/gtk/WebKitPrintOperation.cpp:
* UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
* UIProcess/API/gtk/WebKitUIClient.cpp:
* UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
* UIProcess/API/gtk/WebKitUserContentManager.cpp:
* UIProcess/API/gtk/WebKitWebContext.cpp:
* UIProcess/API/gtk/WebKitWebInspector.cpp:
* UIProcess/API/gtk/WebKitWebResource.cpp:
* UIProcess/API/gtk/WebKitWebView.cpp:
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
* UIProcess/InspectorServer/WebSocketServer.h:
* UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
* UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
* UIProcess/Plugins/gtk/PluginInfoCache.h:
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
* UIProcess/gtk/DragAndDropHandler.cpp:
* UIProcess/gtk/GestureController.h:
* UIProcess/gtk/InputMethodFilter.cpp:
* UIProcess/gtk/InputMethodFilter.h:
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
* UIProcess/gtk/WebPopupMenuProxyGtk.h:
* UIProcess/gtk/WebProcessPoolGtk.cpp:
* WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
* WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
* WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp:
* WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
* WebProcess/WebPage/gtk/PrinterListGtk.h:
* WebProcess/WebPage/gtk/WebPageGtk.cpp:
* WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
* WebProcess/WebPage/gtk/WebPrintOperationGtk.h:
* WebProcess/gtk/WebGtkExtensionManager.h:
* WebProcess/soup/WebKitSoupRequestInputStream.cpp:
* WebProcess/soup/WebProcessSoup.cpp:
* WebProcess/soup/WebSoupRequestManager.h:
Source/WTF:
Move the GLib-specific files to the Source/WTF/wtf/glib/ directory.
'gobject' wasn't the most appropriate name for the directory since
GObject is a submodule of GLib, but a lot of the code there didn't
have much to do with GObject specifically.
Build rules for the moved files are also updated.
* WTF.vcxproj/WTF.vcxproj:
* WTF.vcxproj/WTF.vcxproj.filters:
* wtf/Platform.h:
* wtf/PlatformEfl.cmake:
* wtf/PlatformGTK.cmake:
* wtf/RunLoop.h:
* wtf/WorkQueue.h:
* wtf/glib/GLibUtilities.cpp: Renamed from Source/WTF/wtf/gobject/GlibUtilities.cpp.
(getCurrentExecutablePath):
* wtf/glib/GLibUtilities.h: Renamed from Source/WTF/wtf/gobject/GlibUtilities.h.
* wtf/glib/GMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.cpp.
(WTF::GMainLoopSource::create):
(WTF::GMainLoopSource::GMainLoopSource):
(WTF::GMainLoopSource::~GMainLoopSource):
(WTF::GMainLoopSource::isScheduled):
(WTF::GMainLoopSource::isActive):
(WTF::GMainLoopSource::cancel):
(WTF::GMainLoopSource::scheduleIdleSource):
(WTF::GMainLoopSource::schedule):
(WTF::GMainLoopSource::scheduleTimeoutSource):
(WTF::GMainLoopSource::scheduleAfterDelay):
(WTF::createMicrosecondsTimeoutSource):
(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy):
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy):
(WTF::GMainLoopSource::prepareVoidCallback):
(WTF::GMainLoopSource::finishVoidCallback):
(WTF::GMainLoopSource::voidCallback):
(WTF::GMainLoopSource::prepareBoolCallback):
(WTF::GMainLoopSource::finishBoolCallback):
(WTF::GMainLoopSource::boolCallback):
(WTF::GMainLoopSource::socketCallback):
(WTF::GMainLoopSource::voidSourceCallback):
(WTF::GMainLoopSource::boolSourceCallback):
(WTF::GMainLoopSource::socketSourceCallback):
(WTF::GMainLoopSource::Context::destroySource):
* wtf/glib/GMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.h.
(WTF::GMainLoopSource::Context::operator=):
* wtf/glib/GMutexLocker.h: Renamed from Source/WTF/wtf/gobject/GMutexLocker.h.
(WTF::MutexWrapper<GMutex>::lock):
(WTF::MutexWrapper<GMutex>::unlock):
(WTF::MutexWrapper<GRecMutex>::lock):
(WTF::MutexWrapper<GRecMutex>::unlock):
(WTF::GMutexLocker::GMutexLocker):
(WTF::GMutexLocker::~GMutexLocker):
(WTF::GMutexLocker::lock):
(WTF::GMutexLocker::unlock):
* wtf/glib/GRefPtr.cpp: Renamed from Source/WTF/wtf/gobject/GRefPtr.cpp.
(WTF::refGPtr):
(WTF::derefGPtr):
* wtf/glib/GRefPtr.h: Renamed from Source/WTF/wtf/gobject/GRefPtr.h.
(WTF::GRefPtr::GRefPtr):
(WTF::GRefPtr::~GRefPtr):
(WTF::GRefPtr::clear):
(WTF::GRefPtr::outPtr):
(WTF::GRefPtr::isHashTableDeletedValue):
(WTF::GRefPtr::get):
(WTF::GRefPtr::operator*):
(WTF::GRefPtr::operator->):
(WTF::GRefPtr::operator!):
(WTF::GRefPtr::operator UnspecifiedBoolType):
(WTF::GRefPtr::hashTableDeletedValue):
(WTF::=):
(WTF::GRefPtr<T>::swap):
(WTF::swap):
(WTF::operator==):
(WTF::operator!=):
(WTF::static_pointer_cast):
(WTF::const_pointer_cast):
(WTF::adoptGRef):
(WTF::refGPtr):
(WTF::derefGPtr):
* wtf/glib/GThreadSafeMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp.
(WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource):
(WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource):
(WTF::GThreadSafeMainLoopSource::cancel):
(WTF::GThreadSafeMainLoopSource::schedule):
(WTF::GThreadSafeMainLoopSource::scheduleAfterDelay):
(WTF::GThreadSafeMainLoopSource::prepareVoidCallback):
(WTF::GThreadSafeMainLoopSource::finishVoidCallback):
(WTF::GThreadSafeMainLoopSource::voidCallback):
(WTF::GThreadSafeMainLoopSource::prepareBoolCallback):
(WTF::GThreadSafeMainLoopSource::finishBoolCallback):
(WTF::GThreadSafeMainLoopSource::boolCallback):
* wtf/glib/GThreadSafeMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.h.
* wtf/glib/GTypedefs.h: Renamed from Source/WTF/wtf/gobject/GTypedefs.h.
* wtf/glib/GUniquePtr.h: Renamed from Source/WTF/wtf/gobject/GUniquePtr.h.
(WTF::GPtrDeleter::operator()):
(WTF::GUniqueOutPtr::GUniqueOutPtr):
(WTF::GUniqueOutPtr::~GUniqueOutPtr):
(WTF::GUniqueOutPtr::outPtr):
(WTF::GUniqueOutPtr::release):
(WTF::GUniqueOutPtr::operator*):
(WTF::GUniqueOutPtr::operator->):
(WTF::GUniqueOutPtr::get):
(WTF::GUniqueOutPtr::operator!):
(WTF::GUniqueOutPtr::operator UnspecifiedBoolType):
(WTF::GUniqueOutPtr::reset):
* wtf/glib/MainThreadGLib.cpp:
* wtf/gobject/GMainLoopSource.cpp:
(WTF::GMainLoopSource::create): Deleted.
(WTF::GMainLoopSource::GMainLoopSource): Deleted.
(WTF::GMainLoopSource::~GMainLoopSource): Deleted.
(WTF::GMainLoopSource::isScheduled): Deleted.
(WTF::GMainLoopSource::isActive): Deleted.
(WTF::GMainLoopSource::cancel): Deleted.
(WTF::GMainLoopSource::scheduleIdleSource): Deleted.
(WTF::GMainLoopSource::schedule): Deleted.
(WTF::GMainLoopSource::scheduleTimeoutSource): Deleted.
(WTF::GMainLoopSource::scheduleAfterDelay): Deleted.
(WTF::createMicrosecondsTimeoutSource): Deleted.
(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): Deleted.
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Deleted.
(WTF::GMainLoopSource::prepareVoidCallback): Deleted.
(WTF::GMainLoopSource::finishVoidCallback): Deleted.
(WTF::GMainLoopSource::voidCallback): Deleted.
(WTF::GMainLoopSource::prepareBoolCallback): Deleted.
(WTF::GMainLoopSource::finishBoolCallback): Deleted.
(WTF::GMainLoopSource::boolCallback): Deleted.
(WTF::GMainLoopSource::socketCallback): Deleted.
(WTF::GMainLoopSource::voidSourceCallback): Deleted.
(WTF::GMainLoopSource::boolSourceCallback): Deleted.
(WTF::GMainLoopSource::socketSourceCallback): Deleted.
(WTF::GMainLoopSource::Context::destroySource): Deleted.
* wtf/gobject/GMainLoopSource.h:
(WTF::GMainLoopSource::Context::operator=): Deleted.
* wtf/gobject/GMutexLocker.h:
(WTF::MutexWrapper<GMutex>::lock): Deleted.
(WTF::MutexWrapper<GMutex>::unlock): Deleted.
(WTF::MutexWrapper<GRecMutex>::lock): Deleted.
(WTF::MutexWrapper<GRecMutex>::unlock): Deleted.
(WTF::GMutexLocker::GMutexLocker): Deleted.
(WTF::GMutexLocker::~GMutexLocker): Deleted.
(WTF::GMutexLocker::lock): Deleted.
(WTF::GMutexLocker::unlock): Deleted.
* wtf/gobject/GRefPtr.cpp:
(WTF::refGPtr): Deleted.
(WTF::derefGPtr): Deleted.
* wtf/gobject/GRefPtr.h:
(WTF::GRefPtr::GRefPtr): Deleted.
(WTF::GRefPtr::~GRefPtr): Deleted.
(WTF::GRefPtr::clear): Deleted.
(WTF::GRefPtr::outPtr): Deleted.
(WTF::GRefPtr::isHashTableDeletedValue): Deleted.
(WTF::GRefPtr::get): Deleted.
(WTF::GRefPtr::operator*): Deleted.
(WTF::GRefPtr::operator->): Deleted.
(WTF::GRefPtr::operator!): Deleted.
(WTF::GRefPtr::operator UnspecifiedBoolType): Deleted.
(WTF::GRefPtr::hashTableDeletedValue): Deleted.
(WTF::=): Deleted.
(WTF::GRefPtr<T>::swap): Deleted.
(WTF::swap): Deleted.
(WTF::operator==): Deleted.
(WTF::operator!=): Deleted.
(WTF::static_pointer_cast): Deleted.
(WTF::const_pointer_cast): Deleted.
(WTF::adoptGRef): Deleted.
(WTF::refGPtr): Deleted.
(WTF::derefGPtr): Deleted.
* wtf/gobject/GThreadSafeMainLoopSource.cpp:
(WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource): Deleted.
(WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource): Deleted.
(WTF::GThreadSafeMainLoopSource::cancel): Deleted.
(WTF::GThreadSafeMainLoopSource::schedule): Deleted.
(WTF::GThreadSafeMainLoopSource::scheduleAfterDelay): Deleted.
(WTF::GThreadSafeMainLoopSource::prepareVoidCallback): Deleted.
(WTF::GThreadSafeMainLoopSource::finishVoidCallback): Deleted.
(WTF::GThreadSafeMainLoopSource::voidCallback): Deleted.
(WTF::GThreadSafeMainLoopSource::prepareBoolCallback): Deleted.
(WTF::GThreadSafeMainLoopSource::finishBoolCallback): Deleted.
(WTF::GThreadSafeMainLoopSource::boolCallback): Deleted.
* wtf/gobject/GUniquePtr.h:
(WTF::GPtrDeleter::operator()): Deleted.
(WTF::GUniqueOutPtr::GUniqueOutPtr): Deleted.
(WTF::GUniqueOutPtr::~GUniqueOutPtr): Deleted.
(WTF::GUniqueOutPtr::outPtr): Deleted.
(WTF::GUniqueOutPtr::release): Deleted.
(WTF::GUniqueOutPtr::operator*): Deleted.
(WTF::GUniqueOutPtr::operator->): Deleted.
(WTF::GUniqueOutPtr::get): Deleted.
(WTF::GUniqueOutPtr::operator!): Deleted.
(WTF::GUniqueOutPtr::operator UnspecifiedBoolType): Deleted.
(WTF::GUniqueOutPtr::reset): Deleted.
* wtf/gobject/GlibUtilities.cpp:
(getCurrentExecutablePath): Deleted.
Tools:
Update header inclusions for headers that have been moved
to Source/WTF/wtf/glib/.
Also move the unit tests under TestWebKitAPI/Tests/WTF/gobject/
to TestWebKitAPI/Tests/WTF/glib/ and update the build rules.
* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp.
(TestWebKitAPI::GMainLoopSourceTest::GMainLoopSourceTest):
(TestWebKitAPI::GMainLoopSourceTest::~GMainLoopSourceTest):
(TestWebKitAPI::GMainLoopSourceTest::runLoop):
(TestWebKitAPI::GMainLoopSourceTest::delayedFinish):
(TestWebKitAPI::GMainLoopSourceTest::finish):
(TestWebKitAPI::GMainLoopSourceTest::source):
(TestWebKitAPI::basicRescheduling):
(TestWebKitAPI::TEST):
(TestWebKitAPI::reentrantRescheduling):
(TestWebKitAPI::cancelRepeatingSourceDuringDispatch):
(TestWebKitAPI::basicDestroyCallbacks):
(TestWebKitAPI::destroyCallbacksAfterCancellingDuringDispatch):
(TestWebKitAPI::destroyCallbacksAfterReschedulingDuringDispatch):
* TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp.
(log):
(takeLogStr):
(TestWebKitAPI::TEST):
(TestWebKitAPI::returnOutChar):
* TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp:
* TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp:
(TestWebKitAPI::GMainLoopSourceTest::GMainLoopSourceTest): Deleted.
(TestWebKitAPI::GMainLoopSourceTest::~GMainLoopSourceTest): Deleted.
(TestWebKitAPI::GMainLoopSourceTest::runLoop): Deleted.
(TestWebKitAPI::GMainLoopSourceTest::delayedFinish): Deleted.
(TestWebKitAPI::GMainLoopSourceTest::finish): Deleted.
(TestWebKitAPI::GMainLoopSourceTest::source): Deleted.
(TestWebKitAPI::basicRescheduling): Deleted.
(TestWebKitAPI::TEST): Deleted.
(TestWebKitAPI::reentrantRescheduling): Deleted.
(TestWebKitAPI::cancelRepeatingSourceDuringDispatch): Deleted.
(TestWebKitAPI::basicDestroyCallbacks): Deleted.
(TestWebKitAPI::destroyCallbacksAfterCancellingDuringDispatch): Deleted.
(TestWebKitAPI::destroyCallbacksAfterReschedulingDuringDispatch): Deleted.
* TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp:
(log): Deleted.
(takeLogStr): Deleted.
(TestWebKitAPI::TEST): Deleted.
(TestWebKitAPI::returnOutChar): Deleted.
* TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp:
* TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h:
* TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:
* TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
* TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp:
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h:
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp:
* TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h:
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/TestRunner.h:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h:
* WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
* WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
* WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp:
* WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
* WebKitTestRunner/PlatformGTK.cmake:
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
* WebKitTestRunner/gtk/TestControllerGtk.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojcopyfilescmd">trunk/Source/WTF/WTF.vcxproj/copy-files.cmd</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformEflcmake">trunk/Source/WTF/wtf/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWTFwtfPlatformGTKcmake">trunk/Source/WTF/wtf/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#trunkSourceWTFwtfglibMainThreadGLibcpp">trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorebindingsgobjectDOMObjectCachecpp">trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectGObjectEventListenerh">trunk/Source/WebCore/bindings/gobject/GObjectEventListener.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectGObjectNodeFilterConditionh">trunk/Source/WebCore/bindings/gobject/GObjectNodeFilterCondition.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectGObjectXPathNSResolverh">trunk/Source/WebCore/bindings/gobject/GObjectXPathNSResolver.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMEventTargetcpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformPasteboardh">trunk/Source/WebCore/platform/Pasteboard.h</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerAudioDestinationGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformaudiogstreamerAudioSourceProviderGStreamercpp">trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp</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="#trunkSourceWebCoreplatformgeoclueGeolocationProviderGeoclueh">trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgeoclueGeolocationProviderGeoclue2cpp">trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue2.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformglibBatteryProviderUPowercpp">trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformglibBatteryProviderUPowerh">trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp">trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerGUniquePtrGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh">trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamerh">trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp">trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.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="#trunkSourceWebCoreplatformgtkDataObjectGtkh">trunk/Source/WebCore/platform/gtk/DataObjectGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkFileSystemGtkcpp">trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGRefPtrGtkh">trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGUniquePtrGtkh">trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGamepadsGtkcpp">trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkGtkUtilitiescpp">trunk/Source/WebCore/platform/gtk/GtkUtilities.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="#trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp">trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSharedBufferGtkcpp">trunk/Source/WebCore/platform/gtk/SharedBufferGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgtkSharedTimerGtkcpp">trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp">trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.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="#trunkSourceWebCoreplatformnetworksoupCertificateInfoh">trunk/Source/WebCore/platform/network/soup/CertificateInfo.h</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="#trunkSourceWebCoreplatformnetworksoupGRefPtrSouph">trunk/Source/WebCore/platform/network/soup/GRefPtrSoup.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupGUniquePtrSouph">trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupResourceErrorh">trunk/Source/WebCore/platform/network/soup/ResourceError.h</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="#trunkSourceWebCoreplatformnetworksoupResourceResponseh">trunk/Source/WebCore/platform/network/soup/ResourceResponse.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextgtkHyphenationLibHyphencpp">trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformEflcmake">trunk/Source/WebKit2/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp">trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplh">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h</a></li>
<li><a href="#trunkSourceWebKit2SharedPrintInfoh">trunk/Source/WebKit2/Shared/PrintInfo.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkArgumentCodersGtkh">trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkKeyedDecoderh">trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkKeyedEncoderh">trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp">trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListItemcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitColorChooserh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenucpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuItemcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFaviconDatabasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFormClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitFormSubmissionRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitJavascriptResultcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitLoaderClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitMimeInfocpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationActioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitResponsePolicyDecisioncpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUserContentManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebInspectorcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebResourcecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.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="#trunkSourceWebKit2UIProcessInspectorServerWebSocketServerh">trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h</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="#trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCacheh">trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp">trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp">trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkGestureControllerh">trunk/Source/WebKit2/UIProcess/gtk/GestureController.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkInputMethodFiltercpp">trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkInputMethodFilterh">trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.h</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="#trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkh">trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiessoupWebCookieManagerSoupcpp">trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebExtensioncpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebHitTestResultcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportgtkWebEditorClientGtkcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h</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="#trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkh">trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh">trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebKitSoupRequestInputStreamcpp">trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebSoupRequestManagerh">trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIPlatformGTKcmake">trunk/Tools/TestWebKitAPI/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFglibWorkQueueGLibcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2gtkInputMethodFiltercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeFilterTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkDOMXPathNSResolverTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestAuthenticationcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestContextMenucpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestDownloadscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestInspectorcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.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="#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="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitFindControllercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitPolicyClientcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitSettingscpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitUserContentManagercpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.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="#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="#trunkToolsTestWebKitAPITestsWebKit2GtkWebProcessTestcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkWebProcessTesth">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h</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="#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="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBush">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServercpp">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServerh">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh">trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh">trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.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="#trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkh">trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h</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="#trunkToolsWebKitTestRunnerPlatformGTKcmake">trunk/Tools/WebKitTestRunner/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkEventSenderProxyGtkcpp">trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkTestControllerGtkcpp">trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfglibGLibUtilitiescpp">trunk/Source/WTF/wtf/glib/GLibUtilities.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibGLibUtilitiesh">trunk/Source/WTF/wtf/glib/GLibUtilities.h</a></li>
<li><a href="#trunkSourceWTFwtfglibGMainLoopSourcecpp">trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibGMainLoopSourceh">trunk/Source/WTF/wtf/glib/GMainLoopSource.h</a></li>
<li><a href="#trunkSourceWTFwtfglibGMutexLockerh">trunk/Source/WTF/wtf/glib/GMutexLocker.h</a></li>
<li><a href="#trunkSourceWTFwtfglibGRefPtrcpp">trunk/Source/WTF/wtf/glib/GRefPtr.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibGRefPtrh">trunk/Source/WTF/wtf/glib/GRefPtr.h</a></li>
<li><a href="#trunkSourceWTFwtfglibGThreadSafeMainLoopSourcecpp">trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.cpp</a></li>
<li><a href="#trunkSourceWTFwtfglibGThreadSafeMainLoopSourceh">trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.h</a></li>
<li><a href="#trunkSourceWTFwtfglibGTypedefsh">trunk/Source/WTF/wtf/glib/GTypedefs.h</a></li>
<li><a href="#trunkSourceWTFwtfglibGUniquePtrh">trunk/Source/WTF/wtf/glib/GUniquePtr.h</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFglibGMainLoopSourcecpp">trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFglibGUniquePtrcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/Source/WTF/wtf/gobject/</li>
<li>trunk/Tools/TestWebKitAPI/Tests/WTF/gobject/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/ChangeLog 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -1,3 +1,203 @@
</span><ins>+2015-06-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
+ https://bugs.webkit.org/show_bug.cgi?id=145799
+
+ Reviewed by Carlos Garcia Campos.
+
+ Move the GLib-specific files to the Source/WTF/wtf/glib/ directory.
+ 'gobject' wasn't the most appropriate name for the directory since
+ GObject is a submodule of GLib, but a lot of the code there didn't
+ have much to do with GObject specifically.
+
+ Build rules for the moved files are also updated.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTF.vcxproj.filters:
+ * wtf/Platform.h:
+ * wtf/PlatformEfl.cmake:
+ * wtf/PlatformGTK.cmake:
+ * wtf/RunLoop.h:
+ * wtf/WorkQueue.h:
+ * wtf/glib/GLibUtilities.cpp: Renamed from Source/WTF/wtf/gobject/GlibUtilities.cpp.
+ (getCurrentExecutablePath):
+ * wtf/glib/GLibUtilities.h: Renamed from Source/WTF/wtf/gobject/GlibUtilities.h.
+ * wtf/glib/GMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.cpp.
+ (WTF::GMainLoopSource::create):
+ (WTF::GMainLoopSource::GMainLoopSource):
+ (WTF::GMainLoopSource::~GMainLoopSource):
+ (WTF::GMainLoopSource::isScheduled):
+ (WTF::GMainLoopSource::isActive):
+ (WTF::GMainLoopSource::cancel):
+ (WTF::GMainLoopSource::scheduleIdleSource):
+ (WTF::GMainLoopSource::schedule):
+ (WTF::GMainLoopSource::scheduleTimeoutSource):
+ (WTF::GMainLoopSource::scheduleAfterDelay):
+ (WTF::createMicrosecondsTimeoutSource):
+ (WTF::GMainLoopSource::scheduleAndDeleteOnDestroy):
+ (WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy):
+ (WTF::GMainLoopSource::prepareVoidCallback):
+ (WTF::GMainLoopSource::finishVoidCallback):
+ (WTF::GMainLoopSource::voidCallback):
+ (WTF::GMainLoopSource::prepareBoolCallback):
+ (WTF::GMainLoopSource::finishBoolCallback):
+ (WTF::GMainLoopSource::boolCallback):
+ (WTF::GMainLoopSource::socketCallback):
+ (WTF::GMainLoopSource::voidSourceCallback):
+ (WTF::GMainLoopSource::boolSourceCallback):
+ (WTF::GMainLoopSource::socketSourceCallback):
+ (WTF::GMainLoopSource::Context::destroySource):
+ * wtf/glib/GMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.h.
+ (WTF::GMainLoopSource::Context::operator=):
+ * wtf/glib/GMutexLocker.h: Renamed from Source/WTF/wtf/gobject/GMutexLocker.h.
+ (WTF::MutexWrapper<GMutex>::lock):
+ (WTF::MutexWrapper<GMutex>::unlock):
+ (WTF::MutexWrapper<GRecMutex>::lock):
+ (WTF::MutexWrapper<GRecMutex>::unlock):
+ (WTF::GMutexLocker::GMutexLocker):
+ (WTF::GMutexLocker::~GMutexLocker):
+ (WTF::GMutexLocker::lock):
+ (WTF::GMutexLocker::unlock):
+ * wtf/glib/GRefPtr.cpp: Renamed from Source/WTF/wtf/gobject/GRefPtr.cpp.
+ (WTF::refGPtr):
+ (WTF::derefGPtr):
+ * wtf/glib/GRefPtr.h: Renamed from Source/WTF/wtf/gobject/GRefPtr.h.
+ (WTF::GRefPtr::GRefPtr):
+ (WTF::GRefPtr::~GRefPtr):
+ (WTF::GRefPtr::clear):
+ (WTF::GRefPtr::outPtr):
+ (WTF::GRefPtr::isHashTableDeletedValue):
+ (WTF::GRefPtr::get):
+ (WTF::GRefPtr::operator*):
+ (WTF::GRefPtr::operator->):
+ (WTF::GRefPtr::operator!):
+ (WTF::GRefPtr::operator UnspecifiedBoolType):
+ (WTF::GRefPtr::hashTableDeletedValue):
+ (WTF::=):
+ (WTF::GRefPtr<T>::swap):
+ (WTF::swap):
+ (WTF::operator==):
+ (WTF::operator!=):
+ (WTF::static_pointer_cast):
+ (WTF::const_pointer_cast):
+ (WTF::adoptGRef):
+ (WTF::refGPtr):
+ (WTF::derefGPtr):
+ * wtf/glib/GThreadSafeMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp.
+ (WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource):
+ (WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource):
+ (WTF::GThreadSafeMainLoopSource::cancel):
+ (WTF::GThreadSafeMainLoopSource::schedule):
+ (WTF::GThreadSafeMainLoopSource::scheduleAfterDelay):
+ (WTF::GThreadSafeMainLoopSource::prepareVoidCallback):
+ (WTF::GThreadSafeMainLoopSource::finishVoidCallback):
+ (WTF::GThreadSafeMainLoopSource::voidCallback):
+ (WTF::GThreadSafeMainLoopSource::prepareBoolCallback):
+ (WTF::GThreadSafeMainLoopSource::finishBoolCallback):
+ (WTF::GThreadSafeMainLoopSource::boolCallback):
+ * wtf/glib/GThreadSafeMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.h.
+ * wtf/glib/GTypedefs.h: Renamed from Source/WTF/wtf/gobject/GTypedefs.h.
+ * wtf/glib/GUniquePtr.h: Renamed from Source/WTF/wtf/gobject/GUniquePtr.h.
+ (WTF::GPtrDeleter::operator()):
+ (WTF::GUniqueOutPtr::GUniqueOutPtr):
+ (WTF::GUniqueOutPtr::~GUniqueOutPtr):
+ (WTF::GUniqueOutPtr::outPtr):
+ (WTF::GUniqueOutPtr::release):
+ (WTF::GUniqueOutPtr::operator*):
+ (WTF::GUniqueOutPtr::operator->):
+ (WTF::GUniqueOutPtr::get):
+ (WTF::GUniqueOutPtr::operator!):
+ (WTF::GUniqueOutPtr::operator UnspecifiedBoolType):
+ (WTF::GUniqueOutPtr::reset):
+ * wtf/glib/MainThreadGLib.cpp:
+ * wtf/gobject/GMainLoopSource.cpp:
+ (WTF::GMainLoopSource::create): Deleted.
+ (WTF::GMainLoopSource::GMainLoopSource): Deleted.
+ (WTF::GMainLoopSource::~GMainLoopSource): Deleted.
+ (WTF::GMainLoopSource::isScheduled): Deleted.
+ (WTF::GMainLoopSource::isActive): Deleted.
+ (WTF::GMainLoopSource::cancel): Deleted.
+ (WTF::GMainLoopSource::scheduleIdleSource): Deleted.
+ (WTF::GMainLoopSource::schedule): Deleted.
+ (WTF::GMainLoopSource::scheduleTimeoutSource): Deleted.
+ (WTF::GMainLoopSource::scheduleAfterDelay): Deleted.
+ (WTF::createMicrosecondsTimeoutSource): Deleted.
+ (WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): Deleted.
+ (WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Deleted.
+ (WTF::GMainLoopSource::prepareVoidCallback): Deleted.
+ (WTF::GMainLoopSource::finishVoidCallback): Deleted.
+ (WTF::GMainLoopSource::voidCallback): Deleted.
+ (WTF::GMainLoopSource::prepareBoolCallback): Deleted.
+ (WTF::GMainLoopSource::finishBoolCallback): Deleted.
+ (WTF::GMainLoopSource::boolCallback): Deleted.
+ (WTF::GMainLoopSource::socketCallback): Deleted.
+ (WTF::GMainLoopSource::voidSourceCallback): Deleted.
+ (WTF::GMainLoopSource::boolSourceCallback): Deleted.
+ (WTF::GMainLoopSource::socketSourceCallback): Deleted.
+ (WTF::GMainLoopSource::Context::destroySource): Deleted.
+ * wtf/gobject/GMainLoopSource.h:
+ (WTF::GMainLoopSource::Context::operator=): Deleted.
+ * wtf/gobject/GMutexLocker.h:
+ (WTF::MutexWrapper<GMutex>::lock): Deleted.
+ (WTF::MutexWrapper<GMutex>::unlock): Deleted.
+ (WTF::MutexWrapper<GRecMutex>::lock): Deleted.
+ (WTF::MutexWrapper<GRecMutex>::unlock): Deleted.
+ (WTF::GMutexLocker::GMutexLocker): Deleted.
+ (WTF::GMutexLocker::~GMutexLocker): Deleted.
+ (WTF::GMutexLocker::lock): Deleted.
+ (WTF::GMutexLocker::unlock): Deleted.
+ * wtf/gobject/GRefPtr.cpp:
+ (WTF::refGPtr): Deleted.
+ (WTF::derefGPtr): Deleted.
+ * wtf/gobject/GRefPtr.h:
+ (WTF::GRefPtr::GRefPtr): Deleted.
+ (WTF::GRefPtr::~GRefPtr): Deleted.
+ (WTF::GRefPtr::clear): Deleted.
+ (WTF::GRefPtr::outPtr): Deleted.
+ (WTF::GRefPtr::isHashTableDeletedValue): Deleted.
+ (WTF::GRefPtr::get): Deleted.
+ (WTF::GRefPtr::operator*): Deleted.
+ (WTF::GRefPtr::operator->): Deleted.
+ (WTF::GRefPtr::operator!): Deleted.
+ (WTF::GRefPtr::operator UnspecifiedBoolType): Deleted.
+ (WTF::GRefPtr::hashTableDeletedValue): Deleted.
+ (WTF::=): Deleted.
+ (WTF::GRefPtr<T>::swap): Deleted.
+ (WTF::swap): Deleted.
+ (WTF::operator==): Deleted.
+ (WTF::operator!=): Deleted.
+ (WTF::static_pointer_cast): Deleted.
+ (WTF::const_pointer_cast): Deleted.
+ (WTF::adoptGRef): Deleted.
+ (WTF::refGPtr): Deleted.
+ (WTF::derefGPtr): Deleted.
+ * wtf/gobject/GThreadSafeMainLoopSource.cpp:
+ (WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource): Deleted.
+ (WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource): Deleted.
+ (WTF::GThreadSafeMainLoopSource::cancel): Deleted.
+ (WTF::GThreadSafeMainLoopSource::schedule): Deleted.
+ (WTF::GThreadSafeMainLoopSource::scheduleAfterDelay): Deleted.
+ (WTF::GThreadSafeMainLoopSource::prepareVoidCallback): Deleted.
+ (WTF::GThreadSafeMainLoopSource::finishVoidCallback): Deleted.
+ (WTF::GThreadSafeMainLoopSource::voidCallback): Deleted.
+ (WTF::GThreadSafeMainLoopSource::prepareBoolCallback): Deleted.
+ (WTF::GThreadSafeMainLoopSource::finishBoolCallback): Deleted.
+ (WTF::GThreadSafeMainLoopSource::boolCallback): Deleted.
+ * wtf/gobject/GUniquePtr.h:
+ (WTF::GPtrDeleter::operator()): Deleted.
+ (WTF::GUniqueOutPtr::GUniqueOutPtr): Deleted.
+ (WTF::GUniqueOutPtr::~GUniqueOutPtr): Deleted.
+ (WTF::GUniqueOutPtr::outPtr): Deleted.
+ (WTF::GUniqueOutPtr::release): Deleted.
+ (WTF::GUniqueOutPtr::operator*): Deleted.
+ (WTF::GUniqueOutPtr::operator->): Deleted.
+ (WTF::GUniqueOutPtr::get): Deleted.
+ (WTF::GUniqueOutPtr::operator!): Deleted.
+ (WTF::GUniqueOutPtr::operator UnspecifiedBoolType): Deleted.
+ (WTF::GUniqueOutPtr::reset): Deleted.
+ * wtf/gobject/GlibUtilities.cpp:
+ (getCurrentExecutablePath): Deleted.
+
</ins><span class="cx"> 2015-06-10 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix an typo in unused template code.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> <ClCompile Include="..\wtf\FastMalloc.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\FilePrintStream.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\FunctionDispatcher.cpp" />
</span><del>- <ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
</del><ins>+ <ClCompile Include="..\wtf\glib\GLibUtilities.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
</del><ins>+ <ClCompile Include="..\wtf\glib\GMainLoopSource.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GRefPtr.cpp">
</del><ins>+ <ClCompile Include="..\wtf\glib\GRefPtr.cpp">
</ins><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp" />
</del><ins>+ <ClCompile Include="..\wtf\glib\GThreadSafeMainLoopSource.cpp" />
</ins><span class="cx"> <ClCompile Include="..\wtf\GregorianDateTime.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\HashTable.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\MainThread.cpp" />
</span><span class="lines">@@ -204,13 +204,13 @@
</span><span class="cx"> <ClInclude Include="..\wtf\FunctionDispatcher.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\Functional.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\GetPtr.h" />
</span><del>- <ClInclude Include="..\wtf\gobject\GlibUtilities.h" />
- <ClInclude Include="..\wtf\gobject\GMainLoopSource.h" />
- <ClInclude Include="..\wtf\gobject\GMutexLocker.h" />
- <ClInclude Include="..\wtf\gobject\GRefPtr.h" />
- <ClInclude Include="..\wtf\gobject\GThreadSafeMainLoopSource.h" />
- <ClInclude Include="..\wtf\gobject\GTypedefs.h" />
- <ClInclude Include="..\wtf\gobject\GUniquePtr.h" />
</del><ins>+ <ClInclude Include="..\wtf\glib\GLibUtilities.h" />
+ <ClInclude Include="..\wtf\glib\GMainLoopSource.h" />
+ <ClInclude Include="..\wtf\glib\GMutexLocker.h" />
+ <ClInclude Include="..\wtf\glib\GTypedefs.h" />
+ <ClInclude Include="..\wtf\glib\GRefPtr.h" />
+ <ClInclude Include="..\wtf\glib\GThreadSafeMainLoopSource.h" />
+ <ClInclude Include="..\wtf\glib\GUniquePtr.h" />
</ins><span class="cx"> <ClInclude Include="..\wtf\GregorianDateTime.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\HashCountedSet.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\HashFunctions.h" />
</span><span class="lines">@@ -773,4 +773,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> <Filter Include="wtf\unicode\icu">
</span><span class="cx"> <UniqueIdentifier>{da29baba-10a2-4a74-ab87-2fea5e1382da}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><del>- <Filter Include="wtf\gobject">
</del><ins>+ <Filter Include="wtf\glib">
</ins><span class="cx"> <UniqueIdentifier>{edd6ccc8-e6ee-41ec-a58d-9404a30c0c7e}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><span class="cx"> <Filter Include="wtf\win">
</span><span class="lines">@@ -228,11 +228,11 @@
</span><span class="cx"> <ClCompile Include="..\wtf\SixCharacterHash.cpp">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClCompile Include="..\wtf\glib\GLibUtilities.cpp">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GRefPtr.cpp">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClCompile Include="..\wtf\glib\GRefPtr.cpp">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\RunLoop.cpp">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="lines">@@ -240,14 +240,14 @@
</span><span class="cx"> <ClCompile Include="..\wtf\win\RunLoopWin.cpp">
</span><span class="cx"> <Filter>wtf\win</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClCompile Include="..\wtf\glib\GMainLoopSource.cpp">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\FastBitVector.cpp">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClCompile Include="..\wtf\glib\GThreadSafeMainLoopSource.cpp">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\RefCounter.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\win\WTFDLL.cpp">
</span><span class="lines">@@ -676,17 +676,17 @@
</span><span class="cx"> <ClInclude Include="..\wtf\win\GDIObject.h">
</span><span class="cx"> <Filter>wtf\win</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GlibUtilities.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GLibUtilities.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GMutexLocker.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GMutexLocker.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GRefPtr.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GRefPtr.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GTypedefs.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GTypedefs.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\wtf\Bag.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="lines">@@ -697,17 +697,17 @@
</span><span class="cx"> <ClInclude Include="..\wtf\RunLoop.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GMainLoopSource.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GMainLoopSource.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GUniquePtr.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GUniquePtr.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\wtf\HashMethod.h">
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\wtf\gobject\GThreadSafeMainLoopSource.h">
- <Filter>wtf\gobject</Filter>
</del><ins>+ <ClInclude Include="..\wtf\glib\GThreadSafeMainLoopSource.h">
+ <Filter>wtf\glib</Filter>
</ins><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\wtf\RefCounter.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\WorkQueue.h">
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojcopyfilescmd"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/copy-files.cmd (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/copy-files.cmd 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/WTF.vcxproj/copy-files.cmd 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> wtf
</span><span class="cx"> wtf\cf
</span><span class="cx"> wtf\dtoa
</span><del>- wtf\gobject
</del><ins>+ wtf\glib
</ins><span class="cx"> wtf\text
</span><span class="cx"> wtf\threads
</span><span class="cx"> wtf\unicode
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/wtf/Platform.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(GLIB)
</span><del>-#include <wtf/gobject/GTypedefs.h>
</del><ins>+#include <wtf/glib/GTypedefs.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformEfl.cmake (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformEfl.cmake 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/wtf/PlatformEfl.cmake 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx"> efl/RunLoopEfl.cpp
</span><span class="cx"> efl/WorkQueueEfl.cpp
</span><span class="cx">
</span><del>- gobject/GMainLoopSource.cpp
- gobject/GRefPtr.cpp
- gobject/GThreadSafeMainLoopSource.cpp
</del><ins>+ glib/GMainLoopSource.cpp
+ glib/GRefPtr.cpp
+ glib/GThreadSafeMainLoopSource.cpp
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -2,14 +2,13 @@
</span><span class="cx"> set(WTF_OUTPUT_NAME WTFGTK)
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_SOURCES
</span><ins>+ glib/GLibUtilities.cpp
+ glib/GMainLoopSource.cpp
+ glib/GRefPtr.cpp
+ glib/GThreadSafeMainLoopSource.cpp
</ins><span class="cx"> glib/MainThreadGLib.cpp
</span><span class="cx"> glib/RunLoopGLib.cpp
</span><span class="cx"> glib/WorkQueueGLib.cpp
</span><del>-
- gobject/GMainLoopSource.cpp
- gobject/GRefPtr.cpp
- gobject/GThreadSafeMainLoopSource.cpp
- gobject/GlibUtilities.cpp
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WTF_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/wtf/RunLoop.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <wtf/Threading.h>
</span><span class="cx">
</span><span class="cx"> #if USE(GLIB)
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(EFL)
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> #include <DispatchQueueEfl.h>
</span><span class="cx"> #elif OS(WINDOWS)
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibGLibUtilitiescpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GLibUtilities.cpp (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GLibUtilities.cpp (rev 0)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+/*
+ * 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.
+ */
+
+#include "config.h"
+#include "GLibUtilities.h"
+
+#if OS(WINDOWS)
+#include <windows.h>
+#include <wtf/text/WTFString.h>
+#else
+#include <limits.h>
+#include <unistd.h>
+#endif
+
+#if OS(LINUX)
+CString getCurrentExecutablePath()
+{
+ static char readLinkBuffer[PATH_MAX];
+ ssize_t result = readlink("/proc/self/exe", readLinkBuffer, PATH_MAX);
+ if (result == -1)
+ return CString();
+ return CString(readLinkBuffer, result);
+}
+#elif OS(HURD)
+CString getCurrentExecutablePath()
+{
+ return CString();
+}
+#elif OS(UNIX)
+CString getCurrentExecutablePath()
+{
+ static char readLinkBuffer[PATH_MAX];
+ ssize_t result = readlink("/proc/curproc/file", readLinkBuffer, PATH_MAX);
+ if (result == -1)
+ return CString();
+ return CString(readLinkBuffer, result);
+}
+#elif OS(WINDOWS)
+CString getCurrentExecutablePath()
+{
+ static WCHAR buffer[MAX_PATH];
+ DWORD length = GetModuleFileNameW(0, buffer, MAX_PATH);
+ if (!length || (length == MAX_PATH && GetLastError() == ERROR_INSUFFICIENT_BUFFER))
+ return CString();
+
+ String path(buffer, length);
+ return path.utf8();
+}
+#endif
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGLibUtilitiesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GLibUtilities.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GLibUtilities.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GLibUtilities.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+/*
+ * 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 GLibUtilities_h
+#define GLibUtilities_h
+
+#include <wtf/Assertions.h>
+#include <wtf/text/CString.h>
+
+CString getCurrentExecutablePath();
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGMainLoopSourcecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp (rev 0)
+++ trunk/Source/WTF/wtf/glib/GMainLoopSource.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,479 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GMainLoopSource.h"
+
+#if USE(GLIB)
+
+#include <gio/gio.h>
+
+namespace WTF {
+
+GMainLoopSource& GMainLoopSource::create()
+{
+ return *new GMainLoopSource(DeleteOnDestroy);
+}
+
+GMainLoopSource::GMainLoopSource()
+ : m_deleteOnDestroy(DoNotDeleteOnDestroy)
+ , m_status(Ready)
+{
+}
+
+GMainLoopSource::GMainLoopSource(DeleteOnDestroyType deleteOnDestroy)
+ : m_deleteOnDestroy(deleteOnDestroy)
+ , m_status(Ready)
+{
+}
+
+GMainLoopSource::~GMainLoopSource()
+{
+ cancel();
+}
+
+bool GMainLoopSource::isScheduled() const
+{
+ return m_status == Scheduled;
+}
+
+bool GMainLoopSource::isActive() const
+{
+ return m_status != Ready;
+}
+
+void GMainLoopSource::cancel()
+{
+ // Delete-on-destroy GMainLoopSource objects can't be cancelled.
+ if (m_deleteOnDestroy == DeleteOnDestroy)
+ return;
+
+ // A valid context should only be present if GMainLoopSource is in the Scheduled or Dispatching state.
+ ASSERT(!m_context.source || m_status == Scheduled || m_status == Dispatching);
+
+ m_status = Ready;
+
+ g_cancellable_cancel(m_context.socketCancellable.get());
+
+ if (!m_context.source)
+ return;
+
+ Context context;
+ context = WTF::move(m_context);
+ context.destroySource();
+}
+
+void GMainLoopSource::scheduleIdleSource(const char* name, GSourceFunc sourceFunction, int priority, GMainContext* context)
+{
+ ASSERT(m_status == Ready);
+ m_status = Scheduled;
+
+ g_source_set_name(m_context.source.get(), name);
+ if (priority != G_PRIORITY_DEFAULT_IDLE)
+ g_source_set_priority(m_context.source.get(), priority);
+ g_source_set_callback(m_context.source.get(), sourceFunction, this, nullptr);
+ g_source_attach(m_context.source.get(), context);
+}
+
+void GMainLoopSource::schedule(const char* name, std::function<void ()> function, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(g_idle_source_new()),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ WTF::move(function),
+ nullptr, // boolCallback
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleIdleSource(name, reinterpret_cast<GSourceFunc>(voidSourceCallback), priority, context);
+}
+
+void GMainLoopSource::schedule(const char* name, std::function<bool ()> function, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(g_idle_source_new()),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ nullptr, // voidCallback
+ WTF::move(function),
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleIdleSource(name, reinterpret_cast<GSourceFunc>(boolSourceCallback), priority, context);
+}
+
+void GMainLoopSource::schedule(const char* name, std::function<bool (GIOCondition)> function, GSocket* socket, GIOCondition condition, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ GCancellable* socketCancellable = g_cancellable_new();
+ m_context = {
+ adoptGRef(g_socket_create_source(socket, condition, socketCancellable)),
+ nullptr, // cancellable
+ adoptGRef(socketCancellable),
+ nullptr, // voidCallback
+ nullptr, // boolCallback
+ WTF::move(function),
+ WTF::move(destroyFunction)
+ };
+
+ ASSERT(m_status == Ready);
+ m_status = Scheduled;
+ g_source_set_name(m_context.source.get(), name);
+ g_source_set_callback(m_context.source.get(), reinterpret_cast<GSourceFunc>(socketSourceCallback), this, nullptr);
+ g_source_attach(m_context.source.get(), context);
+}
+
+void GMainLoopSource::scheduleTimeoutSource(const char* name, GSourceFunc sourceFunction, int priority, GMainContext* context)
+{
+ ASSERT(m_status == Ready);
+ m_status = Scheduled;
+
+ g_source_set_name(m_context.source.get(), name);
+ if (priority != G_PRIORITY_DEFAULT)
+ g_source_set_priority(m_context.source.get(), priority);
+ g_source_set_callback(m_context.source.get(), sourceFunction, this, nullptr);
+ g_source_attach(m_context.source.get(), context);
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::milliseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(g_timeout_source_new(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ WTF::move(function),
+ nullptr, // boolCallback
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(voidSourceCallback), priority, context);
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::milliseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(g_timeout_source_new(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ nullptr, // voidCallback
+ WTF::move(function),
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(boolSourceCallback), priority, context);
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::seconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(g_timeout_source_new_seconds(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ WTF::move(function),
+ nullptr, // boolCallback
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(voidSourceCallback), priority, context);
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::seconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(g_timeout_source_new_seconds(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ nullptr, // voidCallback
+ WTF::move(function),
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(boolSourceCallback), priority, context);
+}
+
+struct MicrosecondsTimeoutSource {
+ GSource source;
+ uint64_t delay;
+};
+
+static GSourceFuncs microsecondsTimeoutSourceFunctions = {
+ nullptr, // prepare
+ nullptr, // check
+ // dispatch
+ [](GSource* source, GSourceFunc callback, gpointer userData) -> gboolean
+ {
+ bool repeat = callback(userData);
+ if (repeat)
+ g_source_set_ready_time(source, g_source_get_time(source) + reinterpret_cast<MicrosecondsTimeoutSource*>(source)->delay);
+ return repeat;
+ },
+ nullptr, // finalize
+ nullptr, // closure_callback
+ nullptr // closure_marshall
+};
+
+static GSource* createMicrosecondsTimeoutSource(uint64_t delay)
+{
+ GSource* source = g_source_new(&microsecondsTimeoutSourceFunctions, sizeof(MicrosecondsTimeoutSource));
+ reinterpret_cast<MicrosecondsTimeoutSource*>(source)->delay = delay;
+ g_source_set_ready_time(source, g_get_monotonic_time() + delay);
+ return source;
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::microseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(createMicrosecondsTimeoutSource(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ WTF::move(function),
+ nullptr, // boolCallback
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(voidSourceCallback), priority, context);
+}
+
+void GMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::microseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ cancel();
+
+ ASSERT(!m_context.source);
+ m_context = {
+ adoptGRef(createMicrosecondsTimeoutSource(delay.count())),
+ nullptr, // cancellable
+ nullptr, // socketCancellable
+ nullptr, // voidCallback
+ WTF::move(function),
+ nullptr, // socketCallback
+ WTF::move(destroyFunction)
+ };
+ scheduleTimeoutSource(name, reinterpret_cast<GSourceFunc>(boolSourceCallback), priority, context);
+}
+
+void GMainLoopSource::scheduleAndDeleteOnDestroy(const char* name, std::function<void()> function, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().schedule(name, function, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAndDeleteOnDestroy(const char* name, std::function<bool()> function, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().schedule(name, function, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()> function, std::chrono::milliseconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()> function, std::chrono::milliseconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()> function, std::chrono::seconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()> function, std::chrono::seconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()> function, std::chrono::microseconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+void GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()> function, std::chrono::microseconds delay, int priority, std::function<void()> destroyFunction, GMainContext* context)
+{
+ create().scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+}
+
+bool GMainLoopSource::prepareVoidCallback(Context& context)
+{
+ if (!m_context.source)
+ return false;
+
+ context = WTF::move(m_context);
+
+ ASSERT(context.voidCallback);
+ ASSERT(m_status == Scheduled);
+ m_status = Dispatching;
+
+ return true;
+}
+
+void GMainLoopSource::finishVoidCallback()
+{
+ m_status = Ready;
+}
+
+void GMainLoopSource::voidCallback()
+{
+ Context context;
+ if (!prepareVoidCallback(context))
+ return;
+
+ context.voidCallback();
+ if (m_status != Ready && !m_context.source) {
+ // Switch to Ready if it hasn't been re-scheduled or cancelled.
+ finishVoidCallback();
+ }
+
+ context.destroySource();
+ if (m_deleteOnDestroy == DeleteOnDestroy)
+ delete this;
+}
+
+bool GMainLoopSource::prepareBoolCallback(Context& context)
+{
+ if (!m_context.source)
+ return false;
+
+ context = WTF::move(m_context);
+
+ ASSERT(context.boolCallback);
+ ASSERT(m_status == Scheduled || m_status == Dispatching);
+ m_status = Dispatching;
+ return true;
+}
+
+void GMainLoopSource::finishBoolCallback(bool retval, Context& context)
+{
+ // m_status should reflect whether the GMainLoopSource has been rescheduled during dispatch.
+ ASSERT((!m_context.source && m_status == Dispatching) || m_status == Scheduled);
+ if (retval && !m_context.source)
+ m_context = WTF::move(context);
+ else if (!retval)
+ m_status = Ready;
+}
+
+bool GMainLoopSource::boolCallback()
+{
+ Context context;
+ if (!prepareBoolCallback(context))
+ return Stop;
+
+ bool retval = context.boolCallback();
+ if (m_status != Ready && !m_context.source) {
+ // Prepare for a new iteration or switch to Ready if it hasn't been re-scheduled or cancelled.
+ finishBoolCallback(retval, context);
+ }
+
+ if (context.source) {
+ context.destroySource();
+ if (m_deleteOnDestroy == DeleteOnDestroy)
+ delete this;
+ }
+
+ return retval;
+}
+
+bool GMainLoopSource::socketCallback(GIOCondition condition)
+{
+ if (!m_context.source)
+ return Stop;
+
+ Context context;
+ context = WTF::move(m_context);
+
+ ASSERT(context.socketCallback);
+ ASSERT(m_status == Scheduled || m_status == Dispatching);
+ m_status = Dispatching;
+
+ if (g_cancellable_is_cancelled(context.socketCancellable.get())) {
+ context.destroySource();
+ return Stop;
+ }
+
+ bool retval = context.socketCallback(condition);
+
+ if (m_status != Ready && !m_context.source) {
+ // m_status should reflect whether the GMainLoopSource has been rescheduled during dispatch.
+ ASSERT((!m_context.source && m_status == Dispatching) || m_status == Scheduled);
+ if (retval && !m_context.source)
+ m_context = WTF::move(context);
+ else if (!retval)
+ m_status = Ready;
+ }
+
+ if (context.source)
+ context.destroySource();
+
+ return retval;
+}
+
+gboolean GMainLoopSource::voidSourceCallback(GMainLoopSource* source)
+{
+ source->voidCallback();
+ return G_SOURCE_REMOVE;
+}
+
+gboolean GMainLoopSource::boolSourceCallback(GMainLoopSource* source)
+{
+ return source->boolCallback() == Continue;
+}
+
+gboolean GMainLoopSource::socketSourceCallback(GSocket*, GIOCondition condition, GMainLoopSource* source)
+{
+ return source->socketCallback(condition) == Continue;
+}
+
+void GMainLoopSource::Context::destroySource()
+{
+ g_source_destroy(source.get());
+ if (destroyCallback)
+ destroyCallback();
+}
+
+} // namespace WTF
+
+#endif // USE(GLIB)
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGMainLoopSourceh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GMainLoopSource.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GMainLoopSource.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GMainLoopSource.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,137 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GMainLoopSource_h
+#define GMainLoopSource_h
+
+#if USE(GLIB)
+
+#include <functional>
+#include <glib.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/glib/GRefPtr.h>
+
+typedef struct _GSocket GSocket;
+
+namespace WTF {
+
+class GMainLoopSource {
+ WTF_MAKE_NONCOPYABLE(GMainLoopSource);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ WTF_EXPORT_PRIVATE GMainLoopSource();
+ WTF_EXPORT_PRIVATE virtual ~GMainLoopSource();
+
+ static const bool Stop = false;
+ static const bool Continue = true;
+
+ WTF_EXPORT_PRIVATE bool isScheduled() const;
+ WTF_EXPORT_PRIVATE bool isActive() const;
+
+ WTF_EXPORT_PRIVATE virtual void schedule(const char* name, std::function<void()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void schedule(const char* name, std::function<bool()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ WTF_EXPORT_PRIVATE virtual void cancel();
+
+ WTF_EXPORT_PRIVATE void schedule(const char* name, std::function<bool(GIOCondition)>, GSocket*, GIOCondition, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+
+ static void scheduleAndDeleteOnDestroy(const char* name, std::function<void()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAndDeleteOnDestroy(const char* name, std::function<bool()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<void()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+ static void scheduleAfterDelayAndDeleteOnDestroy(const char* name, std::function<bool()>, std::chrono::microseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr);
+
+protected:
+ enum Status { Ready, Scheduled, Dispatching };
+
+ struct Context {
+ Context() = default;
+ Context& operator=(Context&& c)
+ {
+ source = WTF::move(c.source);
+ cancellable = WTF::move(c.cancellable);
+ socketCancellable = WTF::move(c.socketCancellable);
+ voidCallback = WTF::move(c.voidCallback);
+ boolCallback = WTF::move(c.boolCallback);
+ socketCallback = WTF::move(c.socketCallback);
+ destroyCallback = WTF::move(c.destroyCallback);
+ return *this;
+ }
+
+ void destroySource();
+
+ GRefPtr<GSource> source;
+ GRefPtr<GCancellable> cancellable;
+ GRefPtr<GCancellable> socketCancellable;
+ std::function<void ()> voidCallback;
+ std::function<bool ()> boolCallback;
+ std::function<bool (GIOCondition)> socketCallback;
+ std::function<void ()> destroyCallback;
+ };
+
+ virtual void voidCallback();
+ virtual bool boolCallback();
+
+ virtual bool prepareVoidCallback(Context&);
+ virtual void finishVoidCallback();
+ virtual bool prepareBoolCallback(Context&);
+ virtual void finishBoolCallback(bool retval, Context&);
+
+private:
+ static GMainLoopSource& create();
+
+ enum DeleteOnDestroyType { DeleteOnDestroy, DoNotDeleteOnDestroy };
+ GMainLoopSource(DeleteOnDestroyType);
+
+ void scheduleIdleSource(const char* name, GSourceFunc, int priority, GMainContext*);
+ void scheduleTimeoutSource(const char* name, GSourceFunc, int priority, GMainContext*);
+ bool socketCallback(GIOCondition);
+
+ static gboolean voidSourceCallback(GMainLoopSource*);
+ static gboolean boolSourceCallback(GMainLoopSource*);
+ static gboolean socketSourceCallback(GSocket*, GIOCondition, GMainLoopSource*);
+
+ DeleteOnDestroyType m_deleteOnDestroy;
+
+protected:
+ Context m_context;
+ Status m_status;
+};
+
+} // namespace WTF
+
+using WTF::GMainLoopSource;
+
+#endif // USE(GLIB)
+
+#endif // GMainLoopSource_h
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGMutexLockerh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GMutexLocker.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GMutexLocker.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GMutexLocker.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,102 @@
</span><ins>+/*
+ * Copyright (C) 2013 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef GMutexLocker_h
+#define GMutexLocker_h
+
+#if USE(GLIB)
+
+#include <glib.h>
+#include <wtf/Noncopyable.h>
+
+namespace WTF {
+
+template<typename T>
+struct MutexWrapper;
+
+template<>
+struct MutexWrapper<GMutex> {
+ static void lock(GMutex* mutex)
+ {
+ g_mutex_lock(mutex);
+ }
+
+ static void unlock(GMutex* mutex)
+ {
+ g_mutex_unlock(mutex);
+ }
+};
+
+template<>
+struct MutexWrapper<GRecMutex> {
+ static void lock(GRecMutex* mutex)
+ {
+ g_rec_mutex_lock(mutex);
+ }
+
+ static void unlock(GRecMutex* mutex)
+ {
+ g_rec_mutex_unlock(mutex);
+ }
+};
+
+template<typename T>
+class GMutexLocker {
+ WTF_MAKE_NONCOPYABLE(GMutexLocker);
+public:
+ explicit GMutexLocker(T& mutex)
+ : m_mutex(mutex)
+ , m_locked(false)
+ {
+ lock();
+ }
+
+ ~GMutexLocker()
+ {
+ unlock();
+ }
+
+ void lock()
+ {
+ if (m_locked)
+ return;
+
+ MutexWrapper<T>::lock(&m_mutex);
+ m_locked = true;
+ }
+
+ void unlock()
+ {
+ if (!m_locked)
+ return;
+
+ m_locked = false;
+ MutexWrapper<T>::unlock(&m_mutex);
+ }
+
+private:
+ T& m_mutex;
+ bool m_locked;
+};
+
+} // namespace WTF
+
+#endif // USE(GLIB)
+
+#endif // GMutexLocker_h
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGRefPtrcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GRefPtr.cpp (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GRefPtr.cpp (rev 0)
+++ trunk/Source/WTF/wtf/glib/GRefPtr.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,161 @@
</span><ins>+/*
+ * Copyright (C) 2009 Martin Robinson
+ *
+ * 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 "GRefPtr.h"
+
+#if USE(GLIB)
+
+#include <glib-object.h>
+#include <glib.h>
+
+namespace WTF {
+
+template <> GHashTable* refGPtr(GHashTable* ptr)
+{
+ if (ptr)
+ g_hash_table_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GHashTable* ptr)
+{
+ if (ptr)
+ g_hash_table_unref(ptr);
+}
+
+template <> GMainContext* refGPtr(GMainContext* ptr)
+{
+ if (ptr)
+ g_main_context_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GMainContext* ptr)
+{
+ if (ptr)
+ g_main_context_unref(ptr);
+}
+
+template <> GMainLoop* refGPtr(GMainLoop* ptr)
+{
+ if (ptr)
+ g_main_loop_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GMainLoop* ptr)
+{
+ if (ptr)
+ g_main_loop_unref(ptr);
+}
+
+template <> GBytes* refGPtr(GBytes* ptr)
+{
+ if (ptr)
+ g_bytes_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GBytes* ptr)
+{
+ if (ptr)
+ g_bytes_unref(ptr);
+}
+
+template <> GVariant* refGPtr(GVariant* ptr)
+{
+ if (ptr)
+ g_variant_ref_sink(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GVariant* ptr)
+{
+ if (ptr)
+ g_variant_unref(ptr);
+}
+
+template <> GVariantBuilder* refGPtr(GVariantBuilder* ptr)
+{
+ if (ptr)
+ g_variant_builder_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GVariantBuilder* ptr)
+{
+ if (ptr)
+ g_variant_builder_unref(ptr);
+}
+
+template <> GSource* refGPtr(GSource* ptr)
+{
+ if (ptr)
+ g_source_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GSource* ptr)
+{
+ if (ptr)
+ g_source_unref(ptr);
+}
+
+template <> GPtrArray* refGPtr(GPtrArray* ptr)
+{
+ if (ptr)
+ g_ptr_array_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GPtrArray* ptr)
+{
+ if (ptr)
+ g_ptr_array_unref(ptr);
+}
+
+template <> GByteArray* refGPtr(GByteArray* ptr)
+{
+ if (ptr)
+ g_byte_array_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GByteArray* ptr)
+{
+ if (ptr)
+ g_byte_array_unref(ptr);
+}
+
+template <> GClosure* refGPtr(GClosure* ptr)
+{
+ if (ptr)
+ g_closure_ref(ptr);
+ return ptr;
+}
+
+template <> void derefGPtr(GClosure* ptr)
+{
+ if (ptr)
+ g_closure_unref(ptr);
+}
+
+} // namespace WTF
+
+#endif // USE(GLIB)
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGRefPtrh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GRefPtr.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GRefPtr.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GRefPtr.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,261 @@
</span><ins>+/*
+ * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Collabora Ltd.
+ * Copyright (C) 2009 Martin Robinson
+ *
+ * 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 WTF_GRefPtr_h
+#define WTF_GRefPtr_h
+
+#if USE(GLIB)
+
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
+#include <algorithm>
+
+extern "C" void g_object_unref(gpointer);
+extern "C" gpointer g_object_ref_sink(gpointer);
+
+namespace WTF {
+
+enum GRefPtrAdoptType { GRefPtrAdopt };
+template <typename T> inline T* refGPtr(T*);
+template <typename T> inline void derefGPtr(T*);
+template <typename T> class GRefPtr;
+template <typename T> GRefPtr<T> adoptGRef(T*);
+
+template <typename T> class GRefPtr {
+public:
+ typedef T ValueType;
+ typedef ValueType* PtrType;
+
+ GRefPtr() : m_ptr(0) { }
+
+ GRefPtr(T* ptr)
+ : m_ptr(ptr)
+ {
+ if (ptr)
+ refGPtr(ptr);
+ }
+
+ GRefPtr(const GRefPtr& o)
+ : m_ptr(o.m_ptr)
+ {
+ if (T* ptr = m_ptr)
+ refGPtr(ptr);
+ }
+
+ template <typename U> GRefPtr(const GRefPtr<U>& o)
+ : m_ptr(o.get())
+ {
+ if (T* ptr = m_ptr)
+ refGPtr(ptr);
+ }
+
+ GRefPtr(GRefPtr&& o) : m_ptr(o.leakRef()) { }
+ template <typename U> GRefPtr(GRefPtr<U>&& o) : m_ptr(o.leakRef()) { }
+
+ ~GRefPtr()
+ {
+ if (T* ptr = m_ptr)
+ derefGPtr(ptr);
+ }
+
+ void clear()
+ {
+ T* ptr = m_ptr;
+ m_ptr = 0;
+ if (ptr)
+ derefGPtr(ptr);
+ }
+
+ T* leakRef() WARN_UNUSED_RETURN
+ {
+ T* ptr = m_ptr;
+ m_ptr = 0;
+ return ptr;
+ }
+
+ T*& outPtr()
+ {
+ ASSERT(!m_ptr);
+ return m_ptr;
+ }
+
+ // Hash table deleted values, which are only constructed and never copied or destroyed.
+ GRefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
+ bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
+
+ T* get() const { return m_ptr; }
+ T& operator*() const { return *m_ptr; }
+ ALWAYS_INLINE T* operator->() const { return m_ptr; }
+
+ bool operator!() const { return !m_ptr; }
+
+ // This conversion operator allows implicit conversion to bool but not to other integer types.
+ typedef T* GRefPtr::*UnspecifiedBoolType;
+ operator UnspecifiedBoolType() const { return m_ptr ? &GRefPtr::m_ptr : 0; }
+
+ GRefPtr& operator=(const GRefPtr&);
+ GRefPtr& operator=(GRefPtr&&);
+ GRefPtr& operator=(T*);
+ template <typename U> GRefPtr& operator=(const GRefPtr<U>&);
+
+ void swap(GRefPtr&);
+ friend GRefPtr adoptGRef<T>(T*);
+
+private:
+ static T* hashTableDeletedValue() { return reinterpret_cast<T*>(-1); }
+ // Adopting constructor.
+ GRefPtr(T* ptr, GRefPtrAdoptType) : m_ptr(ptr) {}
+
+ T* m_ptr;
+};
+
+template <typename T> inline GRefPtr<T>& GRefPtr<T>::operator=(const GRefPtr<T>& o)
+{
+ T* optr = o.get();
+ if (optr)
+ refGPtr(optr);
+ T* ptr = m_ptr;
+ m_ptr = optr;
+ if (ptr)
+ derefGPtr(ptr);
+ return *this;
+}
+
+template <typename T> inline GRefPtr<T>& GRefPtr<T>::operator=(GRefPtr<T>&& o)
+{
+ GRefPtr ptr = WTF::move(o);
+ swap(ptr);
+ return *this;
+}
+
+template <typename T> inline GRefPtr<T>& GRefPtr<T>::operator=(T* optr)
+{
+ T* ptr = m_ptr;
+ if (optr)
+ refGPtr(optr);
+ m_ptr = optr;
+ if (ptr)
+ derefGPtr(ptr);
+ return *this;
+}
+
+template <class T> inline void GRefPtr<T>::swap(GRefPtr<T>& o)
+{
+ std::swap(m_ptr, o.m_ptr);
+}
+
+template <class T> inline void swap(GRefPtr<T>& a, GRefPtr<T>& b)
+{
+ a.swap(b);
+}
+
+template <typename T, typename U> inline bool operator==(const GRefPtr<T>& a, const GRefPtr<U>& b)
+{
+ return a.get() == b.get();
+}
+
+template <typename T, typename U> inline bool operator==(const GRefPtr<T>& a, U* b)
+{
+ return a.get() == b;
+}
+
+template <typename T, typename U> inline bool operator==(T* a, const GRefPtr<U>& b)
+{
+ return a == b.get();
+}
+
+template <typename T, typename U> inline bool operator!=(const GRefPtr<T>& a, const GRefPtr<U>& b)
+{
+ return a.get() != b.get();
+}
+
+template <typename T, typename U> inline bool operator!=(const GRefPtr<T>& a, U* b)
+{
+ return a.get() != b;
+}
+
+template <typename T, typename U> inline bool operator!=(T* a, const GRefPtr<U>& b)
+{
+ return a != b.get();
+}
+
+template <typename T, typename U> inline GRefPtr<T> static_pointer_cast(const GRefPtr<U>& p)
+{
+ return GRefPtr<T>(static_cast<T*>(p.get()));
+}
+
+template <typename T, typename U> inline GRefPtr<T> const_pointer_cast(const GRefPtr<U>& p)
+{
+ return GRefPtr<T>(const_cast<T*>(p.get()));
+}
+
+template <typename T> struct IsSmartPtr<GRefPtr<T>> {
+ static const bool value = true;
+};
+
+template <typename T> GRefPtr<T> adoptGRef(T* p)
+{
+ return GRefPtr<T>(p, GRefPtrAdopt);
+}
+
+template <> WTF_EXPORT_PRIVATE GHashTable* refGPtr(GHashTable* ptr);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GHashTable* ptr);
+template <> WTF_EXPORT_PRIVATE GMainContext* refGPtr(GMainContext* ptr);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GMainContext* ptr);
+template <> WTF_EXPORT_PRIVATE GMainLoop* refGPtr(GMainLoop* ptr);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GMainLoop* ptr);
+template <> WTF_EXPORT_PRIVATE GVariant* refGPtr(GVariant* ptr);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GVariant* ptr);
+template <> WTF_EXPORT_PRIVATE GVariantBuilder* refGPtr(GVariantBuilder* ptr);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GVariantBuilder* ptr);
+template <> WTF_EXPORT_PRIVATE GSource* refGPtr(GSource* ptr);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GSource* ptr);
+template <> WTF_EXPORT_PRIVATE GPtrArray* refGPtr(GPtrArray*);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GPtrArray*);
+template <> WTF_EXPORT_PRIVATE GByteArray* refGPtr(GByteArray*);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GByteArray*);
+template <> WTF_EXPORT_PRIVATE GBytes* refGPtr(GBytes*);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GBytes*);
+template <> WTF_EXPORT_PRIVATE GClosure* refGPtr(GClosure*);
+template <> WTF_EXPORT_PRIVATE void derefGPtr(GClosure*);
+
+template <typename T> inline T* refGPtr(T* ptr)
+{
+ if (ptr)
+ g_object_ref_sink(ptr);
+ return ptr;
+}
+
+template <typename T> inline void derefGPtr(T* ptr)
+{
+ if (ptr)
+ g_object_unref(ptr);
+}
+
+} // namespace WTF
+
+using WTF::GRefPtr;
+using WTF::adoptGRef;
+
+#endif // USE(GLIB)
+
+#endif // WTF_GRefPtr_h
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGThreadSafeMainLoopSourcecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.cpp (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.cpp (rev 0)
+++ trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,173 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "GThreadSafeMainLoopSource.h"
+
+#if USE(GLIB)
+
+#include <gio/gio.h>
+#include <wtf/glib/GMutexLocker.h>
+
+namespace WTF {
+
+GThreadSafeMainLoopSource::GThreadSafeMainLoopSource()
+{
+ g_rec_mutex_init(&m_mutex);
+}
+
+GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource()
+{
+ cancel();
+ g_rec_mutex_clear(&m_mutex);
+}
+
+void GThreadSafeMainLoopSource::cancel()
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+
+ // The general cancellable object should only be present if we're currently dispatching this GMainLoopSource.
+ ASSERT(!m_cancellable || m_status == Dispatching);
+
+ // The source is perhaps being cancelled in the middle of a callback dispatch.
+ // Cancelling this GCancellable object will convey this information to the
+ // current execution context when the callback dispatch is finished.
+ g_cancellable_cancel(m_cancellable.get());
+ m_cancellable = nullptr;
+
+ GMainLoopSource::cancel();
+}
+
+void GThreadSafeMainLoopSource::schedule(const char* name, std::function<void ()> function, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::schedule(name, function, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+}
+
+void GThreadSafeMainLoopSource::schedule(const char* name, std::function<bool ()> function, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::schedule(name, function, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+}
+
+void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::milliseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+}
+
+void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::milliseconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+}
+
+void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<void ()> function, std::chrono::seconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+}
+
+void GThreadSafeMainLoopSource::scheduleAfterDelay(const char* name, std::function<bool ()> function, std::chrono::seconds delay, int priority, std::function<void ()> destroyFunction, GMainContext* context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::scheduleAfterDelay(name, function, delay, priority, destroyFunction, context);
+ m_context.cancellable = adoptGRef(g_cancellable_new());
+}
+
+bool GThreadSafeMainLoopSource::prepareVoidCallback(Context& context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ bool retval = GMainLoopSource::prepareVoidCallback(context);
+ m_cancellable = context.cancellable;
+ return retval;
+}
+
+void GThreadSafeMainLoopSource::finishVoidCallback()
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::finishVoidCallback();
+ m_cancellable = nullptr;
+}
+
+void GThreadSafeMainLoopSource::voidCallback()
+{
+ Context context;
+ if (!prepareVoidCallback(context))
+ return;
+
+ context.voidCallback();
+
+ if (g_cancellable_is_cancelled(context.cancellable.get())) {
+ context.destroySource();
+ return;
+ }
+
+ finishVoidCallback();
+ context.destroySource();
+}
+
+bool GThreadSafeMainLoopSource::prepareBoolCallback(Context& context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ bool retval = GMainLoopSource::prepareBoolCallback(context);
+ m_cancellable = context.cancellable;
+ return retval;
+}
+
+void GThreadSafeMainLoopSource::finishBoolCallback(bool retval, Context& context)
+{
+ GMutexLocker<GRecMutex> locker(m_mutex);
+ GMainLoopSource::finishBoolCallback(retval, context);
+ m_cancellable = nullptr;
+}
+
+bool GThreadSafeMainLoopSource::boolCallback()
+{
+ Context context;
+ if (!prepareBoolCallback(context))
+ return Stop;
+
+ bool retval = context.boolCallback();
+
+ if (g_cancellable_is_cancelled(context.cancellable.get())) {
+ context.destroySource();
+ return Stop;
+ }
+
+ finishBoolCallback(retval, context);
+ if (context.source)
+ context.destroySource();
+ return retval;
+}
+
+} // namespace WTF
+
+#endif // USE(GLIB)
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGThreadSafeMainLoopSourceh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GThreadSafeMainLoopSource.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GThreadSafeMainLoopSource_h
+#define GThreadSafeMainLoopSource_h
+
+#if USE(GLIB)
+
+#include <wtf/glib/GMainLoopSource.h>
+
+typedef struct _GRecMutex GRecMutex;
+
+namespace WTF {
+
+class GThreadSafeMainLoopSource final : public GMainLoopSource {
+ WTF_MAKE_NONCOPYABLE(GThreadSafeMainLoopSource);
+ WTF_MAKE_FAST_ALLOCATED;
+public:
+ WTF_EXPORT_PRIVATE GThreadSafeMainLoopSource();
+ WTF_EXPORT_PRIVATE virtual ~GThreadSafeMainLoopSource();
+
+ WTF_EXPORT_PRIVATE virtual void schedule(const char* name, std::function<void()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr) override;
+ WTF_EXPORT_PRIVATE virtual void schedule(const char* name, std::function<bool()>, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr) override;
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr) override;
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::milliseconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr) override;
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<void()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr) override;
+ WTF_EXPORT_PRIVATE virtual void scheduleAfterDelay(const char* name, std::function<bool()>, std::chrono::seconds, int priority = G_PRIORITY_DEFAULT, std::function<void()> destroyFunction = nullptr, GMainContext* = nullptr) override;
+ WTF_EXPORT_PRIVATE virtual void cancel() override;
+
+private:
+ virtual void voidCallback() override;
+ virtual bool boolCallback() override;
+
+ virtual bool prepareVoidCallback(Context&) override;
+ virtual void finishVoidCallback() override;
+ virtual bool prepareBoolCallback(Context&) override;
+ virtual void finishBoolCallback(bool retval, Context&) override;
+
+ GRecMutex m_mutex;
+ GRefPtr<GCancellable> m_cancellable;
+};
+
+} // namespace WTF
+
+using WTF::GThreadSafeMainLoopSource;
+
+#endif // USE(GLIB)
+
+#endif // GThreadSafeMainLoopSource_h
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGTypedefsh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GTypedefs.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GTypedefs.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GTypedefs.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+/*
+ * 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 WTF_GTypedefs_h
+#define WTF_GTypedefs_h
+
+/* Vanilla C code does not seem to be able to handle forward-declaration typedefs. */
+#ifdef __cplusplus
+
+typedef char gchar;
+typedef double gdouble;
+typedef float gfloat;
+typedef int gint;
+typedef gint gboolean;
+typedef long glong;
+typedef short gshort;
+typedef unsigned char guchar;
+typedef unsigned int guint;
+typedef unsigned long gulong;
+typedef unsigned short gushort;
+typedef void* gpointer;
+
+typedef struct _GAsyncResult GAsyncResult;
+typedef struct _GCancellable GCancellable;
+typedef struct _GCharsetConverter GCharsetConverter;
+typedef struct _GDir GDir;
+typedef struct _GdkAtom* GdkAtom;
+typedef struct _GdkCursor GdkCursor;
+typedef struct _GdkDragContext GdkDragContext;
+typedef struct _GdkEventConfigure GdkEventConfigure;
+typedef struct _GdkEventExpose GdkEventExpose;
+typedef struct _GdkPixbuf GdkPixbuf;
+typedef struct _GError GError;
+typedef struct _GFile GFile;
+typedef struct _GHashTable GHashTable;
+typedef struct _GInputStream GInputStream;
+typedef struct _GList GList;
+typedef struct _GMainContext GMainContext;
+typedef struct _GMainLoop GMainLoop;
+typedef struct _GPatternSpec GPatternSpec;
+typedef struct _GPollableOutputStream GPollableOutputStream;
+typedef struct _GSList GSList;
+typedef struct _GSocketClient GSocketClient;
+typedef struct _GSocketConnection GSocketConnection;
+typedef struct _GSource GSource;
+typedef struct _GVariant GVariant;
+typedef struct _GVariantBuilder GVariantBuilder;
+typedef union _GdkEvent GdkEvent;
+typedef struct _GTimer GTimer;
+typedef struct _GKeyFile GKeyFile;
+typedef struct _GPtrArray GPtrArray;
+typedef struct _GByteArray GByteArray;
+typedef struct _GBytes GBytes;
+typedef struct _GClosure GClosure;
+
+#if USE(CAIRO)
+typedef struct _cairo_surface cairo_surface_t;
+typedef struct _cairo_rectangle_int cairo_rectangle_int_t;
+#endif
+
+#if USE(CLUTTER)
+typedef struct _ClutterActor ClutterActor;
+typedef struct _GraphicsLayerActor GraphicsLayerActor;
+#endif
+
+#if PLATFORM(GTK)
+typedef struct _GtkAction GtkAction;
+typedef struct _GtkAdjustment GtkAdjustment;
+typedef struct _GtkBorder GtkBorder;
+typedef struct _GtkClipboard GtkClipboard;
+typedef struct _GtkContainer GtkContainer;
+typedef struct _GtkIconInfo GtkIconInfo;
+typedef struct _GtkMenu GtkMenu;
+typedef struct _GtkMenuItem GtkMenuItem;
+typedef struct _GtkObject GtkObject;
+typedef struct _GtkSelectionData GtkSelectionData;
+typedef struct _GtkStyle GtkStyle;
+typedef struct _GtkTargetList GtkTargetList;
+typedef struct _GtkThemeParts GtkThemeParts;
+typedef struct _GtkWidget GtkWidget;
+typedef struct _GtkWindow GtkWindow;
+
+#ifdef GTK_API_VERSION_2
+typedef struct _GdkRectangle GdkRectangle;
+typedef struct _GdkDrawable GdkWindow;
+#else
+typedef struct _GdkWindow GdkWindow;
+typedef struct _GtkStyleContext GtkStyleContext;
+#endif
+
+#endif
+
+#endif
+#endif // WTF_GTypedefs_h
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibGUniquePtrh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/glib/GUniquePtr.h (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/GUniquePtr.h (rev 0)
+++ trunk/Source/WTF/wtf/glib/GUniquePtr.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,128 @@
</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 GUniquePtr_h
+#define GUniquePtr_h
+
+#if USE(GLIB)
+
+#include <gio/gio.h>
+#include <wtf/Noncopyable.h>
+
+namespace WTF {
+
+template<typename T>
+struct GPtrDeleter {
+ void operator()(T* ptr) const { g_free(ptr); }
+};
+
+template<typename T>
+using GUniquePtr = std::unique_ptr<T, GPtrDeleter<T>>;
+
+#define FOR_EACH_GLIB_DELETER(macro) \
+ macro(GError, g_error_free) \
+ macro(GList, g_list_free) \
+ macro(GSList, g_slist_free) \
+ macro(GPatternSpec, g_pattern_spec_free) \
+ macro(GDir, g_dir_close) \
+ macro(GTimer, g_timer_destroy) \
+ macro(GKeyFile, g_key_file_free) \
+ macro(char*, g_strfreev)
+
+#define WTF_DEFINE_GPTR_DELETER(typeName, deleterFunc) \
+ template<> struct GPtrDeleter<typeName> \
+ { \
+ void operator() (typeName* ptr) const \
+ { \
+ if (ptr) \
+ deleterFunc(ptr); \
+ } \
+ };
+
+FOR_EACH_GLIB_DELETER(WTF_DEFINE_GPTR_DELETER)
+#undef FOR_EACH_GLIB_DELETER
+
+template <typename T> class GUniqueOutPtr {
+ WTF_MAKE_NONCOPYABLE(GUniqueOutPtr);
+public:
+ GUniqueOutPtr()
+ : m_ptr(nullptr)
+ {
+ }
+
+ ~GUniqueOutPtr()
+ {
+ reset();
+ }
+
+ T*& outPtr()
+ {
+ reset();
+ return m_ptr;
+ }
+
+ GUniquePtr<T> release()
+ {
+ GUniquePtr<T> ptr(m_ptr);
+ m_ptr = nullptr;
+ return ptr;
+ }
+
+ T& operator*() const
+ {
+ ASSERT(m_ptr);
+ return *m_ptr;
+ }
+
+ T* operator->() const
+ {
+ ASSERT(m_ptr);
+ return m_ptr;
+ }
+
+ T* get() const { return m_ptr; }
+
+ bool operator!() const { return !m_ptr; }
+
+ // This conversion operator allows implicit conversion to bool but not to other integer types.
+ typedef T* GUniqueOutPtr::*UnspecifiedBoolType;
+ operator UnspecifiedBoolType() const { return m_ptr ? &GUniqueOutPtr::m_ptr : 0; }
+
+private:
+ void reset()
+ {
+ if (m_ptr) {
+ GUniquePtr<T> deletePtr(m_ptr);
+ m_ptr = nullptr;
+ }
+ }
+
+ T* m_ptr;
+};
+
+} // namespace WTF
+
+using WTF::GUniquePtr;
+using WTF::GUniqueOutPtr;
+
+#endif // USE(GLIB)
+
+#endif // GUniquePtr_h
+
</ins></span></pre></div>
<a id="trunkSourceWTFwtfglibMainThreadGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MainThread.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/ChangeLog 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2015-06-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
+ https://bugs.webkit.org/show_bug.cgi?id=145799
+
+ Reviewed by Carlos Garcia Campos.
+
+ Update header inclusions for headers that have been moved
+ to Source/WTF/wtf/glib/.
+
+ * accessibility/atk/AXObjectCacheAtk.cpp:
+ * accessibility/atk/WebKitAccessibleInterfaceText.cpp:
+ * bindings/gobject/DOMObjectCache.cpp:
+ * bindings/gobject/GObjectEventListener.h:
+ * bindings/gobject/GObjectNodeFilterCondition.h:
+ * bindings/gobject/GObjectXPathNSResolver.h:
+ * bindings/gobject/WebKitDOMEventTarget.cpp:
+ * platform/Pasteboard.h:
+ * platform/audio/gstreamer/AudioDestinationGStreamer.cpp:
+ * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp:
+ * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp:
+ * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp:
+ * platform/audio/gtk/AudioBusGtk.cpp:
+ * platform/geoclue/GeolocationProviderGeoclue.h:
+ * platform/geoclue/GeolocationProviderGeoclue2.cpp:
+ * platform/glib/BatteryProviderUPower.cpp:
+ * platform/glib/BatteryProviderUPower.h:
+ * platform/graphics/gstreamer/GRefPtrGStreamer.h:
+ * platform/graphics/gstreamer/GStreamerUtilities.cpp:
+ * platform/graphics/gstreamer/GUniquePtrGStreamer.h:
+ * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+ * platform/graphics/gstreamer/MediaSourceGStreamer.cpp:
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp:
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h:
+ * platform/graphics/gstreamer/VideoSinkGStreamer.cpp:
+ * platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp:
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ * platform/graphics/gtk/ImageBufferGtk.cpp:
+ * platform/graphics/gtk/ImageGtk.cpp:
+ * platform/gtk/ContextMenuGtk.cpp:
+ * platform/gtk/ContextMenuItemGtk.cpp:
+ * platform/gtk/DataObjectGtk.cpp:
+ * platform/gtk/DataObjectGtk.h:
+ * platform/gtk/FileSystemGtk.cpp:
+ * platform/gtk/GRefPtrGtk.h:
+ * platform/gtk/GUniquePtrGtk.h:
+ * platform/gtk/GamepadsGtk.cpp:
+ * platform/gtk/GtkUtilities.cpp:
+ * platform/gtk/LanguageGtk.cpp:
+ * platform/gtk/LocalizedStringsGtk.cpp:
+ * platform/gtk/PasteboardHelper.cpp:
+ * platform/gtk/ScrollbarThemeGtk.cpp:
+ * platform/gtk/SharedBufferGtk.cpp:
+ * platform/gtk/SharedTimerGtk.cpp:
+ * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp:
+ * platform/network/ResourceHandleInternal.h:
+ * platform/network/gtk/CredentialBackingStore.cpp:
+ * platform/network/soup/CertificateInfo.h:
+ * platform/network/soup/CookieJarSoup.cpp:
+ * platform/network/soup/DNSSoup.cpp:
+ * platform/network/soup/GRefPtrSoup.h:
+ * platform/network/soup/GUniquePtrSoup.h:
+ * platform/network/soup/ResourceError.h:
+ * platform/network/soup/ResourceErrorSoup.cpp:
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ * platform/network/soup/ResourceResponse.h:
+ * platform/network/soup/SocketStreamHandle.h:
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ * platform/network/soup/SoupNetworkSession.h:
+ * platform/text/gtk/HyphenationLibHyphen.cpp:
+ * rendering/RenderThemeGtk.cpp:
+
</ins><span class="cx"> 2015-06-12 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Fix the build when the PICTURE_SIZES flag is off
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkAXObjectCacheAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "TextIterator.h"
</span><span class="cx"> #include "WebKitAccessibleWrapperAtk.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><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="trunkSourceWebCorebindingsgobjectDOMObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/bindings/gobject/DOMObjectCache.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectGObjectEventListenerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/GObjectEventListener.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/GObjectEventListener.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/bindings/gobject/GObjectEventListener.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "EventListener.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _GObject GObject;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectGObjectNodeFilterConditionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/GObjectNodeFilterCondition.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/GObjectNodeFilterCondition.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/bindings/gobject/GObjectNodeFilterCondition.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "WebKitDOMNodeFilter.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class Node;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectGObjectXPathNSResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/GObjectXPathNSResolver.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/GObjectXPathNSResolver.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/bindings/gobject/GObjectXPathNSResolver.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "WebKitDOMXPathNSResolver.h"
</span><span class="cx"> #include "XPathNSResolver.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMEventTargetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include "WebKitDOMEvent.h"
</span><span class="cx"> #include "WebKitDOMEventTargetPrivate.h"
</span><span class="cx"> #include "WebKitDOMPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPasteboardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Pasteboard.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Pasteboard.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/Pasteboard.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> typedef struct _GtkClipboard GtkClipboard;
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerAudioDestinationGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "WebKitWebAudioSourceGStreamer.h"
</span><span class="cx"> #include <gst/gst.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerAudioFileReaderGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx"> #include <gst/audio/audio-info.h>
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerAudioSourceProviderGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include <gst/app/gstappsink.h>
</span><span class="cx"> #include <gst/audio/audio-info.h>
</span><span class="cx"> #include <gst/base/gstadapter.h>
</span><del>-#include <wtf/gobject/GMutexLocker.h>
</del><ins>+#include <wtf/glib/GMutexLocker.h>
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogstreamerWebKitWebAudioSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <gst/app/gstappsrc.h>
</span><span class="cx"> #include <gst/audio/audio-info.h>
</span><span class="cx"> #include <gst/pbutils/missing-plugins.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformaudiogtkAudioBusGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx">
</span><span class="cx"> #include "AudioFileReader.h"
</span><span class="cx"> #include <gio/gio.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgeoclueGeolocationProviderGeoclueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #if ENABLE(GEOLOCATION)
</span><span class="cx">
</span><span class="cx"> #include "GeolocationProviderGeoclueClient.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(GEOCLUE2)
</span><span class="cx"> #include "Geoclue2Interface.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgeoclueGeolocationProviderGeoclue2cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue2.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue2.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue2.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(GEOLOCATION) && USE(GEOCLUE2)
</span><span class="cx">
</span><del>-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
</del><ins>+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> const char* gGeoclueBusName = "org.freedesktop.GeoClue2";
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformglibBatteryProviderUPowercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/glib/BatteryProviderUPower.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "BatteryProviderUPowerClient.h"
</span><span class="cx"> #include <cmath>
</span><span class="cx"> #include <limits>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformglibBatteryProviderUPowerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/glib/BatteryProviderUPower.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #if ENABLE(BATTERY_STATUS)
</span><span class="cx">
</span><span class="cx"> #include <libupower-glib/upower.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGRefPtrGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define GRefPtrGStreamer_h
</span><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx">
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _GstElement GstElement;
</span><span class="cx"> typedef struct _GstPad GstPad;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGStreamerUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/video/video-info.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
</span><span class="cx"> #define GST_USE_UNSTABLE_API
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerGUniquePtrGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #if USE(GSTREAMER)
</span><span class="cx">
</span><span class="cx"> #include <gst/gststructure.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerInbandTextTrackPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include "InbandTextTrackPrivate.h"
</span><span class="cx"> #include "TrackPrivateBaseGStreamer.h"
</span><del>-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
</del><ins>+#include <wtf/glib/GThreadSafeMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</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 (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <wtf/HexNumber.h>
</span><span class="cx"> #include <wtf/MediaTime.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/pbutils/install-plugins.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
</del><ins>+#include <wtf/glib/GThreadSafeMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
</span><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include "VideoSinkGStreamer.h"
</span><span class="cx"> #include "WebKitWebSourceGStreamer.h"
</span><span class="cx"> #include <gst/gst.h>
</span><del>-#include <wtf/gobject/GMutexLocker.h>
</del><ins>+#include <wtf/glib/GMutexLocker.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #include <gst/audio/streamvolume.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaPlayerPrivateGStreamerBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx">
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
</del><ins>+#include <wtf/glib/GThreadSafeMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
</span><span class="cx"> #include "TextureMapperPlatformLayer.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include "SourceBufferPrivateGStreamer.h"
</span><span class="cx"> #include "WebKitMediaSourceGStreamer.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/tag/tag.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerTrackPrivateBaseGStreamerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "GRefPtrGStreamer.h"
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><del>-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
</del><ins>+#include <wtf/glib/GThreadSafeMainLoopSource.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerVideoSinkGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <gst/gst.h>
</span><span class="cx"> #include <gst/video/gstvideometa.h>
</span><del>-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
</del><ins>+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitMediaSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _Source Source;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgstreamerWebKitWebSourceGStreamercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx"> #include <gst/pbutils/missing-plugins.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><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="trunkSourceWebCoreplatformgraphicsgtkImageBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "MIMETypeRegistry.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsgtkImageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/graphics/gtk/ImageGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx"> #include <cairo.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkContextMenuGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkContextMenuItemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx">
</span><span class="cx"> #include "ContextMenu.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "DataObjectGtk.h"
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkDataObjectGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/DataObjectGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/DataObjectGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "FileList.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkFileSystemGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/FileSystemGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <glib/gstdio.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
</del><ins>+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformgtkGRefPtrGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/GRefPtrGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #ifndef GRefPtrGtk_h
</span><span class="cx"> #define GRefPtrGtk_h
</span><span class="cx">
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _SecretValue SecretValue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGUniquePtrGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/GUniquePtrGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define GUniquePtrGtk_h
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkGamepadsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/GamepadsGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> #include <gio/gunixinputstream.h>
</span><span class="cx"> #include <gudev/gudev.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformgtkGtkUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,8 +21,8 @@
</span><span class="cx">
</span><span class="cx"> #include "IntPoint.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
</del><ins>+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkLanguageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/LanguageGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #include "Language.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformgtkLocalizedStringsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformgtkPasteboardHelpercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/PasteboardHelper.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "Pasteboard.h"
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkScrollbarThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include "Scrollbar.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSharedBufferGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/SharedBufferGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SharedBufferGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/SharedBufferGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #include <glib.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgtkSharedTimerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/gtk/SharedTimerGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SharedTimer.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamopenwebrtcRealtimeMediaSourceCenterOwrcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #include <owr/owr_media_source.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceHandleInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceHandleInternal.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/ResourceHandleInternal.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> #include "GUniquePtrSoup.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkgtkCredentialBackingStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <libsecret/secret.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCertificateInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CertificateInfo.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CertificateInfo.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/CertificateInfo.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include "NetworkingContext.h"
</span><span class="cx"> #include "PlatformCookieJar.h"
</span><span class="cx"> #include "SoupNetworkSession.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupDNSSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/DNSSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -33,8 +33,8 @@
</span><span class="cx"> #include "SoupNetworkSession.h"
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupGRefPtrSouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/GRefPtrSoup.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/GRefPtrSoup.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/GRefPtrSoup.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx">
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupGUniquePtrSouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/GUniquePtrSoup.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define GUniquePtrSoup_h
</span><span class="cx">
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceError.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceError.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/ResourceError.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx">
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _GTlsCertificate GTlsCertificate;
</span><span class="cx"> typedef struct _SoupRequest SoupRequest;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceErrorSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/SHA1.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/Base64.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupResourceResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/ResourceResponse.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/ResourceResponse.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/ResourceResponse.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "ResourceResponseBase.h"
</span><span class="cx">
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx">
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #define READ_BUFFER_SIZE 1024
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _SoupCache SoupCache;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextgtkHyphenationLibHyphencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <hyphen.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -53,8 +53,8 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2015-06-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
+ https://bugs.webkit.org/show_bug.cgi?id=145799
+
+ Reviewed by Carlos Garcia Campos.
+
+ Update header inclusions for headers that have been moved
+ to Source/WTF/wtf/glib/.
+
+ * NetworkProcess/cache/NetworkCacheFileSystemPosix.h:
+ * NetworkProcess/cache/NetworkCacheIOChannel.h:
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ * PlatformEfl.cmake:
+ * PlatformGTK.cmake:
+ * Shared/Downloads/soup/DownloadSoup.cpp:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h:
+ * Shared/PrintInfo.h:
+ * Shared/gtk/ArgumentCodersGtk.cpp:
+ * Shared/gtk/ArgumentCodersGtk.h:
+ * Shared/gtk/KeyedDecoder.h:
+ * Shared/gtk/KeyedEncoder.h:
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+ * UIProcess/API/gtk/WebKitBackForwardListItem.cpp:
+ * UIProcess/API/gtk/WebKitColorChooser.h:
+ * UIProcess/API/gtk/WebKitContextMenu.cpp:
+ * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+ * UIProcess/API/gtk/WebKitCookieManager.cpp:
+ * UIProcess/API/gtk/WebKitDownload.cpp:
+ * UIProcess/API/gtk/WebKitDownloadClient.cpp:
+ * UIProcess/API/gtk/WebKitFaviconDatabase.cpp:
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ * UIProcess/API/gtk/WebKitFindController.cpp:
+ * UIProcess/API/gtk/WebKitFormClient.cpp:
+ * UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ * UIProcess/API/gtk/WebKitJavascriptResult.cpp:
+ * UIProcess/API/gtk/WebKitLoaderClient.cpp:
+ * UIProcess/API/gtk/WebKitMimeInfo.cpp:
+ * UIProcess/API/gtk/WebKitNavigationAction.cpp:
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
+ * UIProcess/API/gtk/WebKitPolicyClient.cpp:
+ * UIProcess/API/gtk/WebKitPrintOperation.cpp:
+ * UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
+ * UIProcess/API/gtk/WebKitUIClient.cpp:
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ * UIProcess/API/gtk/WebKitUserContentManager.cpp:
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ * UIProcess/API/gtk/WebKitWebInspector.cpp:
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ * UIProcess/InspectorServer/WebSocketServer.h:
+ * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp:
+ * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp:
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ * UIProcess/Plugins/gtk/PluginInfoCache.h:
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ * UIProcess/gtk/DragAndDropHandler.cpp:
+ * UIProcess/gtk/GestureController.h:
+ * UIProcess/gtk/InputMethodFilter.cpp:
+ * UIProcess/gtk/InputMethodFilter.h:
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+ * UIProcess/gtk/WebPopupMenuProxyGtk.h:
+ * UIProcess/gtk/WebProcessPoolGtk.cpp:
+ * WebProcess/Cookies/soup/WebCookieManagerSoup.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp:
+ * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/gtk/LayerTreeHostGtk.h:
+ * WebProcess/WebPage/gtk/PrinterListGtk.h:
+ * WebProcess/WebPage/gtk/WebPageGtk.cpp:
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp:
+ * WebProcess/WebPage/gtk/WebPrintOperationGtk.h:
+ * WebProcess/gtk/WebGtkExtensionManager.h:
+ * WebProcess/soup/WebKitSoupRequestInputStream.cpp:
+ * WebProcess/soup/WebProcessSoup.cpp:
+ * WebProcess/soup/WebSoupRequestManager.h:
+
</ins><span class="cx"> 2015-06-12 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Network Cache: Use SHA1 for key hash
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,9 +30,9 @@
</span><span class="cx">
</span><span class="cx"> #include "NetworkCacheFileSystem.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> namespace NetworkCache {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -39,8 +39,8 @@
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <wtf/RAMSize.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformEfl.cmake (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformEfl.cmake 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/PlatformEfl.cmake 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -256,8 +256,8 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
</span><del>- "${WTF_DIR}/wtf/efl/"
- "${WTF_DIR}/wtf/gobject"
</del><ins>+ "${WTF_DIR}/wtf/efl"
+ "${WTF_DIR}/wtf/glib"
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -485,8 +485,8 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
</span><del>- "${WTF_DIR}/wtf/gtk/"
- "${WTF_DIR}/wtf/gobject"
</del><ins>+ "${WTF_DIR}/wtf/gtk"
+ "${WTF_DIR}/wtf/glib"
</ins><span class="cx"> "${WTF_DIR}"
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadssoupDownloadSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx"> #include <WebCore/ResourceHandleInternal.h>
</span><span class="cx"> #include <gio/gio.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define CustomProtocolManagerImpl_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _GTask GTask;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPrintInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/PrintInfo.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/PrintInfo.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/PrintInfo.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> typedef struct _GtkPrintSettings GtkPrintSettings;
</span><span class="cx"> typedef struct _GtkPageSetup GtkPageSetup;
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #else
</span><span class="cx"> // FIXME: This should use the windows equivalent.
</span><span class="cx"> class NSPrintInfo;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkArgumentCodersGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define ArgumentCodersGtk_h
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _GtkPrintSettings GtkPrintSettings;
</span><span class="cx"> typedef struct _GtkPageSetup GtkPageSetup;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkKeyedDecoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/gtk/KeyedDecoder.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <WebCore/KeyedCoding.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkKeyedEncoderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/gtk/KeyedEncoder.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <WebCore/KeyedCoding.h>
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DEVELOPER_MODE)
</span><del>-#include <wtf/gobject/GlibUtilities.h>
</del><ins>+#include <wtf/glib/GLibUtilities.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "WebKitBackForwardListPrivate.h"
</span><span class="cx"> #include "WebKitMarshal.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * SECTION: WebKitBackForwardList
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitBackForwardListItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitColorChooserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebColorPickerGtk.h"
</span><span class="cx"> #include "WebKitPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _WebKitColorChooserRequest WebKitColorChooserRequest;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "WebContextMenuItem.h"
</span><span class="cx"> #include "WebKitContextMenuItemPrivate.h"
</span><span class="cx"> #include "WebKitContextMenuPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitContextMenuItemcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> #include <WebCore/ContextMenuItem.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <memory>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebKitCookieManagerPrivate.h"
</span><span class="cx"> #include "WebKitEnumTypes.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,8 +29,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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitDownloadClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include <WebKit/WKString.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><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="trunkSourceWebKit2UIProcessAPIgtkWebKitFaviconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFileChooserRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "WebKitWebView.h"
</span><span class="cx"> #include "WebKitWebViewBasePrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitWebViewBasePrivate.h"
</span><span class="cx"> #include "WebKitWebViewPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitFormSubmissionRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "APIString.h"
</span><span class="cx"> #include "WebFormSubmissionListenerProxy.h"
</span><span class="cx"> #include "WebKitFormSubmissionRequestPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitInjectedBundleClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,7 +27,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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx"> using namespace WebCore;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitJavascriptResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APISerializedScriptValue.h"
</span><span class="cx"> #include "WebKitJavascriptResultPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</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 (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,7 +27,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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitMimeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #include "WebKitMimeInfo.h"
</span><span class="cx">
</span><span class="cx"> #include "WebKitMimeInfoPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> struct _WebKitMimeInfo {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationActioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebKitNavigationActionPrivate.h"
</span><span class="cx"> #include <gdk/gdk.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitNavigationPolicyDecisioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "WebKitPolicyDecisionPrivate.h"
</span><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "WebKitResponsePolicyDecisionPrivate.h"
</span><span class="cx"> #include "WebKitWebViewBasePrivate.h"
</span><span class="cx"> #include "WebKitWebViewPrivate.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitPrintOperationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if HAVE(GTK_UNIX_PRINTING)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitResponsePolicyDecisioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "WebKitURIRequestPrivate.h"
</span><span class="cx"> #include "WebKitURIResponsePrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include "WebKitWindowPropertiesPrivate.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</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 (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <WebCore/GUniquePtrSoup.h>
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUserContentManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include "WebKitUserContentPrivate.h"
</span><span class="cx"> #include "WebKitWebContextPrivate.h"
</span><span class="cx"> #include "WebScriptMessageHandler.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include "WebKitMarshal.h"
</span><span class="cx"> #include "WebKitWebInspectorPrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "WebKitURIRequest.h"
</span><span class="cx"> #include "WebKitWebResourcePrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if USE(LIBNOTIFY)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServerWebSocketServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> #include <gio/gio.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServergtkWebInspectorServerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> #include <WebCore/MIMETypeRegistry.h>
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebKit2UIProcessInspectorServersoupWebSocketServerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <WebCore/SocketStreamHandle.h>
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><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="trunkSourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> #include <glib.h>
</span><span class="cx"> #include <locale.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><ins>+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
</del><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsgtkPluginInfoCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include "PluginModuleInfo.h"
</span><span class="cx"> #include <mutex>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="cx"> #include <glib.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkDragAndDropHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/PasteboardHelper.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkGestureControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/GestureController.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/GestureController.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/GestureController.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/FloatPoint.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef union _GdkEvent GdkEvent;
</span><span class="cx"> typedef struct _GdkEventSequence GdkEventSequence;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkInputMethodFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkInputMethodFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/InputMethodFilter.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include <WebCore/IntPoint.h>
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _GdkEventKey GdkEventKey;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -37,7 +37,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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <WebCore/GtkUtilities.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><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="trunkSourceWebKit2UIProcessgtkWebPopupMenuProxyGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define WebPopupMenuProxyGtk_h
</span><span class="cx">
</span><span class="cx"> #include "WebPopupMenuProxy.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _GMainLoop GMainLoop;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -38,7 +38,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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiessoupWebCookieManagerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #include <WebCore/CookieJarSoup.h>
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><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="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebExtensioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "WebKitWebPagePrivate.h"
</span><span class="cx"> #include <WebCore/DNS.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "WebKitPrivate.h"
</span><span class="cx"> #include "WebKitWebHitTestResultPrivate.h"
</span><span class="cx"> #include <glib/gi18n-lib.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportgtkWebEditorClientGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include <WebCore/KeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Pasteboard.h>
</span><span class="cx"> #include <WebCore/markup.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">
</span><span class="cx"> #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</span><span class="cx"> #include "WebPageAccessibilityObject.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkLayerTreeHostGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include "TextureMapperLayer.h"
</span><span class="cx"> #include <WebCore/GLContext.h>
</span><span class="cx"> #include <WebCore/GraphicsLayerClient.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkPrinterListGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _GtkPrinter GtkPrinter;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPageGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> #include <WebCore/PlatformKeyboardEvent.h>
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="cx"> #include <WebCore/UserAgentGtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</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 (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> #if HAVE(GTK_UNIX_PRINTING)
</span><span class="cx"> #include "PrinterListGtk.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagegtkWebPrintOperationGtkh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <WebCore/RefPtrCairo.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _GtkPrintSettings GtkPrintSettings;
</span><span class="cx"> typedef struct _GtkPageSetup GtkPageSetup;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessgtkWebGtkExtensionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _WebKitWebExtension WebKitWebExtension;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebKitSoupRequestInputStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #include "WebKitSoupRequestInputStream.h"
</span><span class="cx">
</span><span class="cx"> #include <wtf/Threading.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> struct AsyncReadData {
</span><span class="cx"> AsyncReadData(GSimpleAsyncResult* result, void* buffer, gsize count, GCancellable* cancellable)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -42,8 +42,8 @@
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <wtf/RAMSize.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebSoupRequestManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> typedef struct _GInputStream GInputStream;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/ChangeLog 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -1,3 +1,101 @@
</span><ins>+2015-06-12 Zan Dobersek <zdobersek@igalia.com>
+
+ [GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
+ https://bugs.webkit.org/show_bug.cgi?id=145799
+
+ Reviewed by Carlos Garcia Campos.
+
+ Update header inclusions for headers that have been moved
+ to Source/WTF/wtf/glib/.
+
+ Also move the unit tests under TestWebKitAPI/Tests/WTF/gobject/
+ to TestWebKitAPI/Tests/WTF/glib/ and update the build rules.
+
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp.
+ (TestWebKitAPI::GMainLoopSourceTest::GMainLoopSourceTest):
+ (TestWebKitAPI::GMainLoopSourceTest::~GMainLoopSourceTest):
+ (TestWebKitAPI::GMainLoopSourceTest::runLoop):
+ (TestWebKitAPI::GMainLoopSourceTest::delayedFinish):
+ (TestWebKitAPI::GMainLoopSourceTest::finish):
+ (TestWebKitAPI::GMainLoopSourceTest::source):
+ (TestWebKitAPI::basicRescheduling):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::reentrantRescheduling):
+ (TestWebKitAPI::cancelRepeatingSourceDuringDispatch):
+ (TestWebKitAPI::basicDestroyCallbacks):
+ (TestWebKitAPI::destroyCallbacksAfterCancellingDuringDispatch):
+ (TestWebKitAPI::destroyCallbacksAfterReschedulingDuringDispatch):
+ * TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp.
+ (log):
+ (takeLogStr):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::returnOutChar):
+ * TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp:
+ * TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp:
+ (TestWebKitAPI::GMainLoopSourceTest::GMainLoopSourceTest): Deleted.
+ (TestWebKitAPI::GMainLoopSourceTest::~GMainLoopSourceTest): Deleted.
+ (TestWebKitAPI::GMainLoopSourceTest::runLoop): Deleted.
+ (TestWebKitAPI::GMainLoopSourceTest::delayedFinish): Deleted.
+ (TestWebKitAPI::GMainLoopSourceTest::finish): Deleted.
+ (TestWebKitAPI::GMainLoopSourceTest::source): Deleted.
+ (TestWebKitAPI::basicRescheduling): Deleted.
+ (TestWebKitAPI::TEST): Deleted.
+ (TestWebKitAPI::reentrantRescheduling): Deleted.
+ (TestWebKitAPI::cancelRepeatingSourceDuringDispatch): Deleted.
+ (TestWebKitAPI::basicDestroyCallbacks): Deleted.
+ (TestWebKitAPI::destroyCallbacksAfterCancellingDuringDispatch): Deleted.
+ (TestWebKitAPI::destroyCallbacksAfterReschedulingDuringDispatch): Deleted.
+ * TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp:
+ (log): Deleted.
+ (takeLogStr): Deleted.
+ (TestWebKitAPI::TEST): Deleted.
+ (TestWebKitAPI::returnOutChar): Deleted.
+ * TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp:
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h:
+ * TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:
+ * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp:
+ * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp:
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h:
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp:
+ * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h:
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/TestRunner.h:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h:
+ * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp:
+ * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+ * WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp:
+ * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+ * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+
</ins><span class="cx"> 2015-06-12 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix deprecated declarations warnings related to WK2 versioned structs
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)
</span><span class="cx">
</span><span class="cx"> list(APPEND TestWTF_SOURCES
</span><ins>+ ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/GMainLoopSource.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/GUniquePtr.cpp
</ins><span class="cx"> ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/WorkQueueGLib.cpp
</span><del>- ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GMainLoopSource.cpp
- ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
</del><span class="cx"> )
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFglibGMainLoopSourcecpp"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,547 @@
</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.
+ */
+
+#include "config.h"
+
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
+#include <stdio.h>
+
+namespace TestWebKitAPI {
+
+template <typename T>
+class GMainLoopSourceTest {
+public:
+ GMainLoopSourceTest()
+ : m_mainLoop(g_main_loop_new(nullptr, TRUE))
+ {
+ }
+
+ ~GMainLoopSourceTest()
+ {
+ g_main_loop_unref(m_mainLoop);
+ }
+
+ void runLoop()
+ {
+ g_main_loop_run(m_mainLoop);
+ }
+
+ void delayedFinish()
+ {
+ g_timeout_add(250,
+ [](gpointer data) {
+ GMainLoopSourceTest& test = *static_cast<GMainLoopSourceTest*>(data);
+ test.finish();
+ return G_SOURCE_REMOVE;
+ }, this);
+ }
+
+ void finish()
+ {
+ g_main_loop_quit(m_mainLoop);
+ }
+
+ T& source() { return m_source; }
+
+private:
+ GMainLoop* m_mainLoop;
+ T m_source;
+};
+
+template <typename T>
+static void basicRescheduling(T& context)
+{
+ EXPECT_TRUE(!context.test.source().isActive());
+
+ context.test.source().schedule("[Test] FirstTask", [&] {
+ // This should never be called. That's why we assert
+ // that the variable is false a few lines later.
+ context.finishedFirstTask = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.source().schedule("[Test] SecondTask", [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.finishedSecondTask = true;
+ context.test.finish();
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_FALSE(context.finishedFirstTask);
+ EXPECT_TRUE(context.finishedSecondTask);
+}
+
+TEST(WTF_GMainLoopSource, BasicRescheduling)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ bool finishedFirstTask = false;
+ bool finishedSecondTask = false;
+ } context;
+ basicRescheduling<TestingContext>(context);
+
+ struct ThreadSafeTestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ bool finishedFirstTask = false;
+ bool finishedSecondTask = false;
+ } threadSafeContext;
+ basicRescheduling<ThreadSafeTestingContext>(threadSafeContext);
+}
+
+template <typename T>
+static void reentrantRescheduling(T& context)
+{
+ EXPECT_TRUE(!context.test.source().isActive());
+
+ context.test.source().schedule("[Test] FirstTask", [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+
+ context.test.source().schedule("[Test] SecondTask", [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ EXPECT_TRUE(context.finishedFirstTask);
+
+ context.finishedSecondTask = true;
+ context.test.finish();
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.finishedFirstTask = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_TRUE(context.finishedFirstTask);
+ EXPECT_TRUE(context.finishedSecondTask);
+}
+
+TEST(WTF_GMainLoopSource, ReentrantRescheduling)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ bool finishedFirstTask = false;
+ bool finishedSecondTask = false;
+ } context;
+ reentrantRescheduling<TestingContext>(context);
+
+ struct ThreadSafeTestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ bool finishedFirstTask = false;
+ bool finishedSecondTask = false;
+ } threadSafeContext;
+ reentrantRescheduling<ThreadSafeTestingContext>(threadSafeContext);
+}
+
+TEST(WTF_GMainLoopSource, ReschedulingFromDifferentThread)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ bool finishedFirstTask;
+ bool finishedSecondTask;
+ } context;
+
+ EXPECT_TRUE(!context.test.source().isActive());
+
+ context.test.source().schedule("[Test] FirstTask", [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+
+ g_usleep(1 * G_USEC_PER_SEC);
+ context.finishedFirstTask = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ GThread* helperThread = g_thread_new(nullptr, [](gpointer data) -> gpointer {
+ g_usleep(0.25 * G_USEC_PER_SEC);
+
+ TestingContext& context = *static_cast<TestingContext*>(data);
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ EXPECT_FALSE(context.finishedFirstTask);
+
+ context.test.source().schedule("[Test] SecondTask", [&] {
+ EXPECT_TRUE(context.finishedFirstTask);
+
+ context.finishedSecondTask = true;
+ context.test.finish();
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ g_thread_exit(nullptr);
+ return nullptr;
+ }, &context);
+
+ context.test.runLoop();
+ g_thread_unref(helperThread);
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_TRUE(context.finishedFirstTask);
+ EXPECT_TRUE(context.finishedSecondTask);
+}
+
+TEST(WTF_GMainLoopSource, DestructionDuringDispatch)
+{
+ // This is just a raw test that ensures deleting the GMainLoopSource object during
+ // dispatch does not cause problems. This test succeeds if it doesn't crash.
+
+ GMainLoopSource* source;
+ GMainLoop* loop = g_main_loop_new(nullptr, TRUE);
+
+ source = new GMainLoopSource;
+ source->schedule("[Test] DestroySourceTask", [&] {
+ delete source;
+ g_main_loop_quit(loop);
+ });
+ g_main_loop_run(loop);
+
+ source = new GMainLoopSource;
+ source->schedule("[Test] DestroySourceTask", std::function<bool ()>([&] {
+ delete source;
+ g_main_loop_quit(loop);
+ return false;
+ }));
+ g_main_loop_run(loop);
+
+ g_main_loop_unref(loop);
+}
+
+template <typename T>
+static void cancelRepeatingSourceDuringDispatch(T& context)
+{
+ EXPECT_TRUE(!context.test.source().isActive());
+
+ context.test.source().schedule("[Test] RepeatingTask",
+ std::function<bool ()>([&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+
+ context.callCount++;
+ if (context.callCount == 3)
+ context.test.source().cancel();
+ return true;
+ }));
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_EQ(3, context.callCount);
+}
+
+TEST(WTF_GMainLoopSource, CancelRepeatingSourceDuringDispatch)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ unsigned callCount = 0;
+ } context;
+ cancelRepeatingSourceDuringDispatch<TestingContext>(context);
+
+ struct ThreadSafeTestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ unsigned callCount = 0;
+ } threadSafeContext;
+ cancelRepeatingSourceDuringDispatch<ThreadSafeTestingContext>(threadSafeContext);
+}
+
+template <typename T>
+static void basicDestroyCallbacks()
+{
+ {
+ T context;
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.test.source().schedule("[Test] DestroyCallback",
+ [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.callbackCalled = true;
+ }, G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.destroyCallbackCalled = true;
+ context.test.finish();
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_TRUE(context.callbackCalled);
+ EXPECT_TRUE(context.destroyCallbackCalled);
+ }
+
+ {
+ T context;
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.test.source().schedule("[Test] DestroyCallback",
+ std::function<bool ()>([&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.callbackCalled = true;
+ return false;
+ }), G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.destroyCallbackCalled = true;
+ context.test.finish();
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_TRUE(context.callbackCalled);
+ EXPECT_TRUE(context.destroyCallbackCalled);
+ }
+}
+
+TEST(WTF_GMainLoopSource, BasicDestroyCallbacks)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ bool callbackCalled = false;
+ bool destroyCallbackCalled = false;
+ };
+ basicDestroyCallbacks<TestingContext>();
+
+ struct ThreadSafeTestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ bool callbackCalled = false;
+ bool destroyCallbackCalled = false;
+ };
+ basicDestroyCallbacks<ThreadSafeTestingContext>();
+}
+
+template <typename T>
+static void destroyCallbacksAfterCancellingDuringDispatch()
+{
+ {
+ T context;
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.test.source().schedule("[Test] DestroyCallback",
+ [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.callbackCallCount++;
+ context.test.source().cancel();
+ }, G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.destroyCallbackCalled = true;
+ context.test.finish();
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_EQ(1, context.callbackCallCount);
+ EXPECT_TRUE(context.destroyCallbackCalled);
+ }
+
+ {
+ T context;
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.test.source().schedule("[Test] DestroyCallback",
+ std::function<bool ()>([&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.callbackCallCount++;
+ if (context.callbackCallCount == 3)
+ context.test.source().cancel();
+ return true;
+ }), G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.destroyCallbackCalled = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_EQ(3, context.callbackCallCount);
+ EXPECT_TRUE(context.destroyCallbackCalled);
+ }
+}
+
+TEST(WTF_GMainLoopSource, DestroyCallbacksAfterCancellingDuringDispatch)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ unsigned callbackCallCount= 0;
+ bool destroyCallbackCalled = false;
+ };
+ destroyCallbacksAfterCancellingDuringDispatch<TestingContext>();
+
+ struct ThreadSafeTestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ unsigned callbackCallCount= 0;
+ bool destroyCallbackCalled = false;
+ };
+ destroyCallbacksAfterCancellingDuringDispatch<ThreadSafeTestingContext>();
+}
+
+template <typename T>
+static void destroyCallbacksAfterReschedulingDuringDispatch()
+{
+ {
+ T context;
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.test.source().schedule("[Test] BaseCallback",
+ [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.firstCallbackCallCount++;
+ context.test.source().schedule("[Test] ReschedulingCallback",
+ [&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.secondCallbackCallCount++;
+ }, G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.secondDestroyCallbackCalled = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+ }, G_PRIORITY_DEFAULT,
+ [&] {
+ // At this point the GMainLoopSource has been rescheduled, ergo the Scheduled status.
+ EXPECT_TRUE(context.test.source().isScheduled());
+ context.firstDestroyCallbackCalled = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_EQ(1, context.firstCallbackCallCount);
+ EXPECT_TRUE(context.firstDestroyCallbackCalled);
+ EXPECT_EQ(1, context.secondCallbackCallCount);
+ EXPECT_TRUE(context.secondDestroyCallbackCalled);
+ }
+
+ {
+ T context;
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.test.source().schedule("[Test] BaseCallback",
+ std::function<bool ()>([&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.firstCallbackCallCount++;
+ context.test.source().schedule("[Test] ReschedulingCallback",
+ std::function<bool ()>([&] {
+ EXPECT_TRUE(context.test.source().isActive() && !context.test.source().isScheduled());
+ context.secondCallbackCallCount++;
+ return context.secondCallbackCallCount != 3;
+ }), G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_TRUE(!context.test.source().isActive());
+ context.secondDestroyCallbackCalled = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+ return true;
+ }), G_PRIORITY_DEFAULT,
+ [&] {
+ // At this point the GMainLoopSource has been rescheduled, ergo the Scheduled status.
+ EXPECT_TRUE(context.test.source().isScheduled());
+ context.firstDestroyCallbackCalled = true;
+ });
+ EXPECT_TRUE(context.test.source().isScheduled());
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+
+ EXPECT_TRUE(!context.test.source().isActive());
+ EXPECT_EQ(1, context.firstCallbackCallCount);
+ EXPECT_TRUE(context.firstDestroyCallbackCalled);
+ EXPECT_EQ(3, context.secondCallbackCallCount);
+ EXPECT_TRUE(context.secondDestroyCallbackCalled);
+ }
+}
+
+TEST(WTF_GMainLoopSource, DestroyCallbacksAfterReschedulingDuringDispatch)
+{
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ unsigned firstCallbackCallCount = 0;
+ bool firstDestroyCallbackCalled = false;
+ unsigned secondCallbackCallCount = 0;
+ bool secondDestroyCallbackCalled = false;
+ };
+ destroyCallbacksAfterReschedulingDuringDispatch<TestingContext>();
+
+ struct ThreadSafeTestingContext {
+ GMainLoopSourceTest<GThreadSafeMainLoopSource> test;
+ unsigned firstCallbackCallCount = 0;
+ bool firstDestroyCallbackCalled = false;
+ unsigned secondCallbackCallCount = 0;
+ bool secondDestroyCallbackCalled = false;
+ };
+ destroyCallbacksAfterReschedulingDuringDispatch<ThreadSafeTestingContext>();
+}
+
+TEST(WTF_GMainLoopSource, DeleteOnDestroySources)
+{
+ // Testing the delete-on-destroy sources is very limited. There's no good way
+ // of testing that the GMainLoopSource objects are deleted when their GSource
+ // is destroyed.
+
+ struct TestingContext {
+ GMainLoopSourceTest<GMainLoopSource> test;
+ unsigned callbackCallCount = 0;
+ bool destroyCallbackCalled = false;
+ } context;
+
+ {
+ TestingContext context;
+
+ GMainLoopSource::scheduleAndDeleteOnDestroy("[Test] DeleteOnDestroy",
+ [&] {
+ context.callbackCallCount++;
+ }, G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_FALSE(context.destroyCallbackCalled);
+ context.destroyCallbackCalled = true;
+ });
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+ EXPECT_EQ(1, context.callbackCallCount);
+ EXPECT_TRUE(context.destroyCallbackCalled);
+ }
+
+ {
+ TestingContext context;
+
+ GMainLoopSource::scheduleAndDeleteOnDestroy("[Test] DeleteOnDestroy",
+ std::function<bool ()>([&] {
+ context.callbackCallCount++;
+ return context.callbackCallCount != 3;
+ }), G_PRIORITY_DEFAULT,
+ [&] {
+ EXPECT_FALSE(context.destroyCallbackCalled);
+ context.destroyCallbackCalled = true;
+ });
+
+ context.test.delayedFinish();
+ context.test.runLoop();
+ EXPECT_EQ(3, context.callbackCallCount);
+ EXPECT_TRUE(context.destroyCallbackCalled);
+ }
+}
+
+} // namespace TestWebKitAPI
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFglibGUniquePtrcpp"></a>
<div class="addfile"><h4>Added: trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp (0 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -0,0 +1,195 @@
</span><ins>+/*
+ * Copyright (C) 2014 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include <gio/gio.h>
+
+inline std::ostringstream& log()
+{
+ static std::ostringstream log;
+ return log;
+}
+
+inline std::string takeLogStr()
+{
+ std::string string = log().str();
+ log().str("");
+ return string;
+}
+
+static void (* _g_free)(void*) = g_free;
+#define g_free(x) \
+ log() << "g_free(" << ptr << ");"; \
+ _g_free(x);
+
+static void (* _g_error_free)(GError*) = g_error_free;
+#define g_error_free(x) \
+ log() << "g_error_free(" << ptr << ");"; \
+ _g_error_free(x);
+
+static void (* _g_list_free)(GList*) = g_list_free;
+#define g_list_free(x) \
+ log() << "g_list_free(" << ptr << ");"; \
+ _g_list_free(x);
+
+static void (* _g_slist_free)(GSList*) = g_slist_free;
+#define g_slist_free(x) \
+ log() << "g_slist_free(" << ptr << ");"; \
+ _g_slist_free(x);
+
+static void (* _g_pattern_spec_free)(GPatternSpec*) = g_pattern_spec_free;
+#define g_pattern_spec_free(x) \
+ log() << "g_pattern_spec_free(" << ptr << ");"; \
+ _g_pattern_spec_free(x);
+
+static void (* _g_dir_close)(GDir*) = g_dir_close;
+#define g_dir_close(x) \
+ log() << "g_dir_close(" << ptr << ");"; \
+ _g_dir_close(x);
+
+static void (* _g_timer_destroy)(GTimer*) = g_timer_destroy;
+#define g_timer_destroy(x) \
+ log() << "g_timer_destroy(" << ptr << ");"; \
+ _g_timer_destroy(x);
+
+static void (* _g_key_file_free)(GKeyFile*) = g_key_file_free;
+#define g_key_file_free(x) \
+ log() << "g_key_file_free(" << ptr << ");"; \
+ _g_key_file_free(x);
+
+#include <wtf/glib/GUniquePtr.h>
+
+namespace TestWebKitAPI {
+
+TEST(WTF_GUniquePtr, Basic)
+{
+ std::ostringstream actual;
+
+ {
+ GUniquePtr<char> a(g_strdup("a"));
+ actual << "g_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GError> a(g_error_new_literal(G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "a"));
+ actual << "g_error_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GList> a(g_list_prepend(nullptr, g_strdup("a")));
+ actual << "g_list_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GSList> a(g_slist_prepend(nullptr, g_strdup("a")));
+ actual << "g_slist_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GPatternSpec> a(g_pattern_spec_new("a"));
+ actual << "g_pattern_spec_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GDir> a(g_dir_open("/tmp", 0, nullptr));
+ actual << "g_dir_close(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GTimer> a(g_timer_new());
+ actual << "g_timer_destroy(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniquePtr<GKeyFile> a(g_key_file_new());
+ actual << "g_key_file_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+}
+
+static void returnOutChar(char** outChar)
+{
+ *outChar = g_strdup("a");
+}
+
+TEST(WTF_GUniquePtr, OutPtr)
+{
+ std::ostringstream actual;
+
+ {
+ GUniqueOutPtr<char> a;
+ ASSERT_EQ(nullptr, a.get());
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniqueOutPtr<char> a;
+ returnOutChar(&a.outPtr());
+ actual << "g_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniqueOutPtr<char> a;
+ returnOutChar(&a.outPtr());
+ actual << "g_free(" << a.get() << ");";
+ returnOutChar(&a.outPtr());
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+ actual << "g_free(" << a.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+
+ {
+ GUniqueOutPtr<char> a;
+ returnOutChar(&a.outPtr());
+ GUniquePtr<char> b = a.release();
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual << "g_free(" << b.get() << ");";
+ }
+ ASSERT_STREQ(actual.str().c_str(), takeLogStr().c_str());
+ actual.str("");
+}
+
+} // namespace TestWebKitAPI
</ins></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFglibWorkQueueGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <thread>
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2gtkInputMethodFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #include <WebKit/InputMethodFilter.h>
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeFilterTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _WebKitNodeFilter {
</span><span class="cx"> GObject parent;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkDOMNodeTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> class WebKitDOMNodeTest : public WebProcessTest {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkDOMXPathNSResolverTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> typedef struct _WebKitXPathNSResolver {
</span><span class="cx"> GObject parent;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestAuthenticationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "LoadTrackingTest.h"
</span><span class="cx"> #include "WebKitTestServer.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestContextMenucpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> class ContextMenuTest: public WebViewTest {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestDownloadscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> class DownloadTest: public Test {
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> class InspectorTest: public WebViewTest {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestInspectorServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #include "WebViewTest.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> // Name of the test server application creating the webView object.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestPrintingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <glib/gstdio.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef HAVE_GTK_UNIX_PRINTING
</span><span class="cx"> #include <gtk/gtkunixprint.h>
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,9 +22,9 @@
</span><span class="cx"> #include "WebKitTestServer.h"
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> static const char* kAlertDialogMessage = "WebKitGTK+ alert dialog message";
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebKitTestBus.h"
</span><span class="cx"> #include "WebViewTest.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> static const char* webExtensionsUserData = "Web Extensions user data";
</span><span class="cx"> static WebKitTestBus* bus;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitAccessibilitycpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/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></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitFaviconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include "WebViewTest.h"
</span><span class="cx"> #include <glib/gstdio.h>
</span><span class="cx"> #include <libsoup/soup.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitFindControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> #include "LoadTrackingTest.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> static const char* testString = "<html><body>first testing second testing secondHalf</body></html>";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitPolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> #include "LoadTrackingTest.h"
</span><span class="cx"> #include "WebKitTestServer.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include "WebKitTestServer.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> static WebKitTestServer* gServer;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitUserContentManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> #include <cstdarg>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> class UserContentManagerTest : public WebViewTest {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> static WebKitTestServer* kServer;
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include <JavaScriptCore/JSStringRef.h>
</span><span class="cx"> #include <JavaScriptCore/JSValueRef.h>
</span><span class="cx"> #include <glib/gstdio.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> class IsPlayingAudioWebViewTest : public WebViewTest {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebViewEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebViewTest.h"
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> class EditorTest: public WebViewTest {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #include <webkit2/webkit-web-extension.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/ProcessID.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> #define WEBKIT_DOM_USE_UNSTABLE_API
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebProcessTestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> static HashSet<GObject*> s_watchedObjects;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkWebProcessTesth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> #include <webkit2/webkit-web-extension.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkPlatformUtilitiesGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx"> namespace Util {
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkPlatformWebViewGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <WebCore/GUniquePtrGtk.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkTestMainh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -24,8 +24,8 @@
</span><span class="cx"> #include <glib-object.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/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></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebKitTestBus.h"
</span><span class="cx">
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> WebKitTestBus::WebKitTestBus()
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestBush"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #define WebKitTestBus_h
</span><span class="cx">
</span><span class="cx"> #include <gio/gio.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> class WebKitTestBus {
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> #include "WebKitTestServer.h"
</span><span class="cx">
</span><span class="cx"> #include "TestMain.h"
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> WebKitTestServer::WebKitTestServer(ServerType type)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkWebKitTestServerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx"> #include <webkit2/webkit2.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> class WebKitTestServer {
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleAccessibilityUIElementh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
</span><span class="cx"> #include "AccessibilityNotificationHandlerAtk.h"
</span><span class="cx"> #include <atk/atk.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx"> typedef GRefPtr<AtkObject> PlatformUIElement;
</span><span class="cx"> #else
</span><span class="cx"> typedef void* PlatformUIElement;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleTestRunnerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/TestRunner.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> #include <CoreFoundation/CFRunLoop.h>
</span><span class="cx"> typedef RetainPtr<CFRunLoopTimerRef> PlatformTimerRef;
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
</ins><span class="cx"> typedef GMainLoopSource PlatformTimerRef;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> typedef Ecore_Timer* PlatformTimerRef;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityControllerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #include <WebKit/WKBundlePagePrivate.h>
</span><span class="cx"> #include <atk/atk.h>
</span><span class="cx"> #include <cstdio>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> #include <WebKit/WKBundlePagePrivate.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/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></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityNotificationHandlerAtkh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #include <atk/atkobject.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleatkAccessibilityUIElementAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -40,8 +40,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> #include <atk/atk.h>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><del>-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/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></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkActivateFontsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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><del>-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
</del><ins>+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkInjectedBundleUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> #include "InjectedBundleUtilities.h"
</span><span class="cx">
</span><span class="cx"> #include <gtk/gtk.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
</del><ins>+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkTestRunnerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</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/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTR {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/PlatformGTK.cmake (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/PlatformGTK.cmake 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
</span><span class="cx"> ${FORWARDING_HEADERS_DIR}
</span><del>- ${WTF_DIR}/wtf/gobject
</del><ins>+ ${WTF_DIR}/wtf/glib
</ins><span class="cx"> ${ATK_INCLUDE_DIRS}
</span><span class="cx"> ${CAIRO_INCLUDE_DIRS}
</span><span class="cx"> ${GTK3_INCLUDE_DIRS}
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkEventSenderProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> #include <gdk/gdkkeysyms.h>
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><del>-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkTestControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (185501 => 185502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2015-06-12 13:17:09 UTC (rev 185501)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2015-06-12 13:32:03 UTC (rev 185502)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx"> #include "PlatformWebView.h"
</span><span class="cx"> #include <gtk/gtk.h>
</span><span class="cx"> #include <wtf/Platform.h>
</span><del>-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
</del><ins>+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WTR {
</span></span></pre>
</div>
</div>
</body>
</html>