Changeset 150018 in webkit

Timestamp:

May 13, 2013 8:45:52 AM (11 years ago)

Author:

Martin Robinson

Message:

[GTK] [WebKit2] Use a template file for generated GObject enum files
​https://bugs.webkit.org/show_bug.cgi?id=115867

Reviewed by Carlos Garcia Campos.

• GNUmakefile.am: Use a template file instead of specifying portions of the file on the command-line.
• UIProcess/API/gtk/WebKitEnumTypes.cpp.template: Added.
• UIProcess/API/gtk/WebKitEnumTypes.h.template: Added.
• UIProcess/API/gtk/WebKitFindController.cpp: We can no longer rely on WebKitEnumTypes.h to pull in WebKitWebView.h.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (3 diffs)
• UIProcess/API/gtk/WebKitEnumTypes.cpp.template (added)
• UIProcess/API/gtk/WebKitEnumTypes.h.template (added)
• UIProcess/API/gtk/WebKitFindController.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-13  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [WebKit2] Use a template file for generated GObject enum files
+        https://bugs.webkit.org/show_bug.cgi?id=115867
+
+        Reviewed by Carlos Garcia Campos.
+
+        * GNUmakefile.am: Use a template file instead of specifying portions of the file on the command-line.
+        * UIProcess/API/gtk/WebKitEnumTypes.cpp.template: Added.
+        * UIProcess/API/gtk/WebKitEnumTypes.h.template: Added.
+        * UIProcess/API/gtk/WebKitFindController.cpp: We can no longer rely on WebKitEnumTypes.h to pull in WebKitWebView.h.
+
 2013-05-13  Noam Rosenthal  <noam@webkit.org>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -386 +386 @@
 stamp-webkit2enumtypes: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
         $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
-        && glib-mkenums \
-                        --fhead "#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)\n" \
-                        --fhead "#error \"Only <webkit2/webkit2.h> can be included directly.\"\n" \
-                        --fhead "#endif\n\n" \
-                        --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
-                        --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
-                        --fhead "#include <glib-object.h>\n\n" \
-                        --fhead "#include <webkit2/WebKitDefines.h>\n\n" \
-                        --fhead "G_BEGIN_DECLS\n\n" \
-                        --ftail "G_END_DECLS\n\n" \
-                        --ftail "#endif\n" \
-                        --fprod "#include <webkit2/@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" \
-                $(libwebkit2gtkinclude_HEADERS) | \
+        && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template $(libwebkit2gtkinclude_HEADERS) | \
                 sed 's,web_kit,webkit,' | \
                 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
@@ -410 +396 @@
 $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am
         $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \
-        && glib-mkenums \
-                        --fhead "#include <config.h>\n" \
-                        --fhead "#include <glib-object.h>\n" \
-                        --fhead "#include \"$(webkit2gtk_built_headers_dir)/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" \
-                $(libwebkit2gtkinclude_HEADERS) | \
+        && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template $(libwebkit2gtkinclude_HEADERS) | \
                 sed 's,web_kit,webkit,' \
                 > wk2-xgen-gtc \
@@ -721 +692 @@
         $(WebKit2)/Scripts/webkit2/parser.py \
         $(WebKit2)/UIProcess/API/gtk/webkit2marshal.list \
+        $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template \
+        $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template \
         $(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \
         $(WebKit2)/Scripts/generate-forwarding-headers.pl \

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp

@@ -23 +23 @@
 #include "WebKitEnumTypes.h"
 #include "WebKitPrivate.h"
+#include "WebKitWebView.h"
 #include "WebKitWebViewBasePrivate.h"
 #include <glib/gi18n-lib.h>