Diff
Modified: trunk/ChangeLog (160360 => 160361)
--- trunk/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
@@ -1,3 +1,12 @@
+2013-12-10 Martin Robinson <mrobin...@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * Source/cmake/OptionsGTK.cmake: Disable Quota support to maintain consistency with
+ autotools build.
+
2013-12-09 Brian Holt <brian.h...@samsung.com>
[WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
Modified: trunk/Source/WTF/ChangeLog (160360 => 160361)
--- trunk/Source/WTF/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WTF/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
@@ -1,3 +1,11 @@
+2013-12-10 Martin Robinson <mrobin...@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * wtf/PlatformGTK.cmake: Add Zlib library to the WTF build.
+
2013-12-09 Sam Weinig <s...@webkit.org>
Remove FixedArray
Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (160360 => 160361)
--- trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
@@ -12,6 +12,7 @@
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
pthread
+ ${ZLIB_LIBRARIES}
)
list(APPEND WTF_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebCore/ChangeLog (160360 => 160361)
--- trunk/Source/WebCore/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebCore/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
@@ -1,3 +1,11 @@
+2013-12-10 Martin Robinson <mrobin...@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * PlatformGTK.cmake: Update source list.
+
2013-12-10 Robert Sipka <si...@inf.u-szeged.hu>
[nix][curl] Buildfix after r160310
Modified: trunk/Source/WebCore/PlatformGTK.cmake (160360 => 160361)
--- trunk/Source/WebCore/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
@@ -43,6 +43,8 @@
editing/atk/FrameSelectionAtk.cpp
+ html/shadow/MediaControlsGtk.cpp
+
loader/soup/CachedRawResourceSoup.cpp
loader/soup/SubresourceLoaderSoup.cpp
Modified: trunk/Source/WebKit2/CMakeLists.txt (160360 => 160361)
--- trunk/Source/WebKit2/CMakeLists.txt 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebKit2/CMakeLists.txt 2013-12-10 14:32:17 UTC (rev 160361)
@@ -290,6 +290,7 @@
UIProcess/APINavigationData.cpp
UIProcess/BackingStore.cpp
UIProcess/DrawingAreaProxy.cpp
+ UIProcess/DrawingAreaProxyImpl.cpp
UIProcess/FindIndicator.cpp
UIProcess/FrameLoadState.cpp
UIProcess/GeolocationPermissionRequestManagerProxy.cpp
@@ -548,6 +549,7 @@
WebProcess/WebPage/DecoderAdapter.cpp
WebProcess/WebPage/DrawingArea.cpp
+ WebProcess/WebPage/DrawingAreaImpl.cpp
WebProcess/WebPage/EncoderAdapter.cpp
WebProcess/WebPage/EventDispatcher.cpp
WebProcess/WebPage/FindController.cpp
Modified: trunk/Source/WebKit2/ChangeLog (160360 => 160361)
--- trunk/Source/WebKit2/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
@@ -1,3 +1,12 @@
+2013-12-10 Martin Robinson <mrobin...@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * CMakeLists.txt: Update the source lists.
+ * PlatformGTK.cmake: Ditto.
+
2013-12-10 Alberto Garcia <be...@igalia.com>
[WK2] [GTK] Enable the network process in the WebContext
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (160360 => 160361)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
@@ -32,8 +32,6 @@
Shared/API/c/cairo/WKImageCairo.cpp
- Shared/API/c/gtk/WKGraphicsContextGtk.cpp
-
Shared/Downloads/gtk/DownloadSoupErrorsGtk.cpp
Shared/Downloads/soup/DownloadSoup.cpp
@@ -82,6 +80,8 @@
UIProcess/API/gtk/PageClientImpl.h
UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
UIProcess/API/gtk/WebKitAuthenticationDialog.h
+ UIProcess/API/gtk/WebKitAuthenticationRequest.cpp
+ UIProcess/API/gtk/WebKitAuthenticationRequest.h
UIProcess/API/gtk/WebKitBackForwardList.cpp
UIProcess/API/gtk/WebKitBackForwardList.h
UIProcess/API/gtk/WebKitBackForwardListItem.cpp
@@ -104,6 +104,8 @@
UIProcess/API/gtk/WebKitCookieManager.cpp
UIProcess/API/gtk/WebKitCookieManager.h
UIProcess/API/gtk/WebKitCookieManagerPrivate.h
+ UIProcess/API/gtk/WebKitCredential.cpp
+ UIProcess/API/gtk/WebKitCredential.h
UIProcess/API/gtk/WebKitDefines.h
UIProcess/API/gtk/WebKitDownload.cpp
UIProcess/API/gtk/WebKitDownload.h
@@ -242,7 +244,6 @@
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
@@ -257,6 +258,11 @@
WebProcess/Cookies/soup/WebCookieManagerSoup.cpp
WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
+ WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
+
WebProcess/InjectedBundle/gtk/InjectedBundleGtk.cpp
WebProcess/Plugins/Netscape/unix/PluginProxyUnix.cpp
@@ -278,6 +284,8 @@
WebProcess/WebPage/gtk/WebPageGtk.cpp
WebProcess/WebPage/gtk/WebPrintOperationGtk.cpp
+ WebProcess/gtk/WebGtkExtensionManager.cpp
+ WebProcess/gtk/WebGtkInjectedBundleMain.cpp
WebProcess/gtk/WebProcessMainGtk.cpp
WebProcess/soup/WebKitSoupRequestGeneric.cpp
@@ -328,9 +336,20 @@
${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFramePrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorldPrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionPrivate.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h
${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
+
)
list(APPEND WebKit2_MESSAGES_IN_FILES
@@ -347,6 +366,7 @@
)
list(APPEND WebKit2_INCLUDE_DIRECTORIES
+ "${WEBCORE_DIR}/platform/cairo"
"${WEBCORE_DIR}/platform/gtk"
"${WEBCORE_DIR}/platform/graphics/cairo"
"${WEBCORE_DIR}/platform/graphics/opentype"
Modified: trunk/Source/cmake/OptionsGTK.cmake (160360 => 160361)
--- trunk/Source/cmake/OptionsGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
@@ -31,6 +31,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_INFO ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PAGE_VISIBILITY_API ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_QUOTA OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOLUTION_MEDIA_QUERY OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_REQUEST_ANIMATION_FRAME ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SECCOMP_FILTERS OFF)
Modified: trunk/Tools/ChangeLog (160360 => 160361)
--- trunk/Tools/ChangeLog 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Tools/ChangeLog 2013-12-10 14:32:17 UTC (rev 160361)
@@ -1,3 +1,12 @@
+2013-12-10 Martin Robinson <mrobin...@igalia.com>
+
+ Various fixes for the CMake GTK+ build
+
+ Reviewed by Gustavo Noronha.
+
+ * MiniBrowser/gtk/CMakeLists.txt: Update source list and correct the name of BrowserMarshal.h.
+ * TestWebKitAPI/PlatformGTK.cmake: Add GTK+ libraries to the test program. They're required.
+
2013-12-10 László Langó <la...@inf.u-szeged.hu>
--cloop option does not work in Tools/Scripts/build-jsc.
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (160360 => 160361)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2013-12-10 14:32:17 UTC (rev 160361)
@@ -5,14 +5,16 @@
set(MiniBrowser_SOURCES
${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
+ ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
- ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
+ ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
${MINIBROWSER_DIR}/BrowserDownloadsBar.h
- ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
+ ${MINIBROWSER_DIR}/BrowserSearchBar.c
+ ${MINIBROWSER_DIR}/BrowserSearchBar.h
+ ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
${MINIBROWSER_DIR}/BrowserSettingsDialog.h
- ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
+ ${MINIBROWSER_DIR}/BrowserWindow.c
${MINIBROWSER_DIR}/BrowserWindow.h
- ${MINIBROWSER_DIR}/BrowserWindow.c
${MINIBROWSER_DIR}/main.c
)
@@ -36,7 +38,7 @@
add_custom_command(
OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
- ${DERIVED_SOURCES_MINIBROWSER_DIR}/Browsermarshal.h
+ ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (160360 => 160361)
--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2013-12-10 14:31:07 UTC (rev 160360)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake 2013-12-10 14:32:17 UTC (rev 160361)
@@ -54,6 +54,11 @@
${GTK3_LIBRARIES}
)
+list(APPEND TestWebKitAPI_LIBRARIES
+ ${GDK3_LIBRARIES}
+ ${GTK3_LIBRARIES}
+)
+
# The list below works like a test expectation. Tests in the
# test_{webkit2_api|webcore}_BINARIES list are added to the test runner and
# tried on the bots on every build. Tests in test_{webkit2_api|webcore}_BINARIES
