Changeset 150018 in webkit
- Timestamp:
- May 13, 2013 8:45:52 AM (11 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r150015 r150018 1 2013-05-13 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK] [WebKit2] Use a template file for generated GObject enum files 4 https://bugs.webkit.org/show_bug.cgi?id=115867 5 6 Reviewed by Carlos Garcia Campos. 7 8 * GNUmakefile.am: Use a template file instead of specifying portions of the file on the command-line. 9 * UIProcess/API/gtk/WebKitEnumTypes.cpp.template: Added. 10 * UIProcess/API/gtk/WebKitEnumTypes.h.template: Added. 11 * UIProcess/API/gtk/WebKitFindController.cpp: We can no longer rely on WebKitEnumTypes.h to pull in WebKitWebView.h. 12 1 13 2013-05-13 Noam Rosenthal <noam@webkit.org> 2 14 -
trunk/Source/WebKit2/GNUmakefile.am
r150008 r150018 386 386 stamp-webkit2enumtypes: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am 387 387 $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \ 388 && glib-mkenums \ 389 --fhead "#if !defined(__WEBKIT2_H_INSIDE__) && !defined(WEBKIT2_COMPILATION)\n" \ 390 --fhead "#error \"Only <webkit2/webkit2.h> can be included directly.\"\n" \ 391 --fhead "#endif\n\n" \ 392 --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ 393 --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \ 394 --fhead "#include <glib-object.h>\n\n" \ 395 --fhead "#include <webkit2/WebKitDefines.h>\n\n" \ 396 --fhead "G_BEGIN_DECLS\n\n" \ 397 --ftail "G_END_DECLS\n\n" \ 398 --ftail "#endif\n" \ 399 --fprod "#include <webkit2/@basename@>\n\n" \ 400 --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ 401 --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \ 402 $(libwebkit2gtkinclude_HEADERS) | \ 388 && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template $(libwebkit2gtkinclude_HEADERS) | \ 403 389 sed 's,web_kit,webkit,' | \ 404 390 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ … … 410 396 $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2/WebKitEnumTypes.cpp: $(libwebkit2gtkinclude_HEADERS) $(WebKit2)/GNUmakefile.am 411 397 $(AM_V_GEN)mkdir -p $(GENSOURCES_WEBKIT2)/webkit2gtk/webkit2 \ 412 && glib-mkenums \ 413 --fhead "#include <config.h>\n" \ 414 --fhead "#include <glib-object.h>\n" \ 415 --fhead "#include \"$(webkit2gtk_built_headers_dir)/WebKitEnumTypes.h\"\n\n" \ 416 --fhead "extern \"C\" {\n\n" \ 417 --fprod "\n/* Enumerations from \"@filename@\". */" \ 418 --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ 419 --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ 420 --vtail " { 0, NULL, NULL }\n};\n\n" \ 421 --vtail "GType @enum_name@_get_type(void)\n{\n" \ 422 --vtail " static GType type = 0;\n\n" \ 423 --vtail " if (!type)\n" \ 424 --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ 425 --vtail " return type;\n}\n\n" \ 426 --ftail "}\n" \ 427 $(libwebkit2gtkinclude_HEADERS) | \ 398 && glib-mkenums --template $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template $(libwebkit2gtkinclude_HEADERS) | \ 428 399 sed 's,web_kit,webkit,' \ 429 400 > wk2-xgen-gtc \ … … 721 692 $(WebKit2)/Scripts/webkit2/parser.py \ 722 693 $(WebKit2)/UIProcess/API/gtk/webkit2marshal.list \ 694 $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.h.template \ 695 $(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template \ 723 696 $(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \ 724 697 $(WebKit2)/Scripts/generate-forwarding-headers.pl \ -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFindController.cpp
r137469 r150018 23 23 #include "WebKitEnumTypes.h" 24 24 #include "WebKitPrivate.h" 25 #include "WebKitWebView.h" 25 26 #include "WebKitWebViewBasePrivate.h" 26 27 #include <glib/gi18n-lib.h>
Note: See TracChangeset
for help on using the changeset viewer.