Title: [156265] trunk/Source/WebKit2
Revision
156265
Author
[email protected]
Date
2013-09-23 01:07:44 -0700 (Mon, 23 Sep 2013)

Log Message

Cleanup CMake files in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=121767

Reviewed by Gyuyoung Kim.

Sort files and unify style.

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/CMakeLists.txt (156264 => 156265)


--- trunk/Source/WebKit2/CMakeLists.txt	2013-09-23 08:03:38 UTC (rev 156264)
+++ trunk/Source/WebKit2/CMakeLists.txt	2013-09-23 08:07:44 UTC (rev 156265)
@@ -235,10 +235,16 @@
     Shared/API/c/WKURLResponse.cpp
     Shared/API/c/WKUserContentURLPattern.cpp
 
+    Shared/Authentication/AuthenticationManager.cpp
+
     Shared/CoordinatedGraphics/CoordinatedGraphicsArgumentCoders.cpp
     Shared/CoordinatedGraphics/WebCoordinatedSurface.cpp
     Shared/CoordinatedGraphics/WebCustomFilterProgramProxy.cpp
 
+    Shared/Downloads/Download.cpp
+    Shared/Downloads/DownloadAuthenticationClient.cpp
+    Shared/Downloads/DownloadManager.cpp
+
     Shared/Plugins/NPIdentifierData.cpp
     Shared/Plugins/NPObjectMessageReceiver.cpp
     Shared/Plugins/NPObjectProxy.cpp
@@ -257,7 +263,6 @@
     UIProcess/FindIndicator.cpp
     UIProcess/GeolocationPermissionRequestManagerProxy.cpp
     UIProcess/GeolocationPermissionRequestProxy.cpp
-
     UIProcess/ResponsivenessTimer.cpp
     UIProcess/StatisticsRequest.cpp
     UIProcess/TextCheckerCompletion.cpp
@@ -295,7 +300,6 @@
     UIProcess/WebIconDatabaseClient.cpp
     UIProcess/WebInspectorProxy.cpp
     UIProcess/WebKeyValueStorageManager.cpp
-
     UIProcess/WebLoaderClient.cpp
     UIProcess/WebMediaCacheManagerProxy.cpp
     UIProcess/WebNavigationData.cpp
@@ -399,16 +403,10 @@
 
     WebProcess/ApplicationCache/WebApplicationCacheManager.cpp
 
-    Shared/Authentication/AuthenticationManager.cpp
-
     WebProcess/Battery/WebBatteryManager.cpp
 
     WebProcess/Cookies/WebCookieManager.cpp
 
-    Shared/Downloads/Download.cpp
-    Shared/Downloads/DownloadAuthenticationClient.cpp
-    Shared/Downloads/DownloadManager.cpp
-
     WebProcess/FullScreen/WebFullScreenManager.cpp
 
     WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp
@@ -423,8 +421,8 @@
     WebProcess/InjectedBundle/InjectedBundleDOMWindowExtension.cpp
     WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
     WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
-    WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
     WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp
+    WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
     WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
     WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp
     WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp
@@ -531,10 +529,11 @@
 
     Shared/WebConnection.messages.in
 
+    Shared/Authentication/AuthenticationManager.messages.in
+
     Shared/Plugins/NPObjectMessageReceiver.messages.in
 
     UIProcess/DrawingAreaProxy.messages.in
-    UIProcess/Storage/StorageManager.messages.in
     UIProcess/WebApplicationCacheManagerProxy.messages.in
     UIProcess/WebBatteryManagerProxy.messages.in
     UIProcess/WebContext.messages.in
@@ -551,21 +550,20 @@
     UIProcess/WebResourceCacheManagerProxy.messages.in
     UIProcess/WebVibrationProxy.messages.in
 
-
     UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.messages.in
 
     UIProcess/Downloads/DownloadProxy.messages.in
 
+    UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in
+
     UIProcess/Plugins/PluginProcessProxy.messages.in
 
-    UIProcess/Network/CustomProtocols/CustomProtocolManagerProxy.messages.in
+    UIProcess/Storage/StorageManager.messages.in
 
     WebProcess/WebProcess.messages.in
 
     WebProcess/ApplicationCache/WebApplicationCacheManager.messages.in
 
-    Shared/Authentication/AuthenticationManager.messages.in
-
     WebProcess/Battery/WebBatteryManager.messages.in
 
     WebProcess/Cookies/WebCookieManager.messages.in

Modified: trunk/Source/WebKit2/ChangeLog (156264 => 156265)


--- trunk/Source/WebKit2/ChangeLog	2013-09-23 08:03:38 UTC (rev 156264)
+++ trunk/Source/WebKit2/ChangeLog	2013-09-23 08:07:44 UTC (rev 156265)
@@ -1,3 +1,16 @@
+2013-09-23  Patrick Gansterer  <[email protected]>
+
+        Cleanup CMake files in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=121767
+
+        Reviewed by Gyuyoung Kim.
+
+        Sort files and unify style.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+
 2013-09-21  Darin Adler  <[email protected]>
 
         Add ExecState::uncheckedArgument and use where possible to shrink a bit

Modified: trunk/Source/WebKit2/PlatformEfl.cmake (156264 => 156265)


--- trunk/Source/WebKit2/PlatformEfl.cmake	2013-09-23 08:03:38 UTC (rev 156264)
+++ trunk/Source/WebKit2/PlatformEfl.cmake	2013-09-23 08:07:44 UTC (rev 156265)
@@ -1,69 +1,72 @@
 list(APPEND WebKit2_SOURCES
+    Platform/CoreIPC/unix/AttachmentUnix.cpp
+    Platform/CoreIPC/unix/ConnectionUnix.cpp
+
     Platform/efl/LoggingEfl.cpp
     Platform/efl/ModuleEfl.cpp
     Platform/efl/WorkQueueEfl.cpp
+
     Platform/unix/SharedMemoryUnix.cpp
 
-    Platform/CoreIPC/unix/ConnectionUnix.cpp
-    Platform/CoreIPC/unix/AttachmentUnix.cpp
-
     PluginProcess/unix/PluginControllerProxyUnix.cpp
     PluginProcess/unix/PluginProcessMainUnix.cpp
     PluginProcess/unix/PluginProcessUnix.cpp
 
     Shared/API/c/cairo/WKImageCairo.cpp
+
     Shared/API/c/efl/WKArrayEfl.cpp
 
     Shared/Downloads/efl/DownloadSoupErrorsEfl.cpp
+
     Shared/Downloads/soup/DownloadSoup.cpp
 
+    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+
     Shared/cairo/ShareableBitmapCairo.cpp
 
     Shared/efl/LayerTreeContextEfl.cpp
     Shared/efl/NativeWebKeyboardEventEfl.cpp
-    Shared/efl/NativeWebWheelEventEfl.cpp
     Shared/efl/NativeWebMouseEventEfl.cpp
     Shared/efl/NativeWebTouchEventEfl.cpp
+    Shared/efl/NativeWebWheelEventEfl.cpp
     Shared/efl/ProcessExecutablePathEfl.cpp
     Shared/efl/WebEventFactory.cpp
 
+    Shared/linux/WebMemorySamplerLinux.cpp
+
     Shared/linux/SeccompFilters/OpenSyscall.cpp
+    Shared/linux/SeccompFilters/SeccompBroker.cpp
+    Shared/linux/SeccompFilters/SeccompFilters.cpp
     Shared/linux/SeccompFilters/SigactionSyscall.cpp
     Shared/linux/SeccompFilters/SigprocmaskSyscall.cpp
-    Shared/linux/SeccompFilters/SeccompBroker.cpp
-    Shared/linux/SeccompFilters/SeccompFilters.cpp
     Shared/linux/SeccompFilters/Syscall.cpp
     Shared/linux/SeccompFilters/SyscallPolicy.cpp
 
-    Shared/linux/WebMemorySamplerLinux.cpp
-
     Shared/soup/PlatformCertificateInfo.cpp
     Shared/soup/WebCoreArgumentCodersSoup.cpp
 
     UIProcess/DefaultUndoController.cpp
     UIProcess/PageViewportController.cpp
 
-    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+    UIProcess/API/C/CoordinatedGraphics/WKView.cpp
 
     UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
 
-    UIProcess/API/C/CoordinatedGraphics/WKView.cpp
-
     UIProcess/API/C/efl/WKEventEfl.cpp
     UIProcess/API/C/efl/WKPageEfl.cpp
     UIProcess/API/C/efl/WKPopupItem.cpp
     UIProcess/API/C/efl/WKPopupMenuListener.cpp
     UIProcess/API/C/efl/WKViewEfl.cpp
 
-    UIProcess/API/cpp/efl/WKEinaSharedString.cpp
-
     UIProcess/API/C/soup/WKContextSoup.cpp
     UIProcess/API/C/soup/WKCookieManagerSoup.cpp
     UIProcess/API/C/soup/WKSoupRequestManager.cpp
 
-    UIProcess/API/efl/EwkView.cpp
+    UIProcess/API/cpp/efl/WKEinaSharedString.cpp
+
     UIProcess/API/efl/EvasGLContext.cpp
     UIProcess/API/efl/EvasGLSurface.cpp
+    UIProcess/API/efl/EwkView.cpp
     UIProcess/API/efl/GestureRecognizer.cpp
     UIProcess/API/efl/SnapshotImageGL.cpp
     UIProcess/API/efl/ewk_auth_request.cpp
@@ -97,11 +100,22 @@
     UIProcess/API/efl/ewk_view.cpp
     UIProcess/API/efl/ewk_window_features.cpp
 
-    UIProcess/cairo/BackingStoreCairo.cpp
-
     UIProcess/CoordinatedGraphics/WebView.cpp
     UIProcess/CoordinatedGraphics/WebViewClient.cpp
 
+    UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp
+
+    UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
+
+    UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
+
+    UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
+    UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
+
+    UIProcess/Storage/StorageManager.cpp
+
+    UIProcess/cairo/BackingStoreCairo.cpp
+
     UIProcess/efl/BatteryProvider.cpp
     UIProcess/efl/ContextHistoryClientEfl.cpp
     UIProcess/efl/ContextMenuClientEfl.cpp
@@ -122,7 +136,6 @@
     UIProcess/efl/TextCheckerEfl.cpp
     UIProcess/efl/VibrationClientEfl.cpp
     UIProcess/efl/ViewClientEfl.cpp
-    UIProcess/efl/WebViewEfl.cpp
     UIProcess/efl/WebContextEfl.cpp
     UIProcess/efl/WebContextMenuProxyEfl.cpp
     UIProcess/efl/WebFullScreenManagerProxyEfl.cpp
@@ -133,21 +146,12 @@
     UIProcess/efl/WebPreferencesEfl.cpp
     UIProcess/efl/WebProcessProxyEfl.cpp
     UIProcess/efl/WebUIPopupMenuClient.cpp
+    UIProcess/efl/WebViewEfl.cpp
 
-    UIProcess/InspectorServer/efl/WebInspectorServerEfl.cpp
-    UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
-
     UIProcess/soup/WebCookieManagerProxySoup.cpp
     UIProcess/soup/WebSoupRequestManagerClient.cpp
     UIProcess/soup/WebSoupRequestManagerProxy.cpp
 
-    UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
-
-    UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
-    UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
-
-    UIProcess/Storage/StorageManager.cpp
-
     WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
     WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
 
@@ -165,20 +169,22 @@
     WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
 
     WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
+
     WebProcess/WebPage/efl/WebInspectorEfl.cpp
     WebProcess/WebPage/efl/WebPageEfl.cpp
 
     WebProcess/efl/SeccompFiltersWebProcessEfl.cpp
     WebProcess/efl/WebProcessMainEfl.cpp
 
+    WebProcess/soup/WebKitSoupRequestGeneric.cpp
+    WebProcess/soup/WebKitSoupRequestInputStream.cpp
     WebProcess/soup/WebProcessSoup.cpp
     WebProcess/soup/WebSoupRequestManager.cpp
-    WebProcess/soup/WebKitSoupRequestGeneric.cpp
-    WebProcess/soup/WebKitSoupRequestInputStream.cpp
 )
 
 list(APPEND WebKit2_MESSAGES_IN_FILES
     UIProcess/soup/WebSoupRequestManagerProxy.messages.in
+
     WebProcess/soup/WebSoupRequestManager.messages.in
 )
 
@@ -228,27 +234,27 @@
 
 list(APPEND WebKit2_LIBRARIES
     ${CAIRO_LIBRARIES}
-    ${ECORE_LIBRARIES}
+    ${CMAKE_DL_LIBS}
     ${ECORE_EVAS_LIBRARIES}
     ${ECORE_IMF_EVAS_LIBRARIES}
+    ${ECORE_LIBRARIES}
     ${EDJE_LIBRARIES}
     ${EFREET_LIBRARIES}
     ${EINA_LIBRARIES}
     ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
+    ${FONTCONFIG_LIBRARIES}
     ${Freetype_LIBRARIES}
+    ${GLIB_GIO_LIBRARIES}
+    ${GLIB_GOBJECT_LIBRARIES}
+    ${GLIB_LIBRARIES}
     ${HARFBUZZ_LIBRARIES}
+    ${JPEG_LIBRARIES}
+    ${LIBSOUP_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${OPENGL_LIBRARIES}
+    ${PNG_LIBRARIES}
     ${SQLITE_LIBRARIES}
-    ${FONTCONFIG_LIBRARIES}
-    ${PNG_LIBRARIES}
-    ${JPEG_LIBRARIES}
-    ${CMAKE_DL_LIBS}
-    ${GLIB_LIBRARIES}
-    ${GLIB_GIO_LIBRARIES}
-    ${GLIB_GOBJECT_LIBRARIES}
-    ${LIBSOUP_LIBRARIES}
 )
 
 list(APPEND WebProcess_SOURCES
@@ -257,8 +263,8 @@
 
 list(APPEND WebProcess_LIBRARIES
     ${CAIRO_LIBRARIES}
+    ${ECORE_IMF_EVAS_LIBRARIES}
     ${ECORE_IMF_LIBRARIES}
-    ${ECORE_IMF_EVAS_LIBRARIES}
     ${EDJE_LIBRARIES}
     ${EFLDEPS_LIBRARIES}
     ${EVAS_LIBRARIES}
@@ -325,11 +331,11 @@
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_favicon_database.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_file_chooser_request.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_form_submission_request.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_page_group.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_main.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_data.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_navigation_policy_decision.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_object.h"
+    "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_page_group.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_popup_menu_item.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/UIProcess/API/efl/ewk_security_origin.h"
@@ -378,19 +384,19 @@
 include_directories(${THIRDPARTY_DIR}/gtest/include)
 
 set(EWK2UnitTests_LIBRARIES
-    WTF
-    _javascript_Core
-    WebCore
-    WebKit2
     ${CAIRO_LIBRARIES}
+    ${ECORE_EVAS_LIBRARIES}
     ${ECORE_LIBRARIES}
-    ${ECORE_EVAS_LIBRARIES}
     ${EVAS_LIBRARIES}
-    ${GLIB_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
     ${GLIB_GOBJECT_LIBRARIES}
     ${GLIB_GTHREAD_LIBRARIES}
+    ${GLIB_LIBRARIES}
     ${LIBSOUP_LIBRARIES}
+    _javascript_Core
+    WTF
+    WebCore
+    WebKit2
     gtest
 )
 

Modified: trunk/Source/WebKit2/PlatformGTK.cmake (156264 => 156265)


--- trunk/Source/WebKit2/PlatformGTK.cmake	2013-09-23 08:03:38 UTC (rev 156264)
+++ trunk/Source/WebKit2/PlatformGTK.cmake	2013-09-23 08:07:44 UTC (rev 156265)
@@ -14,41 +14,34 @@
 add_definitions(-DLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}")
 
 list(APPEND WebKit2_SOURCES
+    ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.cpp
     ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
-    ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.cpp
+
+    Platform/CoreIPC/unix/AttachmentUnix.cpp
+    Platform/CoreIPC/unix/ConnectionUnix.cpp
+
     Platform/gtk/LoggingGtk.cpp
     Platform/gtk/ModuleGtk.cpp
     Platform/gtk/WorkQueueGtk.cpp
+
     Platform/unix/SharedMemoryUnix.cpp
-    WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
-    WebProcess/WebPage/gtk/WebPageGtk.cpp
-    WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
-    WebProcess/WebPage/gtk/WebInspectorGtk.cpp
-    WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
-    WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
-    WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
-    WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
-    WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
-    WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
-    UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp
-    UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
-    UIProcess/gtk/ExperimentalFeatures.cpp
-    UIProcess/gtk/WebContextMenuProxyGtk.cpp
-    UIProcess/gtk/WebContextGtk.cpp
-    UIProcess/gtk/WebPageProxyGtk.cpp
-    UIProcess/gtk/WebPreferencesGtk.cpp
-    UIProcess/gtk/WebFullScreenClientGtk.cpp
-    UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
-    UIProcess/gtk/WebInspectorProxyGtk.cpp
-    UIProcess/gtk/TextCheckerGtk.cpp
-    UIProcess/gtk/WebPopupMenuProxyGtk.cpp
-    UIProcess/gtk/WebInspectorClientGtk.cpp
-    UIProcess/gtk/WebProcessProxyGtk.cpp
-    UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
-    UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp
 
+    PluginProcess/unix/PluginControllerProxyUnix.cpp
+    PluginProcess/unix/PluginProcessMainUnix.cpp
+    PluginProcess/unix/PluginProcessUnix.cpp
+
+    Shared/API/c/cairo/WKImageCairo.cpp
+
     Shared/API/c/gtk/WKGraphicsContextGtk.cpp
+
     Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp
+
+    Shared/Downloads/soup/DownloadSoup.cpp
+
+    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+
+    Shared/cairo/ShareableBitmapCairo.cpp
+
     Shared/gtk/ArgumentCodersGtk.cpp
     Shared/gtk/LayerTreeContextGtk.cpp
     Shared/gtk/NativeWebKeyboardEventGtk.cpp
@@ -58,55 +51,35 @@
     Shared/gtk/ProcessExecutablePathGtk.cpp
     Shared/gtk/WebEventFactory.cpp
 
-    Platform/CoreIPC/unix/ConnectionUnix.cpp
-    Platform/CoreIPC/unix/AttachmentUnix.cpp
-    PluginProcess/unix/PluginControllerProxyUnix.cpp
-    PluginProcess/unix/PluginProcessMainUnix.cpp
-    PluginProcess/unix/PluginProcessUnix.cpp
-    Shared/API/c/cairo/WKImageCairo.cpp
-    Shared/Downloads/soup/DownloadSoup.cpp
-    Shared/cairo/ShareableBitmapCairo.cpp
+    Shared/linux/WebMemorySamplerLinux.cpp
+
     Shared/linux/SeccompFilters/OpenSyscall.cpp
+    Shared/linux/SeccompFilters/SeccompBroker.cpp
+    Shared/linux/SeccompFilters/SeccompFilters.cpp
     Shared/linux/SeccompFilters/SigactionSyscall.cpp
     Shared/linux/SeccompFilters/SigprocmaskSyscall.cpp
-    Shared/linux/SeccompFilters/SeccompBroker.cpp
-    Shared/linux/SeccompFilters/SeccompFilters.cpp
     Shared/linux/SeccompFilters/Syscall.cpp
     Shared/linux/SeccompFilters/SyscallPolicy.cpp
-    Shared/linux/WebMemorySamplerLinux.cpp
+
     Shared/soup/PlatformCertificateInfo.cpp
     Shared/soup/WebCoreArgumentCodersSoup.cpp
+
     UIProcess/DefaultUndoController.cpp
-    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp
+
+    UIProcess/API/C/CoordinatedGraphics/WKView.cpp
+
     UIProcess/API/C/cairo/WKIconDatabaseCairo.cpp
-    UIProcess/API/C/CoordinatedGraphics/WKView.cpp
+
+    UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp
+    UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
+    UIProcess/API/C/gtk/WKView.cpp
+
     UIProcess/API/C/soup/WKContextSoup.cpp
     UIProcess/API/C/soup/WKCookieManagerSoup.cpp
     UIProcess/API/C/soup/WKSoupRequestManager.cpp
-    UIProcess/cairo/BackingStoreCairo.cpp
-    UIProcess/CoordinatedGraphics/WebView.cpp
-    UIProcess/CoordinatedGraphics/WebViewClient.cpp
-    UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
-    UIProcess/soup/WebCookieManagerProxySoup.cpp
-    UIProcess/soup/WebSoupRequestManagerClient.cpp
-    UIProcess/soup/WebSoupRequestManagerProxy.cpp
-    UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
-    UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
-    UIProcess/Storage/StorageManager.cpp
-    WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
-    WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
-    WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
-    WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-    WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
-    WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
-    WebProcess/soup/WebProcessSoup.cpp
-    WebProcess/soup/WebSoupRequestManager.cpp
-    WebProcess/soup/WebKitSoupRequestGeneric.cpp
-    WebProcess/soup/WebKitSoupRequestInputStream.cpp
 
     UIProcess/API/gtk/PageClientImpl.cpp
     UIProcess/API/gtk/PageClientImpl.h
-    UIProcess/API/gtk/webkit2.h
     UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
     UIProcess/API/gtk/WebKitAuthenticationDialog.h
     UIProcess/API/gtk/WebKitBackForwardList.cpp
@@ -114,13 +87,13 @@
     UIProcess/API/gtk/WebKitBackForwardListItem.cpp
     UIProcess/API/gtk/WebKitBackForwardListItem.h
     UIProcess/API/gtk/WebKitBackForwardListPrivate.h
+    UIProcess/API/gtk/WebKitContextMenu.cpp
+    UIProcess/API/gtk/WebKitContextMenu.h
     UIProcess/API/gtk/WebKitContextMenuActions.cpp
     UIProcess/API/gtk/WebKitContextMenuActions.h
     UIProcess/API/gtk/WebKitContextMenuActionsPrivate.h
     UIProcess/API/gtk/WebKitContextMenuClient.cpp
     UIProcess/API/gtk/WebKitContextMenuClient.h
-    UIProcess/API/gtk/WebKitContextMenu.cpp
-    UIProcess/API/gtk/WebKitContextMenu.h
     UIProcess/API/gtk/WebKitContextMenuItem.cpp
     UIProcess/API/gtk/WebKitContextMenuItem.h
     UIProcess/API/gtk/WebKitContextMenuItemPrivate.h
@@ -129,10 +102,10 @@
     UIProcess/API/gtk/WebKitCookieManager.h
     UIProcess/API/gtk/WebKitCookieManagerPrivate.h
     UIProcess/API/gtk/WebKitDefines.h
+    UIProcess/API/gtk/WebKitDownload.cpp
+    UIProcess/API/gtk/WebKitDownload.h
     UIProcess/API/gtk/WebKitDownloadClient.cpp
     UIProcess/API/gtk/WebKitDownloadClient.h
-    UIProcess/API/gtk/WebKitDownload.cpp
-    UIProcess/API/gtk/WebKitDownload.h
     UIProcess/API/gtk/WebKitDownloadPrivate.h
     UIProcess/API/gtk/WebKitEditingCommands.h
     UIProcess/API/gtk/WebKitError.cpp
@@ -227,28 +200,87 @@
     UIProcess/API/gtk/WebKitWebResource.cpp
     UIProcess/API/gtk/WebKitWebResource.h
     UIProcess/API/gtk/WebKitWebResourcePrivate.h
+    UIProcess/API/gtk/WebKitWebView.cpp
+    UIProcess/API/gtk/WebKitWebView.h
+    UIProcess/API/gtk/WebKitWebViewBase.cpp
+    UIProcess/API/gtk/WebKitWebViewBase.h
     UIProcess/API/gtk/WebKitWebViewBaseAccessible.cpp
     UIProcess/API/gtk/WebKitWebViewBaseAccessible.h
-    UIProcess/API/gtk/WebKitWebViewBase.cpp
-    UIProcess/API/gtk/WebKitWebViewBase.h
     UIProcess/API/gtk/WebKitWebViewBasePrivate.h
-    UIProcess/API/gtk/WebKitWebView.cpp
     UIProcess/API/gtk/WebKitWebViewGroup.cpp
     UIProcess/API/gtk/WebKitWebViewGroup.h
     UIProcess/API/gtk/WebKitWebViewGroupPrivate.h
-    UIProcess/API/gtk/WebKitWebView.h
     UIProcess/API/gtk/WebKitWebViewPrivate.h
     UIProcess/API/gtk/WebKitWindowProperties.cpp
     UIProcess/API/gtk/WebKitWindowProperties.h
     UIProcess/API/gtk/WebKitWindowPropertiesPrivate.h
     UIProcess/API/gtk/WebViewBaseInputMethodFilter.cpp
     UIProcess/API/gtk/WebViewBaseInputMethodFilter.h
+    UIProcess/API/gtk/webkit2.h
 
-    UIProcess/API/C/gtk/WKFullScreenClientGtk.cpp
-    UIProcess/API/C/gtk/WKInspectorClientGtk.cpp
-    UIProcess/API/C/gtk/WKView.cpp
+    UIProcess/CoordinatedGraphics/WebView.cpp
+    UIProcess/CoordinatedGraphics/WebViewClient.cpp
 
+    UIProcess/InspectorServer/gtk/WebInspectorServerGtk.cpp
+
+    UIProcess/InspectorServer/soup/WebSocketServerSoup.cpp
+
+    UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
+
+    UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
+    UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
+
+    UIProcess/Storage/StorageManager.cpp
+
+    UIProcess/cairo/BackingStoreCairo.cpp
+
+    UIProcess/gtk/ExperimentalFeatures.cpp
+    UIProcess/gtk/TextCheckerGtk.cpp
+    UIProcess/gtk/WebContextGtk.cpp
+    UIProcess/gtk/WebContextMenuProxyGtk.cpp
+    UIProcess/gtk/WebFullScreenClientGtk.cpp
+    UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp
+    UIProcess/gtk/WebInspectorClientGtk.cpp
+    UIProcess/gtk/WebInspectorProxyGtk.cpp
+    UIProcess/gtk/WebPageProxyGtk.cpp
+    UIProcess/gtk/WebPopupMenuProxyGtk.cpp
+    UIProcess/gtk/WebPreferencesGtk.cpp
+    UIProcess/gtk/WebProcessProxyGtk.cpp
+
+    UIProcess/soup/WebCookieManagerProxySoup.cpp
+    UIProcess/soup/WebSoupRequestManagerClient.cpp
+    UIProcess/soup/WebSoupRequestManagerProxy.cpp
+
+    WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
+    WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
+
+    WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
+
+    WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
+
+    WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+
+    WebProcess/WebCoreSupport/gtk/WebContextMenuClientGtk.cpp
+    WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp
+    WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp
+    WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp
+    WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp
+
+    WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp
+
+    WebProcess/WebPage/atk/WebPageAccessibilityObjectAtk.cpp
+
+    WebProcess/WebPage/gtk/LayerTreeHostGtk.cpp
+    WebProcess/WebPage/gtk/WebInspectorGtk.cpp
+    WebProcess/WebPage/gtk/WebPageGtk.cpp
+    WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
+
     WebProcess/gtk/WebProcessMainGtk.cpp
+
+    WebProcess/soup/WebKitSoupRequestGeneric.cpp
+    WebProcess/soup/WebKitSoupRequestInputStream.cpp
+    WebProcess/soup/WebProcessSoup.cpp
+    WebProcess/soup/WebSoupRequestManager.cpp
 )
 
 set(WebKit2_INSTALLED_HEADERS
@@ -299,6 +331,7 @@
 
 list(APPEND WebKit2_MESSAGES_IN_FILES
     UIProcess/soup/WebSoupRequestManagerProxy.messages.in
+
     WebProcess/soup/WebSoupRequestManager.messages.in
 )
 
@@ -383,9 +416,9 @@
 )
 
 set(WEBKIT2_EXTRA_DEPENDENCIES
+     fake-installed-headers
      gtk-forwarding-headers
      soup-forwarding-headers
-     fake-installed-headers
 )
 
 if (ENABLE_PLUGIN_PROCESS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to