Skip to content

Commit f28fd16

Browse files
author
[email protected]
committed
[GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
https://bugs.webkit.org/show_bug.cgi?id=145799 Reviewed by Carlos Garcia Campos. Source/WebCore: Update header inclusions for headers that have been moved to Source/WTF/wtf/glib/. * accessibility/atk/AXObjectCacheAtk.cpp: * accessibility/atk/WebKitAccessibleInterfaceText.cpp: * bindings/gobject/DOMObjectCache.cpp: * bindings/gobject/GObjectEventListener.h: * bindings/gobject/GObjectNodeFilterCondition.h: * bindings/gobject/GObjectXPathNSResolver.h: * bindings/gobject/WebKitDOMEventTarget.cpp: * platform/Pasteboard.h: * platform/audio/gstreamer/AudioDestinationGStreamer.cpp: * platform/audio/gstreamer/AudioFileReaderGStreamer.cpp: * platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp: * platform/audio/gstreamer/WebKitWebAudioSourceGStreamer.cpp: * platform/audio/gtk/AudioBusGtk.cpp: * platform/geoclue/GeolocationProviderGeoclue.h: * platform/geoclue/GeolocationProviderGeoclue2.cpp: * platform/glib/BatteryProviderUPower.cpp: * platform/glib/BatteryProviderUPower.h: * platform/graphics/gstreamer/GRefPtrGStreamer.h: * platform/graphics/gstreamer/GStreamerUtilities.cpp: * platform/graphics/gstreamer/GUniquePtrGStreamer.h: * platform/graphics/gstreamer/InbandTextTrackPrivateGStreamer.h: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h: * platform/graphics/gstreamer/MediaSourceGStreamer.cpp: * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.cpp: * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h: * platform/graphics/gstreamer/VideoSinkGStreamer.cpp: * platform/graphics/gstreamer/WebKitMediaSourceGStreamer.cpp: * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp: * platform/graphics/gtk/ImageBufferGtk.cpp: * platform/graphics/gtk/ImageGtk.cpp: * platform/gtk/ContextMenuGtk.cpp: * platform/gtk/ContextMenuItemGtk.cpp: * platform/gtk/DataObjectGtk.cpp: * platform/gtk/DataObjectGtk.h: * platform/gtk/FileSystemGtk.cpp: * platform/gtk/GRefPtrGtk.h: * platform/gtk/GUniquePtrGtk.h: * platform/gtk/GamepadsGtk.cpp: * platform/gtk/GtkUtilities.cpp: * platform/gtk/LanguageGtk.cpp: * platform/gtk/LocalizedStringsGtk.cpp: * platform/gtk/PasteboardHelper.cpp: * platform/gtk/ScrollbarThemeGtk.cpp: * platform/gtk/SharedBufferGtk.cpp: * platform/gtk/SharedTimerGtk.cpp: * platform/mediastream/openwebrtc/RealtimeMediaSourceCenterOwr.cpp: * platform/network/ResourceHandleInternal.h: * platform/network/gtk/CredentialBackingStore.cpp: * platform/network/soup/CertificateInfo.h: * platform/network/soup/CookieJarSoup.cpp: * platform/network/soup/DNSSoup.cpp: * platform/network/soup/GRefPtrSoup.h: * platform/network/soup/GUniquePtrSoup.h: * platform/network/soup/ResourceError.h: * platform/network/soup/ResourceErrorSoup.cpp: * platform/network/soup/ResourceHandleSoup.cpp: * platform/network/soup/ResourceResponse.h: * platform/network/soup/SocketStreamHandle.h: * platform/network/soup/SocketStreamHandleSoup.cpp: * platform/network/soup/SoupNetworkSession.h: * platform/text/gtk/HyphenationLibHyphen.cpp: * rendering/RenderThemeGtk.cpp: Source/WebKit2: Update header inclusions for headers that have been moved to Source/WTF/wtf/glib/. * NetworkProcess/cache/NetworkCacheFileSystemPosix.h: * NetworkProcess/cache/NetworkCacheIOChannel.h: * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp: * NetworkProcess/soup/NetworkProcessSoup.cpp: * PlatformEfl.cmake: * PlatformGTK.cmake: * Shared/Downloads/soup/DownloadSoup.cpp: * Shared/Network/CustomProtocols/soup/CustomProtocolManagerImpl.h: * Shared/PrintInfo.h: * Shared/gtk/ArgumentCodersGtk.cpp: * Shared/gtk/ArgumentCodersGtk.h: * Shared/gtk/KeyedDecoder.h: * Shared/gtk/KeyedEncoder.h: * Shared/gtk/ProcessExecutablePathGtk.cpp: * UIProcess/API/gtk/WebKitBackForwardList.cpp: * UIProcess/API/gtk/WebKitBackForwardListItem.cpp: * UIProcess/API/gtk/WebKitColorChooser.h: * UIProcess/API/gtk/WebKitContextMenu.cpp: * UIProcess/API/gtk/WebKitContextMenuItem.cpp: * UIProcess/API/gtk/WebKitCookieManager.cpp: * UIProcess/API/gtk/WebKitDownload.cpp: * UIProcess/API/gtk/WebKitDownloadClient.cpp: * UIProcess/API/gtk/WebKitFaviconDatabase.cpp: * UIProcess/API/gtk/WebKitFileChooserRequest.cpp: * UIProcess/API/gtk/WebKitFindController.cpp: * UIProcess/API/gtk/WebKitFormClient.cpp: * UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp: * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp: * UIProcess/API/gtk/WebKitJavascriptResult.cpp: * UIProcess/API/gtk/WebKitLoaderClient.cpp: * UIProcess/API/gtk/WebKitMimeInfo.cpp: * UIProcess/API/gtk/WebKitNavigationAction.cpp: * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp: * UIProcess/API/gtk/WebKitPolicyClient.cpp: * UIProcess/API/gtk/WebKitPrintOperation.cpp: * UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp: * UIProcess/API/gtk/WebKitUIClient.cpp: * UIProcess/API/gtk/WebKitURISchemeRequest.cpp: * UIProcess/API/gtk/WebKitUserContentManager.cpp: * UIProcess/API/gtk/WebKitWebContext.cpp: * UIProcess/API/gtk/WebKitWebInspector.cpp: * UIProcess/API/gtk/WebKitWebResource.cpp: * UIProcess/API/gtk/WebKitWebView.cpp: * UIProcess/API/gtk/WebKitWebViewBase.cpp: * UIProcess/InspectorServer/WebSocketServer.h: * UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp: * UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp: * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp: * UIProcess/Plugins/gtk/PluginInfoCache.h: * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp: * UIProcess/gtk/DragAndDropHandler.cpp: * UIProcess/gtk/GestureController.h: * UIProcess/gtk/InputMethodFilter.cpp: * UIProcess/gtk/InputMethodFilter.h: * UIProcess/gtk/WebInspectorProxyGtk.cpp: * UIProcess/gtk/WebPopupMenuProxyGtk.cpp: * UIProcess/gtk/WebPopupMenuProxyGtk.h: * UIProcess/gtk/WebProcessPoolGtk.cpp: * WebProcess/Cookies/soup/WebCookieManagerSoup.cpp: * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp: * WebProcess/InjectedBundle/API/gtk/WebKitWebHitTestResult.cpp: * WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp: * WebProcess/WebPage/WebPage.h: * WebProcess/WebPage/gtk/LayerTreeHostGtk.h: * WebProcess/WebPage/gtk/PrinterListGtk.h: * WebProcess/WebPage/gtk/WebPageGtk.cpp: * WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp: * WebProcess/WebPage/gtk/WebPrintOperationGtk.h: * WebProcess/gtk/WebGtkExtensionManager.h: * WebProcess/soup/WebKitSoupRequestInputStream.cpp: * WebProcess/soup/WebProcessSoup.cpp: * WebProcess/soup/WebSoupRequestManager.h: Source/WTF: Move the GLib-specific files to the Source/WTF/wtf/glib/ directory. 'gobject' wasn't the most appropriate name for the directory since GObject is a submodule of GLib, but a lot of the code there didn't have much to do with GObject specifically. Build rules for the moved files are also updated. * WTF.vcxproj/WTF.vcxproj: * WTF.vcxproj/WTF.vcxproj.filters: * wtf/Platform.h: * wtf/PlatformEfl.cmake: * wtf/PlatformGTK.cmake: * wtf/RunLoop.h: * wtf/WorkQueue.h: * wtf/glib/GLibUtilities.cpp: Renamed from Source/WTF/wtf/gobject/GlibUtilities.cpp. (getCurrentExecutablePath): * wtf/glib/GLibUtilities.h: Renamed from Source/WTF/wtf/gobject/GlibUtilities.h. * wtf/glib/GMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.cpp. (WTF::GMainLoopSource::create): (WTF::GMainLoopSource::GMainLoopSource): (WTF::GMainLoopSource::~GMainLoopSource): (WTF::GMainLoopSource::isScheduled): (WTF::GMainLoopSource::isActive): (WTF::GMainLoopSource::cancel): (WTF::GMainLoopSource::scheduleIdleSource): (WTF::GMainLoopSource::schedule): (WTF::GMainLoopSource::scheduleTimeoutSource): (WTF::GMainLoopSource::scheduleAfterDelay): (WTF::createMicrosecondsTimeoutSource): (WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): (WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): (WTF::GMainLoopSource::prepareVoidCallback): (WTF::GMainLoopSource::finishVoidCallback): (WTF::GMainLoopSource::voidCallback): (WTF::GMainLoopSource::prepareBoolCallback): (WTF::GMainLoopSource::finishBoolCallback): (WTF::GMainLoopSource::boolCallback): (WTF::GMainLoopSource::socketCallback): (WTF::GMainLoopSource::voidSourceCallback): (WTF::GMainLoopSource::boolSourceCallback): (WTF::GMainLoopSource::socketSourceCallback): (WTF::GMainLoopSource::Context::destroySource): * wtf/glib/GMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.h. (WTF::GMainLoopSource::Context::operator=): * wtf/glib/GMutexLocker.h: Renamed from Source/WTF/wtf/gobject/GMutexLocker.h. (WTF::MutexWrapper<GMutex>::lock): (WTF::MutexWrapper<GMutex>::unlock): (WTF::MutexWrapper<GRecMutex>::lock): (WTF::MutexWrapper<GRecMutex>::unlock): (WTF::GMutexLocker::GMutexLocker): (WTF::GMutexLocker::~GMutexLocker): (WTF::GMutexLocker::lock): (WTF::GMutexLocker::unlock): * wtf/glib/GRefPtr.cpp: Renamed from Source/WTF/wtf/gobject/GRefPtr.cpp. (WTF::refGPtr): (WTF::derefGPtr): * wtf/glib/GRefPtr.h: Renamed from Source/WTF/wtf/gobject/GRefPtr.h. (WTF::GRefPtr::GRefPtr): (WTF::GRefPtr::~GRefPtr): (WTF::GRefPtr::clear): (WTF::GRefPtr::outPtr): (WTF::GRefPtr::isHashTableDeletedValue): (WTF::GRefPtr::get): (WTF::GRefPtr::operator*): (WTF::GRefPtr::operator->): (WTF::GRefPtr::operator!): (WTF::GRefPtr::operator UnspecifiedBoolType): (WTF::GRefPtr::hashTableDeletedValue): (WTF::=): (WTF::GRefPtr<T>::swap): (WTF::swap): (WTF::operator==): (WTF::operator!=): (WTF::static_pointer_cast): (WTF::const_pointer_cast): (WTF::adoptGRef): (WTF::refGPtr): (WTF::derefGPtr): * wtf/glib/GThreadSafeMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp. (WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource): (WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource): (WTF::GThreadSafeMainLoopSource::cancel): (WTF::GThreadSafeMainLoopSource::schedule): (WTF::GThreadSafeMainLoopSource::scheduleAfterDelay): (WTF::GThreadSafeMainLoopSource::prepareVoidCallback): (WTF::GThreadSafeMainLoopSource::finishVoidCallback): (WTF::GThreadSafeMainLoopSource::voidCallback): (WTF::GThreadSafeMainLoopSource::prepareBoolCallback): (WTF::GThreadSafeMainLoopSource::finishBoolCallback): (WTF::GThreadSafeMainLoopSource::boolCallback): * wtf/glib/GThreadSafeMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.h. * wtf/glib/GTypedefs.h: Renamed from Source/WTF/wtf/gobject/GTypedefs.h. * wtf/glib/GUniquePtr.h: Renamed from Source/WTF/wtf/gobject/GUniquePtr.h. (WTF::GPtrDeleter::operator()): (WTF::GUniqueOutPtr::GUniqueOutPtr): (WTF::GUniqueOutPtr::~GUniqueOutPtr): (WTF::GUniqueOutPtr::outPtr): (WTF::GUniqueOutPtr::release): (WTF::GUniqueOutPtr::operator*): (WTF::GUniqueOutPtr::operator->): (WTF::GUniqueOutPtr::get): (WTF::GUniqueOutPtr::operator!): (WTF::GUniqueOutPtr::operator UnspecifiedBoolType): (WTF::GUniqueOutPtr::reset): * wtf/glib/MainThreadGLib.cpp: * wtf/gobject/GMainLoopSource.cpp: (WTF::GMainLoopSource::create): Deleted. (WTF::GMainLoopSource::GMainLoopSource): Deleted. (WTF::GMainLoopSource::~GMainLoopSource): Deleted. (WTF::GMainLoopSource::isScheduled): Deleted. (WTF::GMainLoopSource::isActive): Deleted. (WTF::GMainLoopSource::cancel): Deleted. (WTF::GMainLoopSource::scheduleIdleSource): Deleted. (WTF::GMainLoopSource::schedule): Deleted. (WTF::GMainLoopSource::scheduleTimeoutSource): Deleted. (WTF::GMainLoopSource::scheduleAfterDelay): Deleted. (WTF::createMicrosecondsTimeoutSource): Deleted. (WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): Deleted. (WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Deleted. (WTF::GMainLoopSource::prepareVoidCallback): Deleted. (WTF::GMainLoopSource::finishVoidCallback): Deleted. (WTF::GMainLoopSource::voidCallback): Deleted. (WTF::GMainLoopSource::prepareBoolCallback): Deleted. (WTF::GMainLoopSource::finishBoolCallback): Deleted. (WTF::GMainLoopSource::boolCallback): Deleted. (WTF::GMainLoopSource::socketCallback): Deleted. (WTF::GMainLoopSource::voidSourceCallback): Deleted. (WTF::GMainLoopSource::boolSourceCallback): Deleted. (WTF::GMainLoopSource::socketSourceCallback): Deleted. (WTF::GMainLoopSource::Context::destroySource): Deleted. * wtf/gobject/GMainLoopSource.h: (WTF::GMainLoopSource::Context::operator=): Deleted. * wtf/gobject/GMutexLocker.h: (WTF::MutexWrapper<GMutex>::lock): Deleted. (WTF::MutexWrapper<GMutex>::unlock): Deleted. (WTF::MutexWrapper<GRecMutex>::lock): Deleted. (WTF::MutexWrapper<GRecMutex>::unlock): Deleted. (WTF::GMutexLocker::GMutexLocker): Deleted. (WTF::GMutexLocker::~GMutexLocker): Deleted. (WTF::GMutexLocker::lock): Deleted. (WTF::GMutexLocker::unlock): Deleted. * wtf/gobject/GRefPtr.cpp: (WTF::refGPtr): Deleted. (WTF::derefGPtr): Deleted. * wtf/gobject/GRefPtr.h: (WTF::GRefPtr::GRefPtr): Deleted. (WTF::GRefPtr::~GRefPtr): Deleted. (WTF::GRefPtr::clear): Deleted. (WTF::GRefPtr::outPtr): Deleted. (WTF::GRefPtr::isHashTableDeletedValue): Deleted. (WTF::GRefPtr::get): Deleted. (WTF::GRefPtr::operator*): Deleted. (WTF::GRefPtr::operator->): Deleted. (WTF::GRefPtr::operator!): Deleted. (WTF::GRefPtr::operator UnspecifiedBoolType): Deleted. (WTF::GRefPtr::hashTableDeletedValue): Deleted. (WTF::=): Deleted. (WTF::GRefPtr<T>::swap): Deleted. (WTF::swap): Deleted. (WTF::operator==): Deleted. (WTF::operator!=): Deleted. (WTF::static_pointer_cast): Deleted. (WTF::const_pointer_cast): Deleted. (WTF::adoptGRef): Deleted. (WTF::refGPtr): Deleted. (WTF::derefGPtr): Deleted. * wtf/gobject/GThreadSafeMainLoopSource.cpp: (WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource): Deleted. (WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource): Deleted. (WTF::GThreadSafeMainLoopSource::cancel): Deleted. (WTF::GThreadSafeMainLoopSource::schedule): Deleted. (WTF::GThreadSafeMainLoopSource::scheduleAfterDelay): Deleted. (WTF::GThreadSafeMainLoopSource::prepareVoidCallback): Deleted. (WTF::GThreadSafeMainLoopSource::finishVoidCallback): Deleted. (WTF::GThreadSafeMainLoopSource::voidCallback): Deleted. (WTF::GThreadSafeMainLoopSource::prepareBoolCallback): Deleted. (WTF::GThreadSafeMainLoopSource::finishBoolCallback): Deleted. (WTF::GThreadSafeMainLoopSource::boolCallback): Deleted. * wtf/gobject/GUniquePtr.h: (WTF::GPtrDeleter::operator()): Deleted. (WTF::GUniqueOutPtr::GUniqueOutPtr): Deleted. (WTF::GUniqueOutPtr::~GUniqueOutPtr): Deleted. (WTF::GUniqueOutPtr::outPtr): Deleted. (WTF::GUniqueOutPtr::release): Deleted. (WTF::GUniqueOutPtr::operator*): Deleted. (WTF::GUniqueOutPtr::operator->): Deleted. (WTF::GUniqueOutPtr::get): Deleted. (WTF::GUniqueOutPtr::operator!): Deleted. (WTF::GUniqueOutPtr::operator UnspecifiedBoolType): Deleted. (WTF::GUniqueOutPtr::reset): Deleted. * wtf/gobject/GlibUtilities.cpp: (getCurrentExecutablePath): Deleted. Tools: Update header inclusions for headers that have been moved to Source/WTF/wtf/glib/. Also move the unit tests under TestWebKitAPI/Tests/WTF/gobject/ to TestWebKitAPI/Tests/WTF/glib/ and update the build rules. * TestWebKitAPI/PlatformGTK.cmake: * TestWebKitAPI/Tests/WTF/glib/GMainLoopSource.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp. (TestWebKitAPI::GMainLoopSourceTest::GMainLoopSourceTest): (TestWebKitAPI::GMainLoopSourceTest::~GMainLoopSourceTest): (TestWebKitAPI::GMainLoopSourceTest::runLoop): (TestWebKitAPI::GMainLoopSourceTest::delayedFinish): (TestWebKitAPI::GMainLoopSourceTest::finish): (TestWebKitAPI::GMainLoopSourceTest::source): (TestWebKitAPI::basicRescheduling): (TestWebKitAPI::TEST): (TestWebKitAPI::reentrantRescheduling): (TestWebKitAPI::cancelRepeatingSourceDuringDispatch): (TestWebKitAPI::basicDestroyCallbacks): (TestWebKitAPI::destroyCallbacksAfterCancellingDuringDispatch): (TestWebKitAPI::destroyCallbacksAfterReschedulingDuringDispatch): * TestWebKitAPI/Tests/WTF/glib/GUniquePtr.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp. (log): (takeLogStr): (TestWebKitAPI::TEST): (TestWebKitAPI::returnOutChar): * TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp: * TestWebKitAPI/Tests/WTF/gobject/GMainLoopSource.cpp: (TestWebKitAPI::GMainLoopSourceTest::GMainLoopSourceTest): Deleted. (TestWebKitAPI::GMainLoopSourceTest::~GMainLoopSourceTest): Deleted. (TestWebKitAPI::GMainLoopSourceTest::runLoop): Deleted. (TestWebKitAPI::GMainLoopSourceTest::delayedFinish): Deleted. (TestWebKitAPI::GMainLoopSourceTest::finish): Deleted. (TestWebKitAPI::GMainLoopSourceTest::source): Deleted. (TestWebKitAPI::basicRescheduling): Deleted. (TestWebKitAPI::TEST): Deleted. (TestWebKitAPI::reentrantRescheduling): Deleted. (TestWebKitAPI::cancelRepeatingSourceDuringDispatch): Deleted. (TestWebKitAPI::basicDestroyCallbacks): Deleted. (TestWebKitAPI::destroyCallbacksAfterCancellingDuringDispatch): Deleted. (TestWebKitAPI::destroyCallbacksAfterReschedulingDuringDispatch): Deleted. * TestWebKitAPI/Tests/WTF/gobject/GUniquePtr.cpp: (log): Deleted. (takeLogStr): Deleted. (TestWebKitAPI::TEST): Deleted. (TestWebKitAPI::returnOutChar): Deleted. * TestWebKitAPI/Tests/WebKit2/gtk/InputMethodFilter.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeFilterTest.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/DOMNodeTest.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/DOMXPathNSResolverTest.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestAuthentication.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestContextMenu.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestDownloads.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestInspector.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestInspectorServer.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestPrinting.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestResources.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebExtensions.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitAccessibility.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFaviconDatabase.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitFindController.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitPolicyClient.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitUserContentManager.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/TestWebViewEditor.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.cpp: * TestWebKitAPI/Tests/WebKit2Gtk/WebProcessTest.h: * TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp: * TestWebKitAPI/gtk/PlatformWebViewGtk.cpp: * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h: * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.cpp: * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestBus.h: * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.cpp: * TestWebKitAPI/gtk/WebKit2Gtk/WebKitTestServer.h: * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h: * WebKitTestRunner/InjectedBundle/TestRunner.h: * WebKitTestRunner/InjectedBundle/atk/AccessibilityControllerAtk.cpp: * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.cpp: * WebKitTestRunner/InjectedBundle/atk/AccessibilityNotificationHandlerAtk.h: * WebKitTestRunner/InjectedBundle/atk/AccessibilityUIElementAtk.cpp: * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp: * WebKitTestRunner/InjectedBundle/gtk/InjectedBundleUtilities.cpp: * WebKitTestRunner/InjectedBundle/gtk/TestRunnerGtk.cpp: * WebKitTestRunner/PlatformGTK.cmake: * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp: * WebKitTestRunner/gtk/TestControllerGtk.cpp: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@185502 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 19a2af9 commit f28fd16

File tree

208 files changed

+750
-294
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+750
-294
lines changed

‎Source/WTF/ChangeLog

+200
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,203 @@
1+
2015-06-12 Zan Dobersek <[email protected]>
2+
3+
[GLib] Move files under Source/WTF/wtf/gobject to Source/WTF/wtf/glib
4+
https://bugs.webkit.org/show_bug.cgi?id=145799
5+
6+
Reviewed by Carlos Garcia Campos.
7+
8+
Move the GLib-specific files to the Source/WTF/wtf/glib/ directory.
9+
'gobject' wasn't the most appropriate name for the directory since
10+
GObject is a submodule of GLib, but a lot of the code there didn't
11+
have much to do with GObject specifically.
12+
13+
Build rules for the moved files are also updated.
14+
15+
* WTF.vcxproj/WTF.vcxproj:
16+
* WTF.vcxproj/WTF.vcxproj.filters:
17+
* wtf/Platform.h:
18+
* wtf/PlatformEfl.cmake:
19+
* wtf/PlatformGTK.cmake:
20+
* wtf/RunLoop.h:
21+
* wtf/WorkQueue.h:
22+
* wtf/glib/GLibUtilities.cpp: Renamed from Source/WTF/wtf/gobject/GlibUtilities.cpp.
23+
(getCurrentExecutablePath):
24+
* wtf/glib/GLibUtilities.h: Renamed from Source/WTF/wtf/gobject/GlibUtilities.h.
25+
* wtf/glib/GMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.cpp.
26+
(WTF::GMainLoopSource::create):
27+
(WTF::GMainLoopSource::GMainLoopSource):
28+
(WTF::GMainLoopSource::~GMainLoopSource):
29+
(WTF::GMainLoopSource::isScheduled):
30+
(WTF::GMainLoopSource::isActive):
31+
(WTF::GMainLoopSource::cancel):
32+
(WTF::GMainLoopSource::scheduleIdleSource):
33+
(WTF::GMainLoopSource::schedule):
34+
(WTF::GMainLoopSource::scheduleTimeoutSource):
35+
(WTF::GMainLoopSource::scheduleAfterDelay):
36+
(WTF::createMicrosecondsTimeoutSource):
37+
(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy):
38+
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy):
39+
(WTF::GMainLoopSource::prepareVoidCallback):
40+
(WTF::GMainLoopSource::finishVoidCallback):
41+
(WTF::GMainLoopSource::voidCallback):
42+
(WTF::GMainLoopSource::prepareBoolCallback):
43+
(WTF::GMainLoopSource::finishBoolCallback):
44+
(WTF::GMainLoopSource::boolCallback):
45+
(WTF::GMainLoopSource::socketCallback):
46+
(WTF::GMainLoopSource::voidSourceCallback):
47+
(WTF::GMainLoopSource::boolSourceCallback):
48+
(WTF::GMainLoopSource::socketSourceCallback):
49+
(WTF::GMainLoopSource::Context::destroySource):
50+
* wtf/glib/GMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GMainLoopSource.h.
51+
(WTF::GMainLoopSource::Context::operator=):
52+
* wtf/glib/GMutexLocker.h: Renamed from Source/WTF/wtf/gobject/GMutexLocker.h.
53+
(WTF::MutexWrapper<GMutex>::lock):
54+
(WTF::MutexWrapper<GMutex>::unlock):
55+
(WTF::MutexWrapper<GRecMutex>::lock):
56+
(WTF::MutexWrapper<GRecMutex>::unlock):
57+
(WTF::GMutexLocker::GMutexLocker):
58+
(WTF::GMutexLocker::~GMutexLocker):
59+
(WTF::GMutexLocker::lock):
60+
(WTF::GMutexLocker::unlock):
61+
* wtf/glib/GRefPtr.cpp: Renamed from Source/WTF/wtf/gobject/GRefPtr.cpp.
62+
(WTF::refGPtr):
63+
(WTF::derefGPtr):
64+
* wtf/glib/GRefPtr.h: Renamed from Source/WTF/wtf/gobject/GRefPtr.h.
65+
(WTF::GRefPtr::GRefPtr):
66+
(WTF::GRefPtr::~GRefPtr):
67+
(WTF::GRefPtr::clear):
68+
(WTF::GRefPtr::outPtr):
69+
(WTF::GRefPtr::isHashTableDeletedValue):
70+
(WTF::GRefPtr::get):
71+
(WTF::GRefPtr::operator*):
72+
(WTF::GRefPtr::operator->):
73+
(WTF::GRefPtr::operator!):
74+
(WTF::GRefPtr::operator UnspecifiedBoolType):
75+
(WTF::GRefPtr::hashTableDeletedValue):
76+
(WTF::=):
77+
(WTF::GRefPtr<T>::swap):
78+
(WTF::swap):
79+
(WTF::operator==):
80+
(WTF::operator!=):
81+
(WTF::static_pointer_cast):
82+
(WTF::const_pointer_cast):
83+
(WTF::adoptGRef):
84+
(WTF::refGPtr):
85+
(WTF::derefGPtr):
86+
* wtf/glib/GThreadSafeMainLoopSource.cpp: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.cpp.
87+
(WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource):
88+
(WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource):
89+
(WTF::GThreadSafeMainLoopSource::cancel):
90+
(WTF::GThreadSafeMainLoopSource::schedule):
91+
(WTF::GThreadSafeMainLoopSource::scheduleAfterDelay):
92+
(WTF::GThreadSafeMainLoopSource::prepareVoidCallback):
93+
(WTF::GThreadSafeMainLoopSource::finishVoidCallback):
94+
(WTF::GThreadSafeMainLoopSource::voidCallback):
95+
(WTF::GThreadSafeMainLoopSource::prepareBoolCallback):
96+
(WTF::GThreadSafeMainLoopSource::finishBoolCallback):
97+
(WTF::GThreadSafeMainLoopSource::boolCallback):
98+
* wtf/glib/GThreadSafeMainLoopSource.h: Renamed from Source/WTF/wtf/gobject/GThreadSafeMainLoopSource.h.
99+
* wtf/glib/GTypedefs.h: Renamed from Source/WTF/wtf/gobject/GTypedefs.h.
100+
* wtf/glib/GUniquePtr.h: Renamed from Source/WTF/wtf/gobject/GUniquePtr.h.
101+
(WTF::GPtrDeleter::operator()):
102+
(WTF::GUniqueOutPtr::GUniqueOutPtr):
103+
(WTF::GUniqueOutPtr::~GUniqueOutPtr):
104+
(WTF::GUniqueOutPtr::outPtr):
105+
(WTF::GUniqueOutPtr::release):
106+
(WTF::GUniqueOutPtr::operator*):
107+
(WTF::GUniqueOutPtr::operator->):
108+
(WTF::GUniqueOutPtr::get):
109+
(WTF::GUniqueOutPtr::operator!):
110+
(WTF::GUniqueOutPtr::operator UnspecifiedBoolType):
111+
(WTF::GUniqueOutPtr::reset):
112+
* wtf/glib/MainThreadGLib.cpp:
113+
* wtf/gobject/GMainLoopSource.cpp:
114+
(WTF::GMainLoopSource::create): Deleted.
115+
(WTF::GMainLoopSource::GMainLoopSource): Deleted.
116+
(WTF::GMainLoopSource::~GMainLoopSource): Deleted.
117+
(WTF::GMainLoopSource::isScheduled): Deleted.
118+
(WTF::GMainLoopSource::isActive): Deleted.
119+
(WTF::GMainLoopSource::cancel): Deleted.
120+
(WTF::GMainLoopSource::scheduleIdleSource): Deleted.
121+
(WTF::GMainLoopSource::schedule): Deleted.
122+
(WTF::GMainLoopSource::scheduleTimeoutSource): Deleted.
123+
(WTF::GMainLoopSource::scheduleAfterDelay): Deleted.
124+
(WTF::createMicrosecondsTimeoutSource): Deleted.
125+
(WTF::GMainLoopSource::scheduleAndDeleteOnDestroy): Deleted.
126+
(WTF::GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy): Deleted.
127+
(WTF::GMainLoopSource::prepareVoidCallback): Deleted.
128+
(WTF::GMainLoopSource::finishVoidCallback): Deleted.
129+
(WTF::GMainLoopSource::voidCallback): Deleted.
130+
(WTF::GMainLoopSource::prepareBoolCallback): Deleted.
131+
(WTF::GMainLoopSource::finishBoolCallback): Deleted.
132+
(WTF::GMainLoopSource::boolCallback): Deleted.
133+
(WTF::GMainLoopSource::socketCallback): Deleted.
134+
(WTF::GMainLoopSource::voidSourceCallback): Deleted.
135+
(WTF::GMainLoopSource::boolSourceCallback): Deleted.
136+
(WTF::GMainLoopSource::socketSourceCallback): Deleted.
137+
(WTF::GMainLoopSource::Context::destroySource): Deleted.
138+
* wtf/gobject/GMainLoopSource.h:
139+
(WTF::GMainLoopSource::Context::operator=): Deleted.
140+
* wtf/gobject/GMutexLocker.h:
141+
(WTF::MutexWrapper<GMutex>::lock): Deleted.
142+
(WTF::MutexWrapper<GMutex>::unlock): Deleted.
143+
(WTF::MutexWrapper<GRecMutex>::lock): Deleted.
144+
(WTF::MutexWrapper<GRecMutex>::unlock): Deleted.
145+
(WTF::GMutexLocker::GMutexLocker): Deleted.
146+
(WTF::GMutexLocker::~GMutexLocker): Deleted.
147+
(WTF::GMutexLocker::lock): Deleted.
148+
(WTF::GMutexLocker::unlock): Deleted.
149+
* wtf/gobject/GRefPtr.cpp:
150+
(WTF::refGPtr): Deleted.
151+
(WTF::derefGPtr): Deleted.
152+
* wtf/gobject/GRefPtr.h:
153+
(WTF::GRefPtr::GRefPtr): Deleted.
154+
(WTF::GRefPtr::~GRefPtr): Deleted.
155+
(WTF::GRefPtr::clear): Deleted.
156+
(WTF::GRefPtr::outPtr): Deleted.
157+
(WTF::GRefPtr::isHashTableDeletedValue): Deleted.
158+
(WTF::GRefPtr::get): Deleted.
159+
(WTF::GRefPtr::operator*): Deleted.
160+
(WTF::GRefPtr::operator->): Deleted.
161+
(WTF::GRefPtr::operator!): Deleted.
162+
(WTF::GRefPtr::operator UnspecifiedBoolType): Deleted.
163+
(WTF::GRefPtr::hashTableDeletedValue): Deleted.
164+
(WTF::=): Deleted.
165+
(WTF::GRefPtr<T>::swap): Deleted.
166+
(WTF::swap): Deleted.
167+
(WTF::operator==): Deleted.
168+
(WTF::operator!=): Deleted.
169+
(WTF::static_pointer_cast): Deleted.
170+
(WTF::const_pointer_cast): Deleted.
171+
(WTF::adoptGRef): Deleted.
172+
(WTF::refGPtr): Deleted.
173+
(WTF::derefGPtr): Deleted.
174+
* wtf/gobject/GThreadSafeMainLoopSource.cpp:
175+
(WTF::GThreadSafeMainLoopSource::GThreadSafeMainLoopSource): Deleted.
176+
(WTF::GThreadSafeMainLoopSource::~GThreadSafeMainLoopSource): Deleted.
177+
(WTF::GThreadSafeMainLoopSource::cancel): Deleted.
178+
(WTF::GThreadSafeMainLoopSource::schedule): Deleted.
179+
(WTF::GThreadSafeMainLoopSource::scheduleAfterDelay): Deleted.
180+
(WTF::GThreadSafeMainLoopSource::prepareVoidCallback): Deleted.
181+
(WTF::GThreadSafeMainLoopSource::finishVoidCallback): Deleted.
182+
(WTF::GThreadSafeMainLoopSource::voidCallback): Deleted.
183+
(WTF::GThreadSafeMainLoopSource::prepareBoolCallback): Deleted.
184+
(WTF::GThreadSafeMainLoopSource::finishBoolCallback): Deleted.
185+
(WTF::GThreadSafeMainLoopSource::boolCallback): Deleted.
186+
* wtf/gobject/GUniquePtr.h:
187+
(WTF::GPtrDeleter::operator()): Deleted.
188+
(WTF::GUniqueOutPtr::GUniqueOutPtr): Deleted.
189+
(WTF::GUniqueOutPtr::~GUniqueOutPtr): Deleted.
190+
(WTF::GUniqueOutPtr::outPtr): Deleted.
191+
(WTF::GUniqueOutPtr::release): Deleted.
192+
(WTF::GUniqueOutPtr::operator*): Deleted.
193+
(WTF::GUniqueOutPtr::operator->): Deleted.
194+
(WTF::GUniqueOutPtr::get): Deleted.
195+
(WTF::GUniqueOutPtr::operator!): Deleted.
196+
(WTF::GUniqueOutPtr::operator UnspecifiedBoolType): Deleted.
197+
(WTF::GUniqueOutPtr::reset): Deleted.
198+
* wtf/gobject/GlibUtilities.cpp:
199+
(getCurrentExecutablePath): Deleted.
200+
1201
2015-06-10 Basile Clement <[email protected]>
2202

3203
Unreviewed, fix an typo in unused template code.

‎Source/WTF/WTF.vcxproj/WTF.vcxproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<ClCompile Include="..\wtf\FastMalloc.cpp" />
7474
<ClCompile Include="..\wtf\FilePrintStream.cpp" />
7575
<ClCompile Include="..\wtf\FunctionDispatcher.cpp" />
76-
<ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
76+
<ClCompile Include="..\wtf\glib\GLibUtilities.cpp">
7777
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
7878
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
7979
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -83,7 +83,7 @@
8383
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
8484
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
8585
</ClCompile>
86-
<ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
86+
<ClCompile Include="..\wtf\glib\GMainLoopSource.cpp">
8787
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
8888
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
8989
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -93,7 +93,7 @@
9393
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
9494
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
9595
</ClCompile>
96-
<ClCompile Include="..\wtf\gobject\GRefPtr.cpp">
96+
<ClCompile Include="..\wtf\glib\GRefPtr.cpp">
9797
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
9898
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
9999
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
@@ -103,7 +103,7 @@
103103
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
104104
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
105105
</ClCompile>
106-
<ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp" />
106+
<ClCompile Include="..\wtf\glib\GThreadSafeMainLoopSource.cpp" />
107107
<ClCompile Include="..\wtf\GregorianDateTime.cpp" />
108108
<ClCompile Include="..\wtf\HashTable.cpp" />
109109
<ClCompile Include="..\wtf\MainThread.cpp" />
@@ -204,13 +204,13 @@
204204
<ClInclude Include="..\wtf\FunctionDispatcher.h" />
205205
<ClInclude Include="..\wtf\Functional.h" />
206206
<ClInclude Include="..\wtf\GetPtr.h" />
207-
<ClInclude Include="..\wtf\gobject\GlibUtilities.h" />
208-
<ClInclude Include="..\wtf\gobject\GMainLoopSource.h" />
209-
<ClInclude Include="..\wtf\gobject\GMutexLocker.h" />
210-
<ClInclude Include="..\wtf\gobject\GRefPtr.h" />
211-
<ClInclude Include="..\wtf\gobject\GThreadSafeMainLoopSource.h" />
212-
<ClInclude Include="..\wtf\gobject\GTypedefs.h" />
213-
<ClInclude Include="..\wtf\gobject\GUniquePtr.h" />
207+
<ClInclude Include="..\wtf\glib\GLibUtilities.h" />
208+
<ClInclude Include="..\wtf\glib\GMainLoopSource.h" />
209+
<ClInclude Include="..\wtf\glib\GMutexLocker.h" />
210+
<ClInclude Include="..\wtf\glib\GTypedefs.h" />
211+
<ClInclude Include="..\wtf\glib\GRefPtr.h" />
212+
<ClInclude Include="..\wtf\glib\GThreadSafeMainLoopSource.h" />
213+
<ClInclude Include="..\wtf\glib\GUniquePtr.h" />
214214
<ClInclude Include="..\wtf\GregorianDateTime.h" />
215215
<ClInclude Include="..\wtf\HashCountedSet.h" />
216216
<ClInclude Include="..\wtf\HashFunctions.h" />
@@ -773,4 +773,4 @@
773773
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
774774
<ImportGroup Label="ExtensionTargets">
775775
</ImportGroup>
776-
</Project>
776+
</Project>

‎Source/WTF/WTF.vcxproj/WTF.vcxproj.filters

+23-23
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<Filter Include="wtf\unicode\icu">
2323
<UniqueIdentifier>{da29baba-10a2-4a74-ab87-2fea5e1382da}</UniqueIdentifier>
2424
</Filter>
25-
<Filter Include="wtf\gobject">
25+
<Filter Include="wtf\glib">
2626
<UniqueIdentifier>{edd6ccc8-e6ee-41ec-a58d-9404a30c0c7e}</UniqueIdentifier>
2727
</Filter>
2828
<Filter Include="wtf\win">
@@ -228,26 +228,26 @@
228228
<ClCompile Include="..\wtf\SixCharacterHash.cpp">
229229
<Filter>wtf</Filter>
230230
</ClCompile>
231-
<ClCompile Include="..\wtf\gobject\GlibUtilities.cpp">
232-
<Filter>wtf\gobject</Filter>
231+
<ClCompile Include="..\wtf\glib\GLibUtilities.cpp">
232+
<Filter>wtf\glib</Filter>
233233
</ClCompile>
234-
<ClCompile Include="..\wtf\gobject\GRefPtr.cpp">
235-
<Filter>wtf\gobject</Filter>
234+
<ClCompile Include="..\wtf\glib\GRefPtr.cpp">
235+
<Filter>wtf\glib</Filter>
236236
</ClCompile>
237237
<ClCompile Include="..\wtf\RunLoop.cpp">
238238
<Filter>wtf</Filter>
239239
</ClCompile>
240240
<ClCompile Include="..\wtf\win\RunLoopWin.cpp">
241241
<Filter>wtf\win</Filter>
242242
</ClCompile>
243-
<ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
244-
<Filter>wtf\gobject</Filter>
243+
<ClCompile Include="..\wtf\glib\GMainLoopSource.cpp">
244+
<Filter>wtf\glib</Filter>
245245
</ClCompile>
246246
<ClCompile Include="..\wtf\FastBitVector.cpp">
247247
<Filter>wtf</Filter>
248248
</ClCompile>
249-
<ClCompile Include="..\wtf\gobject\GThreadSafeMainLoopSource.cpp">
250-
<Filter>wtf\gobject</Filter>
249+
<ClCompile Include="..\wtf\glib\GThreadSafeMainLoopSource.cpp">
250+
<Filter>wtf\glib</Filter>
251251
</ClCompile>
252252
<ClCompile Include="..\wtf\RefCounter.cpp" />
253253
<ClCompile Include="..\wtf\win\WTFDLL.cpp">
@@ -676,17 +676,17 @@
676676
<ClInclude Include="..\wtf\win\GDIObject.h">
677677
<Filter>wtf\win</Filter>
678678
</ClInclude>
679-
<ClInclude Include="..\wtf\gobject\GlibUtilities.h">
680-
<Filter>wtf\gobject</Filter>
679+
<ClInclude Include="..\wtf\glib\GLibUtilities.h">
680+
<Filter>wtf\glib</Filter>
681681
</ClInclude>
682-
<ClInclude Include="..\wtf\gobject\GMutexLocker.h">
683-
<Filter>wtf\gobject</Filter>
682+
<ClInclude Include="..\wtf\glib\GMutexLocker.h">
683+
<Filter>wtf\glib</Filter>
684684
</ClInclude>
685-
<ClInclude Include="..\wtf\gobject\GRefPtr.h">
686-
<Filter>wtf\gobject</Filter>
685+
<ClInclude Include="..\wtf\glib\GRefPtr.h">
686+
<Filter>wtf\glib</Filter>
687687
</ClInclude>
688-
<ClInclude Include="..\wtf\gobject\GTypedefs.h">
689-
<Filter>wtf\gobject</Filter>
688+
<ClInclude Include="..\wtf\glib\GTypedefs.h">
689+
<Filter>wtf\glib</Filter>
690690
</ClInclude>
691691
<ClInclude Include="..\wtf\Bag.h">
692692
<Filter>wtf</Filter>
@@ -697,17 +697,17 @@
697697
<ClInclude Include="..\wtf\RunLoop.h">
698698
<Filter>wtf</Filter>
699699
</ClInclude>
700-
<ClInclude Include="..\wtf\gobject\GMainLoopSource.h">
701-
<Filter>wtf\gobject</Filter>
700+
<ClInclude Include="..\wtf\glib\GMainLoopSource.h">
701+
<Filter>wtf\glib</Filter>
702702
</ClInclude>
703-
<ClInclude Include="..\wtf\gobject\GUniquePtr.h">
704-
<Filter>wtf\gobject</Filter>
703+
<ClInclude Include="..\wtf\glib\GUniquePtr.h">
704+
<Filter>wtf\glib</Filter>
705705
</ClInclude>
706706
<ClInclude Include="..\wtf\HashMethod.h">
707707
<Filter>wtf</Filter>
708708
</ClInclude>
709-
<ClInclude Include="..\wtf\gobject\GThreadSafeMainLoopSource.h">
710-
<Filter>wtf\gobject</Filter>
709+
<ClInclude Include="..\wtf\glib\GThreadSafeMainLoopSource.h">
710+
<Filter>wtf\glib</Filter>
711711
</ClInclude>
712712
<ClInclude Include="..\wtf\RefCounter.h" />
713713
<ClInclude Include="..\wtf\WorkQueue.h">

‎Source/WTF/WTF.vcxproj/copy-files.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for %%d in (
1313
wtf
1414
wtf\cf
1515
wtf\dtoa
16-
wtf\gobject
16+
wtf\glib
1717
wtf\text
1818
wtf\threads
1919
wtf\unicode

‎Source/WTF/wtf/Platform.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@
949949
#endif
950950

951951
#if USE(GLIB)
952-
#include <wtf/gobject/GTypedefs.h>
952+
#include <wtf/glib/GTypedefs.h>
953953
#endif
954954

955955
#if PLATFORM(EFL)

‎Source/WTF/wtf/PlatformEfl.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ list(APPEND WTF_SOURCES
44
efl/RunLoopEfl.cpp
55
efl/WorkQueueEfl.cpp
66

7-
gobject/GMainLoopSource.cpp
8-
gobject/GRefPtr.cpp
9-
gobject/GThreadSafeMainLoopSource.cpp
7+
glib/GMainLoopSource.cpp
8+
glib/GRefPtr.cpp
9+
glib/GThreadSafeMainLoopSource.cpp
1010
)
1111

1212
list(APPEND WTF_LIBRARIES

0 commit comments

Comments
 (0)