Diff
Modified: trunk/ChangeLog (160803 => 160804)
--- trunk/ChangeLog 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/ChangeLog 2013-12-19 00:04:47 UTC (rev 160804)
@@ -1,3 +1,14 @@
+2013-12-16 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Add support for building WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=116377
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/cmake/OptionsGTK.cmake: Turn off some features that do not build properly
+ for WebKit1 and stop using the version script which we haven't implemented yet. Turn
+ on WebKit1.
+
2013-12-18 Gustavo Noronha Silva <[email protected]>
[GTK][CMake] Use thin archives if building on Linux, only way to get non-shared-core debug builds
Modified: trunk/Source/WebCore/ChangeLog (160803 => 160804)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/WebCore/ChangeLog 2013-12-19 00:04:47 UTC (rev 160804)
@@ -1,3 +1,13 @@
+2013-12-16 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Add support for building WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=116377
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Add a missing source required by WebKit1 to
+ the WebCore build.
+
2013-12-18 Hans Muller <[email protected]>
[CSS Shapes] Simplify RectangleShape implementation
Modified: trunk/Source/WebCore/PlatformGTK.cmake (160803 => 160804)
--- trunk/Source/WebCore/PlatformGTK.cmake 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2013-12-19 00:04:47 UTC (rev 160804)
@@ -44,6 +44,7 @@
platform/graphics/cairo/BitmapImageCairo.cpp
platform/graphics/cairo/CairoUtilities.cpp
platform/graphics/cairo/DrawingBufferCairo.cpp
+ platform/graphics/cairo/FloatRectCairo.cpp
platform/graphics/cairo/FontCairo.cpp
platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
platform/graphics/cairo/GradientCairo.cpp
Modified: trunk/Source/WebKit/CMakeLists.txt (160803 => 160804)
--- trunk/Source/WebKit/CMakeLists.txt 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/WebKit/CMakeLists.txt 2013-12-19 00:04:47 UTC (rev 160804)
@@ -3,10 +3,13 @@
"${_javascript_CORE_DIR}/ForwardingHeaders"
"${WEBKIT_DIR}"
"${WEBCORE_DIR}"
+ "${WEBCORE_DIR}/Modules/geolocation"
"${WEBCORE_DIR}/Modules/filesystem"
"${WEBCORE_DIR}/Modules/mediastream"
+ "${WEBCORE_DIR}/Modules/navigatorcontentutils"
"${WEBCORE_DIR}/Modules/networkinfo"
"${WEBCORE_DIR}/Modules/webdatabase"
+ "${WEBCORE_DIR}/Modules/websockets"
"${WEBCORE_DIR}/accessibility"
"${WEBCORE_DIR}/bindings/generic"
"${WEBCORE_DIR}/bindings/js"
@@ -18,12 +21,14 @@
"${WEBCORE_DIR}/dom"
"${WEBCORE_DIR}/dom/default"
"${WEBCORE_DIR}/editing"
+ "${WEBCORE_DIR}/fileapi"
"${WEBCORE_DIR}/history"
"${WEBCORE_DIR}/html"
"${WEBCORE_DIR}/html/forms"
"${WEBCORE_DIR}/html/shadow"
"${WEBCORE_DIR}/inspector"
"${WEBCORE_DIR}/loader"
+ "${WEBCORE_DIR}/loader/archive"
"${WEBCORE_DIR}/loader/appcache"
"${WEBCORE_DIR}/loader/icon"
"${WEBCORE_DIR}/loader/cache"
@@ -38,16 +43,19 @@
"${WEBCORE_DIR}/platform/graphics/opengl"
"${WEBCORE_DIR}/platform/graphics/transforms"
"${WEBCORE_DIR}/platform/mediastream"
+ "${WEBCORE_DIR}/platform/mock"
"${WEBCORE_DIR}/platform/network"
"${WEBCORE_DIR}/platform/sql"
"${WEBCORE_DIR}/platform/text"
"${WEBCORE_DIR}/plugins"
"${WEBCORE_DIR}/rendering"
+ "${WEBCORE_DIR}/rendering/line"
"${WEBCORE_DIR}/rendering/shapes"
"${WEBCORE_DIR}/rendering/style"
"${WEBCORE_DIR}/storage"
"${WEBCORE_DIR}/style"
"${WEBCORE_DIR}/svg"
+ "${WEBCORE_DIR}/svg/animation"
"${WEBCORE_DIR}/svg/graphics"
"${WEBCORE_DIR}/svg/properties"
"${WEBCORE_DIR}/workers"
@@ -92,7 +100,7 @@
add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
add_dependencies(WebKit WebCore)
target_link_libraries(WebKit ${WebKit_LIBRARIES})
-set_target_properties(WebKit PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebKit")
+set_target_properties(WebKit PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebKit;BUILDING_WEBKIT")
set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "")
Modified: trunk/Source/WebKit/ChangeLog (160803 => 160804)
--- trunk/Source/WebKit/ChangeLog 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/WebKit/ChangeLog 2013-12-19 00:04:47 UTC (rev 160804)
@@ -1,3 +1,14 @@
+2013-12-16 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Add support for building WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=116377
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Updated WebCore include directory list for WebKitGTK+ and
+ added BUILDING_WEBKIT to the list of defines.
+ * PlatformGTK.cmake: Added.
+
2013-12-18 Alex Christensen <[email protected]>
[WinCairo] Preparation for GStreamer on Windows.
Added: trunk/Source/WebKit/PlatformGTK.cmake (0 => 160804)
--- trunk/Source/WebKit/PlatformGTK.cmake (rev 0)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2013-12-19 00:04:47 UTC (rev 160804)
@@ -0,0 +1,158 @@
+set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkit)
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_DIR})
+configure_file(gtk/webkit/webkitversion.h.in ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitversion.h)
+add_definitions(-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
+
+list(APPEND WebKit_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_DIR}
+ ${DERIVED_SOURCES_DIR}/webkitdom
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
+ ${DERIVED_SOURCES_WEBKITGTK_DIR}
+ ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
+ ${THIRDPARTY_DIR}/ANGLE/src
+ ${THIRDPARTY_DIR}/ANGLE/include
+ ${THIRDPARTY_DIR}/ANGLE/include/KHR
+ ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
+ ${WEBCORE_DIR}/accessibility/atk
+ ${WEBCORE_DIR}/platform/cairo
+ ${WEBCORE_DIR}/platform/graphics/cairo
+ ${WEBCORE_DIR}/platform/graphics/gtk
+ ${WEBCORE_DIR}/platform/graphics/opentype
+ ${WEBCORE_DIR}/platform/graphics/texmap
+ ${WEBCORE_DIR}/platform/gtk
+ ${WEBCORE_DIR}/platform/network/soup
+ ${WEBCORE_DIR}/platform/text/enchant
+ ${WEBKIT_DIR}/gtk
+ ${WEBKIT_DIR}/gtk/webkit
+ ${WEBKIT_DIR}/gtk/WebCoreSupport
+ ${ENCHANT_INCLUDE_DIRS}
+ ${GTK3_INCLUDE_DIRS}
+ ${LIBSOUP_INCLUDE_DIRS}
+)
+
+list(APPEND WebKit_SOURCES
+ ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.cpp
+ ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
+
+ gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
+ gtk/WebCoreSupport/AssertMatchingEnums.cpp
+ gtk/WebCoreSupport/ChromeClientGtk.cpp
+ gtk/WebCoreSupport/ContextMenuClientGtk.cpp
+ gtk/WebCoreSupport/DeviceMotionClientGtk.cpp
+ gtk/WebCoreSupport/DeviceOrientationClientGtk.cpp
+ gtk/WebCoreSupport/DocumentLoaderGtk.cpp
+ gtk/WebCoreSupport/DragClientGtk.cpp
+ gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
+ gtk/WebCoreSupport/EditorClientGtk.cpp
+ gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+ gtk/WebCoreSupport/FrameNetworkingContextGtk.cpp
+ gtk/WebCoreSupport/GeolocationClientGtk.cpp
+ gtk/WebCoreSupport/GtkAdjustmentWatcher.cpp
+ gtk/WebCoreSupport/InspectorClientGtk.cpp
+ gtk/WebCoreSupport/NavigatorContentUtilsClientGtk.cpp
+ gtk/WebCoreSupport/PlatformStrategiesGtk.cpp
+ gtk/WebCoreSupport/TextCheckerClientGtk.cpp
+ gtk/WebCoreSupport/UserMediaClientGtk.cpp
+ gtk/WebCoreSupport/WebViewInputMethodFilter.cpp
+
+ gtk/webkit/webkitapplicationcache.cpp
+ gtk/webkit/webkitauthenticationdialog.cpp
+ gtk/webkit/webkitdownload.cpp
+ gtk/webkit/webkiterror.cpp
+ gtk/webkit/webkitfavicondatabase.cpp
+ gtk/webkit/webkitfilechooserrequest.cpp
+ gtk/webkit/webkitgeolocationpolicydecision.cpp
+ gtk/webkit/webkitglobals.cpp
+ gtk/webkit/webkithittestresult.cpp
+ gtk/webkit/webkiticondatabase.cpp
+ gtk/webkit/webkitnetworkrequest.cpp
+ gtk/webkit/webkitnetworkresponse.cpp
+ gtk/webkit/webkitsecurityorigin.cpp
+ gtk/webkit/webkitsoupauthdialog.cpp
+ gtk/webkit/webkitspellchecker.cpp
+ gtk/webkit/webkitspellcheckerenchant.cpp
+ gtk/webkit/webkitversion.cpp
+ gtk/webkit/webkitviewportattributes.cpp
+ gtk/webkit/webkitwebbackforwardlist.cpp
+ gtk/webkit/webkitwebdatabase.cpp
+ gtk/webkit/webkitwebdatasource.cpp
+ gtk/webkit/webkitwebframe.cpp
+ gtk/webkit/webkitwebhistoryitem.cpp
+ gtk/webkit/webkitwebinspector.cpp
+ gtk/webkit/webkitwebnavigationaction.cpp
+ gtk/webkit/webkitwebplugin.cpp
+ gtk/webkit/webkitwebplugindatabase.cpp
+ gtk/webkit/webkitwebpolicydecision.cpp
+ gtk/webkit/webkitwebresource.cpp
+ gtk/webkit/webkitwebsettings.cpp
+ gtk/webkit/webkitwebview.cpp
+ gtk/webkit/webkitwebwindowfeatures.cpp
+)
+
+list(APPEND WebKitGTK_INSTALLED_HEADERS
+ ${WEBKIT_DIR}/gtk/webkit/webkit.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitapplicationcache.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitauthenticationdialog.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitdefines.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitdom.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitdownload.h
+ ${WEBKIT_DIR}/gtk/webkit/webkiterror.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitfavicondatabase.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitfilechooserrequest.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitgeolocationpolicydecision.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitglobals.h
+ ${WEBKIT_DIR}/gtk/webkit/webkithittestresult.h
+ ${WEBKIT_DIR}/gtk/webkit/webkiticondatabase.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitnetworkrequest.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitnetworkresponse.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitsecurityorigin.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitsoupauthdialog.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitspellchecker.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitspellcheckerenchant.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitviewportattributes.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebbackforwardlist.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebdatabase.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebdatasource.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebframe.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebhistoryitem.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebinspector.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebnavigationaction.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebplugin.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebplugindatabase.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebpolicydecision.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebresource.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebsettings.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebview.h
+ ${WEBKIT_DIR}/gtk/webkit/webkitwebwindowfeatures.h
+)
+
+list(APPEND WebKit_LIBRARIES
+ GObjectDOMBindings
+ WebCorePlatformGTK
+)
+
+set(WebKit_MARSHAL_LIST ${WEBKIT_DIR}/gtk/webkitmarshal.list)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
+ ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.h
+ MAIN_DEPENDENCY ${WebKit_MARSHAL_LIST}
+
+ COMMAND echo extern \"C\" { > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
+ COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit_MARSHAL_LIST} --body >> ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
+ COMMAND echo } >> ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
+
+ COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit_MARSHAL_LIST} --header > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.h
+ VERBATIM
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.h
+ ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.cpp
+ DEPENDS ${WebKitGTK_INSTALLED_HEADERS}
+
+ COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.h.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.h
+
+ COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.cpp.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.cpp
+ VERBATIM
+)
Modified: trunk/Source/WebKit/gtk/ChangeLog (160803 => 160804)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-12-19 00:04:47 UTC (rev 160804)
@@ -1,3 +1,14 @@
+2013-12-16 Martin Robinson <[email protected]>
+
+ [GTK] [CMake] Add support for building WebKit1
+ https://bugs.webkit.org/show_bug.cgi?id=116377
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * GNUmakefile.am: Switch to using the templates for building the GObject enums.
+ * webkit/webkitenumtypes.cpp.template: Added.
+ * webkit/webkitenumtypes.h.template: Added.
+
2013-12-18 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.3.3 release.
Modified: trunk/Source/WebKit/gtk/GNUmakefile.am (160803 => 160804)
--- trunk/Source/WebKit/gtk/GNUmakefile.am 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/WebKit/gtk/GNUmakefile.am 2013-12-19 00:04:47 UTC (rev 160804)
@@ -362,18 +362,7 @@
$(GENSOURCES_WEBKIT)/webkitenumtypes.h: stamp-webkitenumtypes.h
@true
stamp-webkitenumtypes.h: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
- $(AM_V_GEN)glib-mkenums \
- --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
- --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
- --fhead "#include <glib-object.h>\n\n" \
- --fhead "#include <webkit/webkitdefines.h>\n\n" \
- --fhead "G_BEGIN_DECLS\n\n" \
- --ftail "G_END_DECLS\n\n" \
- --ftail "#endif\n" \
- --fprod "#include <webkit/@basename@>\n\n" \
- --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
- --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
- $(webkitgtk_h_api) | \
+ $(AM_V_GEN)glib-mkenums --template $(srcdir)/Source/WebKit/gtk/webkit/webkitenumtypes.h.template $(webkitgtk_h_api) | \
sed 's,web_kit,webkit,' | \
sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
> xgen-gth \
@@ -382,22 +371,7 @@
&& echo timestamp > $(@F)
$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
- $(AM_V_GEN)glib-mkenums \
- --fhead "#include <config.h>\n" \
- --fhead "#include <glib-object.h>\n" \
- --fhead "#include \"$(GENSOURCES_WEBKIT)/webkitenumtypes.h\"\n\n" \
- --fhead "extern \"C\" {\n\n" \
- --fprod "\n/* enumerations from \"@filename@\" */" \
- --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
- --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
- --vtail " { 0, NULL, NULL }\n};\n\n" \
- --vtail "GType @enum_name@_get_type(void)\n{\n" \
- --vtail " static GType type = 0;\n\n" \
- --vtail " if (!type)\n" \
- --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
- --vtail " return type;\n}\n\n" \
- --ftail "}\n" \
- $(webkitgtk_h_api) | \
+ $(AM_V_GEN)glib-mkenums --template $(srcdir)/Source/WebKit/gtk/webkit/webkitenumtypes.cpp.template $(webkitgtk_h_api) | \
sed 's,web_kit,webkit,' \
> xgen-gtc \
&& cp xgen-gtc $@ \
Added: trunk/Source/WebKit/gtk/webkit/webkitenumtypes.cpp.template (0 => 160804)
--- trunk/Source/WebKit/gtk/webkit/webkitenumtypes.cpp.template (rev 0)
+++ trunk/Source/WebKit/gtk/webkit/webkitenumtypes.cpp.template 2013-12-19 00:04:47 UTC (rev 160804)
@@ -0,0 +1,61 @@
+/*** BEGIN file-header ***/
+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <config.h>
+#include "webkitenumtypes.h"
+
+extern "C" {
+/*** END file-header ***/
+
+
+/*** BEGIN file-production ***/
+// Enumerations from @filename@.
+/*** END file-production ***/
+
+
+/*** BEGIN value-header ***/
+GType @enum_name@_get_type()
+{
+ static const G@Type@Value values[] = {
+/*** END value-header ***/
+
+
+/*** BEGIN value-production ***/
+ { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
+/*** END value-production ***/
+
+
+/*** BEGIN value-tail ***/
+ { 0, NULL, NULL }
+ };
+
+ static GType type = 0;
+ if (G_UNLIKELY(!type))
+ type = g_@type@_register_static("@EnumName@", values);
+
+ return type;
+}
+
+/*** END value-tail ***/
+
+
+/*** BEGIN file-tail ***/
+}
+/*** END file-tail ***/
Added: trunk/Source/WebKit/gtk/webkit/webkitenumtypes.h.template (0 => 160804)
--- trunk/Source/WebKit/gtk/webkit/webkitenumtypes.h.template (rev 0)
+++ trunk/Source/WebKit/gtk/webkit/webkitenumtypes.h.template 2013-12-19 00:04:47 UTC (rev 160804)
@@ -0,0 +1,53 @@
+/*** BEGIN file-header ***/
+/*
+ * Copyright (C) 2013 Igalia S.L.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef WEBKIT_ENUM_TYPES_H
+#define WEBKIT_ENUM_TYPES_H
+
+#include <glib-object.h>
+#include <webkit/webkitdefines.h>
+
+G_BEGIN_DECLS
+/*** END file-header ***/
+
+
+/*** BEGIN file-production ***/
+#include <webkit/@basename@>
+
+
+/* Enumerations from @filename@. */
+/*** END file-production ***/
+
+
+/*** BEGIN enumeration-production ***/
+#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type ()
+
+WEBKIT_API GType
+@enum_name@_get_type (void);
+
+/*** END enumeration-production ***/
+
+
+/*** BEGIN file-tail ***/
+G_END_DECLS
+
+#endif
+/*** END file-tail ***/
+
Modified: trunk/Source/cmake/OptionsGTK.cmake (160803 => 160804)
--- trunk/Source/cmake/OptionsGTK.cmake 2013-12-18 23:50:19 UTC (rev 160803)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-12-19 00:04:47 UTC (rev 160804)
@@ -12,7 +12,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_IMAGE_SET ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DRAG_SUPPORT ON)
@@ -21,7 +21,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR OFF)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEDIA_CAPTURE ON)
@@ -71,7 +71,7 @@
set(ENABLE_WEBCORE ON)
set(ENABLE_INSPECTOR ON)
set(ENABLE_PLUGIN_PROCESS ON)
-set(ENABLE_WEBKIT OFF)
+set(ENABLE_WEBKIT ON)
set(ENABLE_WEBKIT2 ON)
set(WTF_USE_ICU_UNICODE 1)
@@ -83,7 +83,6 @@
set(WebKit_OUTPUT_NAME webkitgtk-3.0)
set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
-set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
set(DATA_INSTALL_DIR "${DATADIR}/webkitgtk-3.0")
