[GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jun 2015 13:32:03 +0000 (13:32 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jun 2015 13:32:03 +0000 (13:32 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

208 files changed:
Source/WTF/ChangeLog
Source/WTF/WTF.vcxproj/WTF.vcxproj
Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
Source/WTF/WTF.vcxproj/copy-files.cmd
Source/WTF/wtf/Platform.h
Source/WTF/wtf/PlatformEfl.cmake
Source/WTF/wtf/PlatformGTK.cmake
Source/WTF/wtf/RunLoop.h
Source/WTF/wtf/WorkQueue.h
Source/WTF/wtf/glib/GLibUtilities.cpp [moved from Source/WTF/wtf/gobject/GlibUtilities.cpp with 98% similarity]
Source/WTF/wtf/glib/GLibUtilities.h [moved from Source/WTF/wtf/gobject/GlibUtilities.h with 95% similarity]
Source/WTF/wtf/glib/GMainLoopSource.cpp [moved from Source/WTF/wtf/gobject/GMainLoopSource.cpp with 100% similarity]
Source/WTF/wtf/glib/GMainLoopSource.h [moved from Source/WTF/wtf/gobject/GMainLoopSource.h with 99% similarity]
Source/WTF/wtf/glib/GMutexLocker.h [moved from Source/WTF/wtf/gobject/GMutexLocker.h with 100% similarity]
Source/WTF/wtf/glib/GRefPtr.cpp [moved from Source/WTF/wtf/gobject/GRefPtr.cpp with 100% similarity]
Source/WTF/wtf/glib/GRefPtr.h [moved from Source/WTF/wtf/gobject/GRefPtr.h with 100% similarity]
Source/WTF/wtf/glib/GThreadSafeMainLoopSource.cpp [moved from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp with 99% similarity]
Source/WTF/wtf/glib/GThreadSafeMainLoopSource.h [moved from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.h with 98% similarity]
Source/WTF/wtf/glib/GTypedefs.h [moved from Source/WTF/wtf/gobject/GTypedefs.h with 97% similarity]
Source/WTF/wtf/glib/GUniquePtr.h [moved from Source/WTF/wtf/gobject/GUniquePtr.h with 100% similarity]
Source/WTF/wtf/glib/MainThreadGLib.cpp
Source/WebCore/ChangeLog
Source/WebCore/accessibility/atk/AXObjectCacheAtk.cpp
Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp
Source/WebCore/bindings/gobject/DOMObjectCache.cpp
Source/WebCore/bindings/gobject/GObjectEventListener.h
Source/WebCore/bindings/gobject/GObjectNodeFilterCondition.h
Source/WebCore/bindings/gobject/GObjectXPathNSResolver.h
Source/WebCore/bindings/gobject/WebKitDOMEventTarget.cpp
Source/WebCore/platform/Pasteboard.h
Source/WebCore/platform/audio/gstreamer/AudioDestinationGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
Source/WebCore/platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp
Source/WebCore/platform/audio/gtk/AudioBusGtk.cpp
Source/WebCore/platform/geoclue/GeolocationProviderGeoclue.h
Source/WebCore/platform/geoclue/GeolocationProviderGeoclue2.cpp
Source/WebCore/platform/glib/BatteryProviderUPower.cpp
Source/WebCore/platform/glib/BatteryProviderUPower.h
Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
Source/WebCore/platform/graphics/gstreamer/GStreamerUtilities.cpp
Source/WebCore/platform/graphics/gstreamer/GUniquePtrGStreamer.h
Source/WebCore/platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp
Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h
Source/WebCore/platform/graphics/gstreamer/MediaSourceGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h
Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Source/WebCore/platform/graphics/gtk/ImageBufferGtk.cpp
Source/WebCore/platform/graphics/gtk/ImageGtk.cpp
Source/WebCore/platform/gtk/ContextMenuGtk.cpp
Source/WebCore/platform/gtk/ContextMenuItemGtk.cpp
Source/WebCore/platform/gtk/DataObjectGtk.cpp
Source/WebCore/platform/gtk/DataObjectGtk.h
Source/WebCore/platform/gtk/FileSystemGtk.cpp
Source/WebCore/platform/gtk/GRefPtrGtk.h
Source/WebCore/platform/gtk/GUniquePtrGtk.h
Source/WebCore/platform/gtk/GamepadsGtk.cpp
Source/WebCore/platform/gtk/GtkUtilities.cpp
Source/WebCore/platform/gtk/LanguageGtk.cpp
Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
Source/WebCore/platform/gtk/PasteboardHelper.cpp
Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp
Source/WebCore/platform/gtk/SharedBufferGtk.cpp
Source/WebCore/platform/gtk/SharedTimerGtk.cpp
Source/WebCore/platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp
Source/WebCore/platform/network/ResourceHandleInternal.h
Source/WebCore/platform/network/gtk/CredentialBackingStore.cpp
Source/WebCore/platform/network/soup/CertificateInfo.h
Source/WebCore/platform/network/soup/CookieJarSoup.cpp
Source/WebCore/platform/network/soup/DNSSoup.cpp
Source/WebCore/platform/network/soup/GRefPtrSoup.h
Source/WebCore/platform/network/soup/GUniquePtrSoup.h
Source/WebCore/platform/network/soup/ResourceError.h
Source/WebCore/platform/network/soup/ResourceErrorSoup.cpp
Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
Source/WebCore/platform/network/soup/ResourceResponse.h
Source/WebCore/platform/network/soup/SocketStreamHandle.h
Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp
Source/WebCore/platform/network/soup/SoupNetworkSession.h
Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp
Source/WebCore/rendering/RenderThemeGtk.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h
Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp
Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
Source/WebKit2/PlatformEfl.cmake
Source/WebKit2/PlatformGTK.cmake
Source/WebKit2/Shared/Downloads/soup/DownloadSoup.cpp
Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h
Source/WebKit2/Shared/PrintInfo.h
Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp
Source/WebKit2/Shared/gtk/ArgumentCodersGtk.h
Source/WebKit2/Shared/gtk/KeyedDecoder.h
Source/WebKit2/Shared/gtk/KeyedEncoder.h
Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListItem.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitColorChooser.h
Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitDownload.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitDownloadClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitFaviconDatabase.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitFormClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitJavascriptResult.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitMimeInfo.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitNavigationAction.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitPolicyClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitUserContentManager.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
Source/WebKit2/UIProcess/InspectorServer/WebSocketServer.h
Source/WebKit2/UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp
Source/WebKit2/UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
Source/WebKit2/UIProcess/Plugins/gtk/PluginInfoCache.h
Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
Source/WebKit2/UIProcess/gtk/DragAndDropHandler.cpp
Source/WebKit2/UIProcess/gtk/GestureController.h
Source/WebKit2/UIProcess/gtk/InputMethodFilter.cpp
Source/WebKit2/UIProcess/gtk/InputMethodFilter.h
Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp
Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.h
Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp
Source/WebKit2/WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp
Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
Source/WebKit2/WebProcess/WebPage/gtk/PrinterListGtk.h
Source/WebKit2/WebProcess/WebPage/gtk/WebPageGtk.cpp
Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
Source/WebKit2/WebProcess/WebPage/gtk/WebPrintOperationGtk.h
Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h
Source/WebKit2/WebProcess/soup/WebKitSoupRequestInputStream.cpp
Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
Source/WebKit2/WebProcess/soup/WebSoupRequestManager.h
Tools/ChangeLog
Tools/TestWebKitAPI/PlatformGTK.cmake
Tools/TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp [moved from Tools/TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp with 99% similarity]
Tools/TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp [moved from Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp with 99% similarity]
Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp
Tools/TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp
Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h
Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp
Tools/TestWebKitAPI/gtk/PlatformWebViewGtk.cpp
Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp
Tools/TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h
Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h
Tools/WebKitTestRunner/InjectedBundle/TestRunner.h
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h
Tools/WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp
Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp
Tools/WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp
Tools/WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp
Tools/WebKitTestRunner/PlatformGTK.cmake
Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp

index fa0c1fc..9917d9c 100644 (file)
@@ -1,3 +1,203 @@
+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.
+
 2015-06-10  Basile Clement  <basile_clement@apple.com>
 
         Unreviewed, fix an typo in unused template code.
index 407eb31..1f6f90e 100644 (file)
@@ -73,7 +73,7 @@
     <ClCompile Include="..\wtf\FastMalloc.cpp" />
     <ClCompile Include="..\wtf\FilePrintStream.cpp" />
     <ClCompile Include="..\wtf\FunctionDispatcher.cpp" />
-    <ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
+    <ClCompile Include="..\wtf\glib\GLibUtilities.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -83,7 +83,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
+    <ClCompile Include="..\wtf\glib\GMainLoopSource.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -93,7 +93,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GRefPtr.cpp">
+    <ClCompile Include="..\wtf\glib\GRefPtr.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp" />
+    <ClCompile Include="..\wtf\glib\GThreadSafeMainLoopSource.cpp" />
     <ClCompile Include="..\wtf\GregorianDateTime.cpp" />
     <ClCompile Include="..\wtf\HashTable.cpp" />
     <ClCompile Include="..\wtf\MainThread.cpp" />
     <ClInclude Include="..\wtf\FunctionDispatcher.h" />
     <ClInclude Include="..\wtf\Functional.h" />
     <ClInclude Include="..\wtf\GetPtr.h" />
-    <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" />
+    <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" />
     <ClInclude Include="..\wtf\GregorianDateTime.h" />
     <ClInclude Include="..\wtf\HashCountedSet.h" />
     <ClInclude Include="..\wtf\HashFunctions.h" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
index 68a2db1..c21b0cc 100644 (file)
@@ -22,7 +22,7 @@
     <Filter Include="wtf\unicode\icu">
       <UniqueIdentifier>{da29baba-10a2-4a74-ab87-2fea5e1382da}</UniqueIdentifier>
     </Filter>
-    <Filter Include="wtf\gobject">
+    <Filter Include="wtf\glib">
       <UniqueIdentifier>{edd6ccc8-e6ee-41ec-a58d-9404a30c0c7e}</UniqueIdentifier>
     </Filter>
     <Filter Include="wtf\win">
     <ClCompile Include="..\wtf\SixCharacterHash.cpp">
       <Filter>wtf</Filter>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
-      <Filter>wtf\gobject</Filter>
+    <ClCompile Include="..\wtf\glib\GLibUtilities.cpp">
+      <Filter>wtf\glib</Filter>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GRefPtr.cpp">
-      <Filter>wtf\gobject</Filter>
+    <ClCompile Include="..\wtf\glib\GRefPtr.cpp">
+      <Filter>wtf\glib</Filter>
     </ClCompile>
     <ClCompile Include="..\wtf\RunLoop.cpp">
       <Filter>wtf</Filter>
     <ClCompile Include="..\wtf\win\RunLoopWin.cpp">
       <Filter>wtf\win</Filter>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
-      <Filter>wtf\gobject</Filter>
+    <ClCompile Include="..\wtf\glib\GMainLoopSource.cpp">
+      <Filter>wtf\glib</Filter>
     </ClCompile>
     <ClCompile Include="..\wtf\FastBitVector.cpp">
       <Filter>wtf</Filter>
     </ClCompile>
-    <ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp">
-      <Filter>wtf\gobject</Filter>
+    <ClCompile Include="..\wtf\glib\GThreadSafeMainLoopSource.cpp">
+      <Filter>wtf\glib</Filter>
     </ClCompile>
     <ClCompile Include="..\wtf\RefCounter.cpp" />
     <ClCompile Include="..\wtf\win\WTFDLL.cpp">
     <ClInclude Include="..\wtf\win\GDIObject.h">
       <Filter>wtf\win</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GlibUtilities.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GLibUtilities.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GMutexLocker.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GMutexLocker.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GRefPtr.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GRefPtr.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GTypedefs.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GTypedefs.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
     <ClInclude Include="..\wtf\Bag.h">
       <Filter>wtf</Filter>
     <ClInclude Include="..\wtf\RunLoop.h">
       <Filter>wtf</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GMainLoopSource.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GMainLoopSource.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GUniquePtr.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GUniquePtr.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
     <ClInclude Include="..\wtf\HashMethod.h">
       <Filter>wtf</Filter>
     </ClInclude>
-    <ClInclude Include="..\wtf\gobject\GThreadSafeMainLoopSource.h">
-      <Filter>wtf\gobject</Filter>
+    <ClInclude Include="..\wtf\glib\GThreadSafeMainLoopSource.h">
+      <Filter>wtf\glib</Filter>
     </ClInclude>
     <ClInclude Include="..\wtf\RefCounter.h" />
     <ClInclude Include="..\wtf\WorkQueue.h">
index e7e659e..dd407f3 100755 (executable)
@@ -13,7 +13,7 @@ for %%d in (
     wtf\r
     wtf\cf\r
     wtf\dtoa\r
-    wtf\gobject\r
+    wtf\glib\r
     wtf\text\r
     wtf\threads\r
     wtf\unicode\r
index 7df445a..c620f78 100644 (file)
 #endif
 
 #if USE(GLIB)
-#include <wtf/gobject/GTypedefs.h>
+#include <wtf/glib/GTypedefs.h>
 #endif
 
 #if PLATFORM(EFL)
index 4c3131d..cd0bcf0 100644 (file)
@@ -4,9 +4,9 @@ list(APPEND WTF_SOURCES
     efl/RunLoopEfl.cpp
     efl/WorkQueueEfl.cpp
 
-    gobject/GMainLoopSource.cpp
-    gobject/GRefPtr.cpp
-    gobject/GThreadSafeMainLoopSource.cpp
+    glib/GMainLoopSource.cpp
+    glib/GRefPtr.cpp
+    glib/GThreadSafeMainLoopSource.cpp
 )
 
 list(APPEND WTF_LIBRARIES
index 58e3cd8..83220dc 100644 (file)
@@ -2,14 +2,13 @@ set(WTF_LIBRARY_TYPE STATIC)
 set(WTF_OUTPUT_NAME WTFGTK)
 
 list(APPEND WTF_SOURCES
+    glib/GLibUtilities.cpp
+    glib/GMainLoopSource.cpp
+    glib/GRefPtr.cpp
+    glib/GThreadSafeMainLoopSource.cpp
     glib/MainThreadGLib.cpp
     glib/RunLoopGLib.cpp
     glib/WorkQueueGLib.cpp
-
-    gobject/GMainLoopSource.cpp
-    gobject/GRefPtr.cpp
-    gobject/GThreadSafeMainLoopSource.cpp
-    gobject/GlibUtilities.cpp
 )
 
 list(APPEND WTF_LIBRARIES
index 850bce9..6f30236 100644 (file)
@@ -36,7 +36,7 @@
 #include <wtf/Threading.h>
 
 #if USE(GLIB)
-#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/glib/GMainLoopSource.h>
 #endif
 
 #if PLATFORM(EFL)
index 15d755f..6851c09 100644 (file)
@@ -39,8 +39,8 @@
 #endif
 
 #if PLATFORM(GTK)
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
 #elif PLATFORM(EFL)
 #include <DispatchQueueEfl.h>
 #elif OS(WINDOWS)
similarity index 98%
rename from Source/WTF/wtf/gobject/GlibUtilities.cpp
rename to Source/WTF/wtf/glib/GLibUtilities.cpp
index f08e333..5629b57 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-#include "GlibUtilities.h"
+#include "GLibUtilities.h"
 
 #if OS(WINDOWS)
 #include <windows.h>
similarity index 95%
rename from Source/WTF/wtf/gobject/GlibUtilities.h
rename to Source/WTF/wtf/glib/GLibUtilities.h
index ce10a05..7357824 100644 (file)
@@ -17,8 +17,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef GlibUtilities_h
-#define GlibUtilities_h
+#ifndef GLibUtilities_h
+#define GLibUtilities_h
 
 #include <wtf/Assertions.h>
 #include <wtf/text/CString.h>
similarity index 99%
rename from Source/WTF/wtf/gobject/GMainLoopSource.h
rename to Source/WTF/wtf/glib/GMainLoopSource.h
index 3125870..c3c1108 100644 (file)
@@ -31,7 +31,7 @@
 #include <functional>
 #include <glib.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GSocket GSocket;
 
@@ -29,7 +29,7 @@
 #if USE(GLIB)
 
 #include <gio/gio.h>
-#include <wtf/gobject/GMutexLocker.h>
+#include <wtf/glib/GMutexLocker.h>
 
 namespace WTF {
 
@@ -28,7 +28,7 @@
 
 #if USE(GLIB)
 
-#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/glib/GMainLoopSource.h>
 
 typedef struct _GRecMutex GRecMutex;
 
similarity index 97%
rename from Source/WTF/wtf/gobject/GTypedefs.h
rename to Source/WTF/wtf/glib/GTypedefs.h
index 32298d5..1459374 100644 (file)
@@ -17,8 +17,8 @@
  *  Boston, MA 02110-1301, USA.
  */
 
-#ifndef GtkTypedefs_h
-#define GtkTypedefs_h
+#ifndef WTF_GTypedefs_h
+#define WTF_GTypedefs_h
 
 /* Vanilla C code does not seem to be able to handle forward-declaration typedefs. */
 #ifdef  __cplusplus
@@ -107,4 +107,4 @@ typedef struct _GtkStyleContext GtkStyleContext;
 #endif
 
 #endif
-#endif /* GtkTypedefs_h */
+#endif // WTF_GTypedefs_h
index 598129a..649a9a5 100644 (file)
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "MainThread.h"
 
-#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/glib/GMainLoopSource.h>
 
 namespace WTF {
 
index ebafc7b..f9d285d 100644 (file)
@@ -1,3 +1,79 @@
+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:
+
 2015-06-12  Yoav Weiss  <yoav@yoav.ws>
 
         Fix the build when the PICTURE_SIZES flag is off
index b845115..2f35f74 100644 (file)
@@ -31,7 +31,7 @@
 #include "TextIterator.h"
 #include "WebKitAccessibleWrapperAtk.h"
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
index 4b97de9..ea68b03 100644 (file)
@@ -51,7 +51,7 @@
 #include "WebKitAccessibleUtil.h"
 #include "WebKitAccessibleWrapperAtk.h"
 #include "htmlediting.h"
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
index acb6f68..6f347bb 100644 (file)
@@ -28,7 +28,7 @@
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebKit {
 
index 58436fd..e117f40 100644 (file)
@@ -22,7 +22,7 @@
 #include "EventListener.h"
 #include "EventTarget.h"
 #include <wtf/RefPtr.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 typedef struct _GObject GObject;
index 911ed73..692764d 100644 (file)
@@ -24,7 +24,7 @@
 #include "WebKitDOMNodeFilter.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RetainPtr.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 class Node;
index eaa35f9..369ad05 100644 (file)
@@ -22,7 +22,7 @@
 #include "WebKitDOMXPathNSResolver.h"
 #include "XPathNSResolver.h"
 #include <wtf/PassRefPtr.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index ad8b224..9e3b12b 100644 (file)
@@ -36,7 +36,7 @@
 #include "WebKitDOMEvent.h"
 #include "WebKitDOMEventTargetPrivate.h"
 #include "WebKitDOMPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef WebKitDOMEventTargetIface WebKitDOMEventTargetInterface;
 
index fa12d2a..72b0254 100644 (file)
@@ -34,7 +34,7 @@
 
 #if PLATFORM(GTK)
 typedef struct _GtkClipboard GtkClipboard;
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #endif
 
 #if PLATFORM(IOS)
index 50c97ed..e5096c8 100644 (file)
@@ -29,7 +29,7 @@
 #include "Logging.h"
 #include "WebKitWebAudioSourceGStreamer.h"
 #include <gst/gst.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 
index 4975e6f..8b2e28e 100644 (file)
@@ -30,9 +30,9 @@
 #include <gst/audio/audio-info.h>
 #include <gst/gst.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 
index 062fac2..19f82fb 100644 (file)
@@ -26,7 +26,7 @@
 #include <gst/app/gstappsink.h>
 #include <gst/audio/audio-info.h>
 #include <gst/base/gstadapter.h>
-#include <wtf/gobject/GMutexLocker.h>
+#include <wtf/glib/GMutexLocker.h>
 
 
 namespace WebCore {
index 6ebb09e..4d92c11 100644 (file)
@@ -30,7 +30,7 @@
 #include <gst/app/gstappsrc.h>
 #include <gst/audio/audio-info.h>
 #include <gst/pbutils/missing-plugins.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 
index 7a7e78d..791bfa3 100644 (file)
@@ -24,8 +24,8 @@
 
 #include "AudioFileReader.h"
 #include <gio/gio.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 
index 654cee5..7c32593 100644 (file)
@@ -24,7 +24,7 @@
 #if ENABLE(GEOLOCATION)
 
 #include "GeolocationProviderGeoclueClient.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 #if USE(GEOCLUE2)
 #include "Geoclue2Interface.h"
index cea48f3..50b0095 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(GEOLOCATION) && USE(GEOCLUE2)
 
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 const char* gGeoclueBusName = "org.freedesktop.GeoClue2";
index efc8000..9fa4ef6 100644 (file)
@@ -25,7 +25,7 @@
 #include "BatteryProviderUPowerClient.h"
 #include <cmath>
 #include <limits>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 
index d1609bb..6e73e4f 100644 (file)
@@ -23,7 +23,7 @@
 #if ENABLE(BATTERY_STATUS)
 
 #include <libupower-glib/upower.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index 2ce0a1d..4ba533a 100644 (file)
@@ -21,7 +21,7 @@
 #define GRefPtrGStreamer_h
 #if USE(GSTREAMER)
 
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GstElement GstElement;
 typedef struct _GstPad GstPad;
index 279bdde..8c55955 100644 (file)
@@ -28,7 +28,7 @@
 #include <gst/gst.h>
 #include <gst/video/video-info.h>
 #include <wtf/MathExtras.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
 #define GST_USE_UNSTABLE_API
index c4d12b5..9bdd266 100644 (file)
@@ -22,7 +22,7 @@
 #if USE(GSTREAMER)
 
 #include <gst/gststructure.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WTF {
 
index 6222a68..b7dffa7 100644 (file)
@@ -31,7 +31,7 @@
 #include "GRefPtrGStreamer.h"
 #include "InbandTextTrackPrivate.h"
 #include "TrackPrivateBaseGStreamer.h"
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
 
 namespace WebCore {
 
index 2781221..a255333 100644 (file)
@@ -40,7 +40,7 @@
 #include <limits>
 #include <wtf/HexNumber.h>
 #include <wtf/MediaTime.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #if ENABLE(VIDEO_TRACK)
index 4c26f0d..260264c 100644 (file)
@@ -33,7 +33,7 @@
 #include <gst/gst.h>
 #include <gst/pbutils/install-plugins.h>
 #include <wtf/Forward.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
 
 #if ENABLE(VIDEO_TRACK) && USE(GSTREAMER_MPEGTS)
 #include <wtf/text/AtomicStringHash.h>
index 318a4f5..64a23d1 100644 (file)
@@ -38,7 +38,7 @@
 #include "VideoSinkGStreamer.h"
 #include "WebKitWebSourceGStreamer.h"
 #include <gst/gst.h>
-#include <wtf/gobject/GMutexLocker.h>
+#include <wtf/glib/GMutexLocker.h>
 #include <wtf/text/CString.h>
 
 #include <gst/audio/streamvolume.h>
index 89eaa79..3135733 100644 (file)
@@ -30,7 +30,7 @@
 #include <glib.h>
 
 #include <wtf/Forward.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
 
 #if USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
 #include "TextureMapperPlatformLayer.h"
index 8d33a20..3a2f859 100644 (file)
@@ -39,7 +39,7 @@
 #include "SourceBufferPrivateGStreamer.h"
 #include "WebKitMediaSourceGStreamer.h"
 
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index 5c9043c..d91fd1e 100644 (file)
@@ -35,7 +35,7 @@
 #include <glib-object.h>
 #include <gst/gst.h>
 #include <gst/tag/tag.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 GST_DEBUG_CATEGORY_EXTERN(webkit_media_player_debug);
index 9e68091..e3d6f41 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "GRefPtrGStreamer.h"
 #include <wtf/ThreadingPrimitives.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebCore {
index c972c4d..18704f8 100644 (file)
@@ -35,8 +35,8 @@
 #include <glib.h>
 #include <gst/gst.h>
 #include <gst/video/gstvideometa.h>
-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
 
 using namespace WebCore;
 
index 61cfeb8..31250ea 100644 (file)
@@ -31,7 +31,7 @@
 #include <gst/app/gstappsrc.h>
 #include <gst/gst.h>
 #include <gst/pbutils/missing-plugins.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 typedef struct _Source Source;
index 32e3c14..934daf8 100644 (file)
 #include <gst/pbutils/missing-plugins.h>
 #include <wtf/MainThread.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
index 78a60c1..316cd1c 100644 (file)
@@ -25,7 +25,7 @@
 #include "MIMETypeRegistry.h"
 #include <cairo.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/Base64.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
index e1b2bbc..49ccc91 100644 (file)
@@ -31,8 +31,8 @@
 #include "SharedBuffer.h"
 #include <cairo.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 
index 96cd268..a190855 100644 (file)
@@ -24,8 +24,8 @@
 #include "ContextMenu.h"
 
 #include <gtk/gtk.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 
index c40b371..d08afeb 100644 (file)
@@ -26,8 +26,8 @@
 
 #include "ContextMenu.h"
 #include <gtk/gtk.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #define WEBKIT_CONTEXT_MENU_ACTION "webkit-context-menu"
index f600176..1cd41b9 100644 (file)
@@ -20,7 +20,7 @@
 #include "DataObjectGtk.h"
 
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
index 850d280..dce5377 100644 (file)
@@ -22,7 +22,7 @@
 #include "FileList.h"
 #include "URL.h"
 #include <wtf/RefCounted.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/StringHash.h>
 
 namespace WebCore {
index b8eb29d..915ea69 100644 (file)
@@ -29,9 +29,9 @@
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index cdc7b7e..8f0426d 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef GRefPtrGtk_h
 #define GRefPtrGtk_h
 
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _SecretValue SecretValue;
 
index a7c7c44..64307da 100644 (file)
@@ -21,7 +21,7 @@
 #define GUniquePtrGtk_h
 
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WTF {
 
index f76d92f..26f9be6 100644 (file)
@@ -34,8 +34,8 @@
 #include <gio/gunixinputstream.h>
 #include <gudev/gudev.h>
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 
index acdaf4e..9f4e17a 100644 (file)
@@ -21,8 +21,8 @@
 
 #include "IntPoint.h"
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebCore {
 
index 58d3a91..515c82d 100644 (file)
@@ -21,7 +21,7 @@
 #include "Language.h"
 
 #include <wtf/Vector.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index 464c947..3cb7126 100644 (file)
@@ -36,7 +36,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <wtf/MathExtras.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index 6844a80..48daeb3 100644 (file)
@@ -29,7 +29,7 @@
 #include "Pasteboard.h"
 #include "TextResourceDecoder.h"
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
index 9c56258..8fcbb32 100644 (file)
@@ -32,7 +32,7 @@
 #include "Scrollbar.h"
 #include <gtk/gtk.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index 9f6b6c4..e1522f6 100644 (file)
@@ -20,7 +20,7 @@
 #include "SharedBuffer.h"
 
 #include "FileSystem.h"
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #include <glib.h>
index 133e906..cff7d73 100644 (file)
@@ -28,7 +28,7 @@
 #include "config.h"
 #include "SharedTimer.h"
 
-#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/glib/GMainLoopSource.h>
 
 namespace WebCore {
 
index ec25731..8ebd429 100644 (file)
@@ -49,7 +49,7 @@
 #include <owr/owr_media_source.h>
 #include <wtf/MainThread.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringHash.h>
 
index 6bcd536..448ea76 100644 (file)
@@ -51,8 +51,8 @@
 #if USE(SOUP)
 #include "GUniquePtrSoup.h"
 #include <libsoup/soup.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
 #endif
 
 #if PLATFORM(COCOA)
index 85137f0..ef2d391 100644 (file)
@@ -34,7 +34,7 @@
 #include <glib/gi18n-lib.h>
 #include <libsecret/secret.h>
 #include <libsoup/soup.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #endif
 
index 71dc288..206cdef 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "NotImplemented.h"
 #include <libsoup/soup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index 1301b57..fda244c 100644 (file)
@@ -30,7 +30,7 @@
 #include "NetworkingContext.h"
 #include "PlatformCookieJar.h"
 #include "SoupNetworkSession.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
index 1dfdda7..4cfdba5 100644 (file)
@@ -33,8 +33,8 @@
 #include "SoupNetworkSession.h"
 #include <libsoup/soup.h>
 #include <wtf/MainThread.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
index 69fdb25..a5988e2 100644 (file)
@@ -23,7 +23,7 @@
 #if USE(SOUP)
 
 #include <libsoup/soup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WTF {
 
index 32775fb..86dc637 100644 (file)
@@ -21,7 +21,7 @@
 #define GUniquePtrSoup_h
 
 #include <libsoup/soup.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WTF {
 
index 68efea9..e50297a 100644 (file)
@@ -30,7 +30,7 @@
 
 #if USE(SOUP)
 
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GTlsCertificate GTlsCertificate;
 typedef struct _SoupRequest SoupRequest;
index 1c93e6e..b25b5a0 100644 (file)
@@ -30,7 +30,7 @@
 
 #include "LocalizedStrings.h"
 #include <libsoup/soup.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 namespace WebCore {
index b7e8c78..ccfaf69 100644 (file)
@@ -59,7 +59,7 @@
 #endif
 #include <wtf/CurrentTime.h>
 #include <wtf/SHA1.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/Base64.h>
 #include <wtf/text/CString.h>
 
index 397e1a1..ff8be2a 100644 (file)
@@ -29,7 +29,7 @@
 #include "ResourceResponseBase.h"
 
 #include <libsoup/soup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index 5ff37ea..5e77d2c 100644 (file)
@@ -39,7 +39,7 @@
 
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WebCore {
 
index f8ccde4..5358c69 100644 (file)
@@ -44,7 +44,7 @@
 #include <glib.h>
 
 #include <wtf/Vector.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #define READ_BUFFER_SIZE 1024
index 893455a..9c8cfaa 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 typedef struct _SoupCache SoupCache;
index 0234291..59f23de 100644 (file)
@@ -35,7 +35,7 @@
 #include <hyphen.h>
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/AtomicStringHash.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringView.h>
index b7f0b4b..2a55757 100644 (file)
@@ -53,8 +53,8 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 
index 4f38f3e..02aca49 100644 (file)
@@ -1,3 +1,86 @@
+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:
+
 2015-06-12  Antti Koivisto  <antti@apple.com>
 
         Network Cache: Use SHA1 for key hash
index 7c04213..29e84b2 100644 (file)
@@ -35,7 +35,7 @@
 #include <wtf/text/WTFString.h>
 
 #if USE(SOUP)
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #endif
 
 namespace WebKit {
index 82a9df7..aa90a3d 100644 (file)
@@ -30,9 +30,9 @@
 
 #include "NetworkCacheFileSystem.h"
 #include <wtf/MainThread.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebKit {
 namespace NetworkCache {
index ba51881..c86ced0 100644 (file)
@@ -39,8 +39,8 @@
 #include <WebCore/SoupNetworkSession.h>
 #include <libsoup/soup.h>
 #include <wtf/RAMSize.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 
index 8dffe1d..19c3751 100644 (file)
@@ -256,8 +256,8 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/efl"
     "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
     "${WEBKIT2_DIR}/WebProcess/WebPage/CoordinatedGraphics"
-    "${WTF_DIR}/wtf/efl/"
-    "${WTF_DIR}/wtf/gobject"
+    "${WTF_DIR}/wtf/efl"
+    "${WTF_DIR}/wtf/glib"
 )
 
 list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
index f705ec6..1f64791 100644 (file)
@@ -485,8 +485,8 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
     "${WEBKIT2_DIR}/WebProcess/WebCoreSupport/soup"
     "${WEBKIT2_DIR}/WebProcess/WebPage/atk"
     "${WEBKIT2_DIR}/WebProcess/WebPage/gtk"
-    "${WTF_DIR}/wtf/gtk/"
-    "${WTF_DIR}/wtf/gobject"
+    "${WTF_DIR}/wtf/gtk"
+    "${WTF_DIR}/wtf/glib"
     "${WTF_DIR}"
 )
 
index 3ff282c..3c5797a 100644 (file)
@@ -32,9 +32,9 @@
 #include <WebCore/NotImplemented.h>
 #include <WebCore/ResourceHandleInternal.h>
 #include <gio/gio.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #if PLATFORM(GTK)
index e65fd12..858675a 100644 (file)
@@ -21,7 +21,7 @@
 #define CustomProtocolManagerImpl_h
 
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 typedef struct _GTask GTask;
index 8be9f8d..bcb2be1 100644 (file)
@@ -31,7 +31,7 @@ OBJC_CLASS NSPrintInfo;
 #elif PLATFORM(GTK)
 typedef struct _GtkPrintSettings GtkPrintSettings;
 typedef struct _GtkPageSetup GtkPageSetup;
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #else
 // FIXME: This should use the windows equivalent.
 class NSPrintInfo;
index ef1cb1a..501d6f1 100644 (file)
@@ -34,7 +34,7 @@
 #include <WebCore/GraphicsContext.h>
 #include <WebCore/GtkVersioning.h>
 #include <WebCore/PlatformContextCairo.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 using namespace WebKit;
index 4aa55de..80a5dc1 100644 (file)
@@ -27,7 +27,7 @@
 #define ArgumentCodersGtk_h
 
 #include "ArgumentCoders.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GtkPrintSettings GtkPrintSettings;
 typedef struct _GtkPageSetup GtkPageSetup;
index 083a7ac..8eb1c61 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/KeyedCoding.h>
 #include <glib.h>
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
index 7ea33fd..acbb76b 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/KeyedCoding.h>
 #include <glib.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WebKit {
index 3fe80f4..dd1d13c 100644 (file)
@@ -31,7 +31,7 @@
 #include <glib.h>
 
 #if ENABLE(DEVELOPER_MODE)
-#include <wtf/gobject/GlibUtilities.h>
+#include <wtf/glib/GLibUtilities.h>
 #endif
 
 using namespace WebCore;
index 2c8f89e..01e2810 100644 (file)
@@ -23,7 +23,7 @@
 #include "WebKitBackForwardListPrivate.h"
 #include "WebKitMarshal.h"
 #include "WebKitPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 /**
  * SECTION: WebKitBackForwardList
index b03c6a6..b295c99 100644 (file)
@@ -24,7 +24,7 @@
 #include "WebKitPrivate.h"
 #include <wtf/HashMap.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index a883bb1..24a941a 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "WebColorPickerGtk.h"
 #include "WebKitPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _WebKitColorChooserRequest WebKitColorChooserRequest;
 
index bff8cfe..e4f6cf0 100644 (file)
@@ -24,7 +24,7 @@
 #include "WebContextMenuItem.h"
 #include "WebKitContextMenuItemPrivate.h"
 #include "WebKitContextMenuPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebKit;
 using namespace WebCore;
index 68a84a9..6e7a27c 100644 (file)
@@ -30,8 +30,8 @@
 #include <WebCore/ContextMenuItem.h>
 #include <gtk/gtk.h>
 #include <memory>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebKit;
 using namespace WebCore;
index 1e9c528..6f47f60 100644 (file)
@@ -25,7 +25,7 @@
 #include "WebCookieManagerProxy.h"
 #include "WebKitCookieManagerPrivate.h"
 #include "WebKitEnumTypes.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 7d5af63..4b4e374 100644 (file)
@@ -29,8 +29,8 @@
 #include <WebCore/ErrorsGtk.h>
 #include <WebCore/ResourceResponse.h>
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebKit;
 using namespace WebCore;
index df7c47f..cc72081 100644 (file)
@@ -26,7 +26,7 @@
 #include "WebKitWebContextPrivate.h"
 #include "WebProcessPool.h"
 #include <WebKit/WKString.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
index f45fe84..80ac15a 100644 (file)
@@ -29,8 +29,8 @@
 #include <WebCore/RefPtrCairo.h>
 #include <glib/gi18n-lib.h>
 #include <wtf/RunLoop.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 0a02fbe..b235976 100644 (file)
@@ -27,8 +27,8 @@
 #include "WebOpenPanelResultListenerProxy.h"
 #include <WebCore/FileSystem.h>
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 17b1d5d..0830bcc 100644 (file)
@@ -25,7 +25,7 @@
 #include "WebKitWebView.h"
 #include "WebKitWebViewBasePrivate.h"
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 189d35d..12ec927 100644 (file)
@@ -26,7 +26,7 @@
 #include "WebKitPrivate.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebKitWebViewPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebKit;
 
index 84fd80c..d2d5e68 100644 (file)
@@ -24,7 +24,7 @@
 #include "APIString.h"
 #include "WebFormSubmissionListenerProxy.h"
 #include "WebKitFormSubmissionRequestPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index b2134eb..7205f0a 100644 (file)
@@ -27,7 +27,7 @@
 #include "WebKitWebContextPrivate.h"
 #include "WebKitWebResourcePrivate.h"
 #include "WebKitWebViewPrivate.h"
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebKit;
 using namespace WebCore;
index 2e64f01..221eac7 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "APISerializedScriptValue.h"
 #include "WebKitJavascriptResultPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebKit;
 
index 3203090..e46fa1c 100644 (file)
@@ -27,7 +27,7 @@
 #include "WebKitURIResponsePrivate.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebKitWebViewPrivate.h"
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 2282ede..9954cfb 100644 (file)
@@ -21,7 +21,7 @@
 #include "WebKitMimeInfo.h"
 
 #include "WebKitMimeInfoPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 struct _WebKitMimeInfo {
index 43c70a6..aff6283 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "WebKitNavigationActionPrivate.h"
 #include <gdk/gdk.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebKit;
 
index 00bd8ac..e576972 100644 (file)
@@ -26,7 +26,7 @@
 #include "WebKitPolicyDecisionPrivate.h"
 #include "WebKitURIRequestPrivate.h"
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 0356617..2d4eac5 100644 (file)
@@ -25,7 +25,7 @@
 #include "WebKitResponsePolicyDecisionPrivate.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebKitWebViewPrivate.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 65911b4..a6e524b 100644 (file)
@@ -27,8 +27,8 @@
 #include <WebCore/GtkUtilities.h>
 #include <WebCore/NotImplemented.h>
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #if HAVE(GTK_UNIX_PRINTING)
index 76c3b92..69b241f 100644 (file)
@@ -25,7 +25,7 @@
 #include "WebKitURIRequestPrivate.h"
 #include "WebKitURIResponsePrivate.h"
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index ed384cb..55bcdf4 100644 (file)
@@ -33,7 +33,7 @@
 #include "WebKitWindowPropertiesPrivate.h"
 #include "WebPageProxy.h"
 #include <WebCore/GtkUtilities.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebKit;
 
index f751a10..d66cb3a 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/GUniquePtrSoup.h>
 #include <WebCore/ResourceError.h>
 #include <libsoup/soup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 2759949..198531a 100644 (file)
@@ -27,7 +27,7 @@
 #include "WebKitUserContentPrivate.h"
 #include "WebKitWebContextPrivate.h"
 #include "WebScriptMessageHandler.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebCore;
 using namespace WebKit;
index 5a5ed16..dd68843 100644 (file)
@@ -59,8 +59,8 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 5d6a9be..7b46d52 100644 (file)
@@ -24,7 +24,7 @@
 #include "WebKitMarshal.h"
 #include "WebKitWebInspectorPrivate.h"
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index bde64b9..dba7f70 100644 (file)
@@ -26,7 +26,7 @@
 #include "WebKitURIRequest.h"
 #include "WebKitWebResourcePrivate.h"
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 53e8a60..cfe81e1 100644 (file)
@@ -67,7 +67,7 @@
 #include <WebCore/GtkUtilities.h>
 #include <WebCore/RefPtrCairo.h>
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 #if USE(LIBNOTIFY)
index de31449..0a17e97 100644 (file)
@@ -63,7 +63,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <memory>
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 #if ENABLE(FULLSCREEN_API)
index 6d5b388..2e227ef 100644 (file)
@@ -35,7 +35,7 @@
 
 #if USE(SOUP)
 #include <gio/gio.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #endif
 
 namespace WebCore {
index 59d7203..c5393a4 100644 (file)
@@ -33,7 +33,7 @@
 #include <WebCore/MIMETypeRegistry.h>
 #include <gio/gio.h>
 #include <glib.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringConcatenate.h>
index d030558..41e26be 100644 (file)
@@ -31,7 +31,7 @@
 #include <WebCore/SocketStreamHandle.h>
 #include <gio/gio.h>
 #include <glib.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
index 8e6ee02..9d416a8 100644 (file)
 #include <glib.h>
 #include <locale.h>
 #include <wtf/RunLoop.h>
+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
 
 using namespace WebCore;
 
index cab1e0f..d386d49 100644 (file)
@@ -31,8 +31,8 @@
 #include "PluginModuleInfo.h"
 #include <mutex>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebKit {
 
index 70d873d..fd25e74 100644 (file)
@@ -39,7 +39,7 @@
 
 #if PLATFORM(GTK) || PLATFORM(EFL)
 #include <glib.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #endif
 
 #if PLATFORM(GTK)
index 8a6adb9..ccf6f30 100644 (file)
@@ -35,8 +35,8 @@
 #include <WebCore/GtkUtilities.h>
 #include <WebCore/PasteboardHelper.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 
index 63ed7bd..78fc2cb 100644 (file)
@@ -30,8 +30,8 @@
 
 #include <WebCore/FloatPoint.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef union _GdkEvent GdkEvent;
 typedef struct _GdkEventSequence GdkEventSequence;
index 0489255..9935f03 100644 (file)
@@ -29,7 +29,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 
index 4d1e18c..6d2cee6 100644 (file)
@@ -23,7 +23,7 @@
 #include <WebCore/IntPoint.h>
 #include <functional>
 #include <wtf/Noncopyable.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 typedef struct _GdkEventKey GdkEventKey;
index d68edc1..e01ad1b 100644 (file)
@@ -37,7 +37,7 @@
 #include <WebCore/NotImplemented.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index cce9f36..4681c71 100644 (file)
@@ -31,7 +31,7 @@
 #include <WebCore/GtkUtilities.h>
 #include <WebCore/IntRect.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
index a5e7d9c..d920039 100644 (file)
@@ -21,7 +21,7 @@
 #define WebPopupMenuProxyGtk_h
 
 #include "WebPopupMenuProxy.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 typedef struct _GMainLoop GMainLoop;
index f40c31f..623043d 100644 (file)
@@ -38,7 +38,7 @@
 #include <WebCore/FileSystem.h>
 #include <WebCore/NotImplemented.h>
 #include <WebCore/SchemeRegistry.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #if ENABLE(NETWORK_PROCESS)
index 3e7b46a..eff4874 100644 (file)
@@ -32,7 +32,7 @@
 #include <WebCore/CookieJarSoup.h>
 #include <WebCore/SoupNetworkSession.h>
 #include <libsoup/soup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebCore;
index f4a2abc..cf2696f 100644 (file)
@@ -29,7 +29,7 @@
 #include "WebKitWebPagePrivate.h"
 #include <WebCore/DNS.h>
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebKit;
 
index 556246d..fc20969 100644 (file)
@@ -25,7 +25,7 @@
 #include "WebKitPrivate.h"
 #include "WebKitWebHitTestResultPrivate.h"
 #include <glib/gi18n-lib.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index 2b02e44..75be05c 100644 (file)
@@ -29,7 +29,7 @@
 #include <WebCore/KeyboardEvent.h>
 #include <WebCore/Pasteboard.h>
 #include <WebCore/markup.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 using namespace WebCore;
 
index 5ca1d65..018281c 100644 (file)
@@ -74,7 +74,7 @@
 
 #if HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
 #include "WebPageAccessibilityObject.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #endif
 
 #if PLATFORM(GTK)
index 694c345..d0acd84 100644 (file)
@@ -34,7 +34,7 @@
 #include "TextureMapperLayer.h"
 #include <WebCore/GLContext.h>
 #include <WebCore/GraphicsLayerClient.h>
-#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/glib/GMainLoopSource.h>
 
 namespace WebKit {
 
index b918dee..e13cb29 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GtkPrinter GtkPrinter;
 
index ec990ec..b7e7d1b 100644 (file)
@@ -45,7 +45,7 @@
 #include <WebCore/PlatformKeyboardEvent.h>
 #include <WebCore/Settings.h>
 #include <WebCore/UserAgentGtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 using namespace WebCore;
 
index 6c3c82c..55ecdb2 100644 (file)
@@ -42,7 +42,7 @@
 #include <gtk/gtk.h>
 #include <memory>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 #if HAVE(GTK_UNIX_PRINTING)
 #include "PrinterListGtk.h"
index c201a2e..f5fec10 100644 (file)
@@ -30,7 +30,7 @@
 #include <WebCore/RefPtrCairo.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _GtkPrintSettings GtkPrintSettings;
 typedef struct _GtkPageSetup GtkPageSetup;
index 37c5e66..884ca39 100644 (file)
@@ -25,7 +25,7 @@
 #include <wtf/NeverDestroyed.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 typedef struct _WebKitWebExtension WebKitWebExtension;
 
index dd5d58a..794a4bd 100644 (file)
@@ -21,7 +21,7 @@
 #include "WebKitSoupRequestInputStream.h"
 
 #include <wtf/Threading.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 struct AsyncReadData {
     AsyncReadData(GSimpleAsyncResult* result, void* buffer, gsize count, GCancellable* cancellable)
index 07c9a8f..fe2a3c6 100644 (file)
@@ -42,8 +42,8 @@
 #include <WebCore/SoupNetworkSession.h>
 #include <libsoup/soup.h>
 #include <wtf/RAMSize.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WebKit {
 
index 7109893..1d6e9a3 100644 (file)
@@ -27,7 +27,7 @@
 #include <memory>
 #include <wtf/HashMap.h>
 #include <wtf/Noncopyable.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 typedef struct _GInputStream GInputStream;
index 656f119..22a3401 100644 (file)
@@ -1,3 +1,101 @@
+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:
+
 2015-06-12  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         [EFL] Fix deprecated declarations warnings related to WK2 versioned structs
index 7bf05d5..62bfeb3 100644 (file)
@@ -136,7 +136,7 @@ set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
 set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)
 
 list(APPEND TestWTF_SOURCES
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/GMainLoopSource.cpp
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/GUniquePtr.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/WorkQueueGLib.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GMainLoopSource.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
 )
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include <wtf/gobject/GThreadSafeMainLoopSource.h>
+#include <wtf/glib/GThreadSafeMainLoopSource.h>
 #include <stdio.h>
 
 namespace TestWebKitAPI {
@@ -80,7 +80,7 @@ static void (* _g_key_file_free)(GKeyFile*) = g_key_file_free;
     log() << "g_key_file_free(" << ptr << ");"; \
     _g_key_file_free(x);
 
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace TestWebKitAPI {
 
index 9932b47..28c9112 100644 (file)
@@ -29,8 +29,8 @@
 #include <gio/gio.h>
 #include <thread>
 #include <wtf/WorkQueue.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace TestWebKitAPI {
 
index 4881a44..72ca9e2 100644 (file)
@@ -29,8 +29,8 @@
 #include <WebKit/InputMethodFilter.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 using namespace WebKit;
index ee5e0e3..0f18d1f 100644 (file)
@@ -22,7 +22,7 @@
 #include "WebProcessTest.h"
 #include <gio/gio.h>
 #include <webkit2/webkit-web-extension.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 typedef struct _WebKitNodeFilter {
     GObject parent;
index c8339c5..334384f 100644 (file)
@@ -22,7 +22,7 @@
 #include "WebProcessTest.h"
 #include <gio/gio.h>
 #include <webkit2/webkit-web-extension.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 class WebKitDOMNodeTest : public WebProcessTest {
 public:
index 20e4da0..110677e 100644 (file)
@@ -22,7 +22,7 @@
 #include "WebProcessTest.h"
 #include <gio/gio.h>
 #include <webkit2/webkit-web-extension.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 typedef struct _WebKitXPathNSResolver {
     GObject parent;
index ed0569c..dac5e4e 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "LoadTrackingTest.h"
 #include "WebKitTestServer.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 static WebKitTestServer* kServer;
 
index dcdfe62..f2f0d6a 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebViewTest.h"
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 class ContextMenuTest: public WebViewTest {
 public:
index ce7ca37..b4f21a1 100644 (file)
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <webkit2/webkit2.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 class DownloadTest: public Test {
index 0ab26fd..3d993e2 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "WebViewTest.h"
 #include <wtf/Vector.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 class InspectorTest: public WebViewTest {
 public:
index f0bfb06..43f4d48 100644 (file)
@@ -25,7 +25,7 @@
 #include "config.h"
 
 #include "WebViewTest.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/WTFString.h>
 
 // Name of the test server application creating the webView object.
index a155ed3..c131854 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebViewTest.h"
 #include <glib/gstdio.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 #ifdef HAVE_GTK_UNIX_PRINTING
 #include <gtk/gtkunixprint.h>
index 26f9cc9..47f666a 100644 (file)
@@ -22,9 +22,9 @@
 #include "WebKitTestServer.h"
 #include "WebViewTest.h"
 #include <wtf/Vector.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GMutexLocker.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GMutexLocker.h>
+#include <wtf/glib/GRefPtr.h>
 
 static WebKitTestServer* kServer;
 
index e21063d..ae89be1 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebViewTest.h"
 #include <wtf/HashSet.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/StringHash.h>
 
 static const char* kAlertDialogMessage = "WebKitGTK+ alert dialog message";
index 4a094d0..82d3ec3 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "WebKitTestBus.h"
 #include "WebViewTest.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 static const char* webExtensionsUserData = "Web Extensions user data";
 static WebKitTestBus* bus;
index a5d8df9..ea4a812 100644 (file)
@@ -33,8 +33,8 @@ extern "C" {
 #include <signal.h>
 #include <unistd.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 // Name of the test server application creating the webView object.
 static const char* kTestServerAppName = "AccessibilityTestServer";
index e6b558c..8d5be92 100644 (file)
@@ -23,7 +23,7 @@
 #include "WebViewTest.h"
 #include <glib/gstdio.h>
 #include <libsoup/soup.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 static WebKitTestServer* kServer;
 
index d2eef4c..7289fd3 100644 (file)
@@ -22,7 +22,7 @@
 #include "LoadTrackingTest.h"
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 static const char* testString = "<html><body>first testing second testing secondHalf</body></html>";
 
index 85140fc..9f95151 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "LoadTrackingTest.h"
 #include "WebKitTestServer.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 static WebKitTestServer* kServer;
index 707cf78..b3a3772 100644 (file)
@@ -35,7 +35,7 @@
 #include "WebKitTestServer.h"
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 static WebKitTestServer* gServer;
 
index 9f49d1d..58396ff 100644 (file)
@@ -24,8 +24,8 @@
 #include <cstdarg>
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 class UserContentManagerTest : public WebViewTest {
 public:
index f5e3b39..9919313 100644 (file)
@@ -24,8 +24,8 @@
 #include <gtk/gtk.h>
 #include <webkit2/webkit2.h>
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/StringHash.h>
 
 static WebKitTestServer* kServer;
index 2b742b4..431e700 100644 (file)
@@ -24,7 +24,7 @@
 #include <JavaScriptCore/JSStringRef.h>
 #include <JavaScriptCore/JSValueRef.h>
 #include <glib/gstdio.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 class IsPlayingAudioWebViewTest : public WebViewTest {
 public:
index 23cfd19..1ccf196 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "WebViewTest.h"
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 class EditorTest: public WebViewTest {
 public:
index 765a42f..51bd637 100644 (file)
@@ -27,8 +27,8 @@
 #include <webkit2/webkit-web-extension.h>
 #include <wtf/Deque.h>
 #include <wtf/ProcessID.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #define WEBKIT_DOM_USE_UNSTABLE_API
index 82f1112..ccd6f17 100644 (file)
@@ -24,7 +24,7 @@
 #include <gio/gio.h>
 #include <wtf/HashSet.h>
 #include <wtf/NeverDestroyed.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 static HashSet<GObject*> s_watchedObjects;
 
index e72eed9..3715eb9 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <webkit2/webkit-web-extension.h>
 #include <wtf/HashMap.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
 
index 94c789e..f7b231f 100644 (file)
@@ -27,8 +27,8 @@
 #include "PlatformUtilities.h"
 
 #include <gtk/gtk.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace TestWebKitAPI {
 namespace Util {
index 1d60b63..5f0eb40 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <WebCore/GUniquePtrGtk.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace TestWebKitAPI {
 
index c77c19a..8eaf8e0 100644 (file)
@@ -24,8 +24,8 @@
 #include <glib-object.h>
 #include <webkit2/webkit2.h>
 #include <wtf/HashSet.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
 #define MAKE_GLIB_TEST_FIXTURE(ClassName) \
index 35bcf1b..1cf2414 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitTestBus.h"
 
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/WTFString.h>
 
 WebKitTestBus::WebKitTestBus()
index b9f856b..03bcc3a 100644 (file)
@@ -21,7 +21,7 @@
 #define WebKitTestBus_h
 
 #include <gio/gio.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 class WebKitTestBus {
index 8736771..5c75143 100644 (file)
@@ -21,7 +21,7 @@
 #include "WebKitTestServer.h"
 
 #include "TestMain.h"
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 WebKitTestServer::WebKitTestServer(ServerType type)
 {
index 502f7fa..235d6c9 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <libsoup/soup.h>
 #include <webkit2/webkit2.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 #include <wtf/text/CString.h>
 
 class WebKitTestServer {
index 0edefcb..98ed45b 100644 (file)
@@ -44,7 +44,7 @@ typedef struct objc_object* PlatformUIElement;
 #elif HAVE(ACCESSIBILITY) && (PLATFORM(GTK) || PLATFORM(EFL))
 #include "AccessibilityNotificationHandlerAtk.h"
 #include <atk/atk.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 typedef GRefPtr<AtkObject> PlatformUIElement;
 #else
 typedef void* PlatformUIElement;
index adee337..066c4b0 100644 (file)
@@ -38,7 +38,7 @@
 #include <CoreFoundation/CFRunLoop.h>
 typedef RetainPtr<CFRunLoopTimerRef> PlatformTimerRef;
 #elif PLATFORM(GTK)
-#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/glib/GMainLoopSource.h>
 typedef GMainLoopSource PlatformTimerRef;
 #elif PLATFORM(EFL)
 typedef Ecore_Timer* PlatformTimerRef;
index 4b541f5..c1cb349 100644 (file)
@@ -36,7 +36,7 @@
 #include <WebKit/WKBundlePagePrivate.h>
 #include <atk/atk.h>
 #include <cstdio>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/StringBuilder.h>
 
 namespace WTR {
index 821b150..95cf8ae 100644 (file)
@@ -30,7 +30,7 @@
 #include <WebKit/WKBundlePagePrivate.h>
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
index c84e4dc..bb3869e 100644 (file)
@@ -27,7 +27,7 @@
 #include <atk/atkobject.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
-#include <wtf/gobject/GRefPtr.h>
+#include <wtf/glib/GRefPtr.h>
 
 namespace WTR {
 
index 3822c6d..29cd3a8 100644 (file)
@@ -40,8 +40,8 @@
 #endif
 #include <atk/atk.h>
 #include <wtf/Assertions.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GRefPtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/WTFString.h>
index 74f3ab0..496c1bc 100644 (file)
@@ -34,8 +34,8 @@
 #include "InjectedBundleUtilities.h"
 #include <fontconfig/fontconfig.h>
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WTR {
 
index 02df7df..afbd3f7 100644 (file)
@@ -30,8 +30,8 @@
 #include "InjectedBundleUtilities.h"
 
 #include <gtk/gtk.h>
-#include <wtf/gobject/GUniquePtr.h>
-#include <wtf/gobject/GlibUtilities.h>
+#include <wtf/glib/GLibUtilities.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WTR {
 
index fd27a58..6a36ee7 100644 (file)
@@ -30,7 +30,7 @@
 #include "InjectedBundle.h"
 #include "InjectedBundleUtilities.h"
 #include <glib.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 
 namespace WTR {
 
index c934a8b..f117545 100644 (file)
@@ -19,7 +19,7 @@ list(APPEND WebKitTestRunner_SOURCES
 
 list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     ${FORWARDING_HEADERS_DIR}
-    ${WTF_DIR}/wtf/gobject
+    ${WTF_DIR}/wtf/glib
     ${ATK_INCLUDE_DIRS}
     ${CAIRO_INCLUDE_DIRS}
     ${GTK3_INCLUDE_DIRS}
index e0a7d8d..b8f5cbe 100644 (file)
@@ -39,7 +39,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <wtf/StdLibExtras.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WTR {
index 80f6c22..50fbfa9 100644 (file)
@@ -30,8 +30,8 @@
 #include "PlatformWebView.h"
 #include <gtk/gtk.h>
 #include <wtf/Platform.h>
-#include <wtf/gobject/GMainLoopSource.h>
-#include <wtf/gobject/GUniquePtr.h>
+#include <wtf/glib/GMainLoopSource.h>
+#include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/WTFString.h>
 
 namespace WTR {