Title: [158907] trunk/Source/WebCore
- Revision
- 158907
- Author
- [email protected]
- Date
- 2013-11-08 00:09:23 -0800 (Fri, 08 Nov 2013)
Log Message
[GTK] Use deprecation guards around deprecated API in GObject DOM bindings
https://bugs.webkit.org/show_bug.cgi?id=123899
Reviewed by Martin Robinson.
Do not include deprecated API when compiling with
WEBKIT_DISABLE_DEPRECATED option.
* bindings/scripts/CodeGeneratorGObject.pm:
(GenerateFunction):
* bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
* bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158906 => 158907)
--- trunk/Source/WebCore/ChangeLog 2013-11-08 06:08:41 UTC (rev 158906)
+++ trunk/Source/WebCore/ChangeLog 2013-11-08 08:09:23 UTC (rev 158907)
@@ -1,3 +1,18 @@
+2013-11-07 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Use deprecation guards around deprecated API in GObject DOM bindings
+ https://bugs.webkit.org/show_bug.cgi?id=123899
+
+ Reviewed by Martin Robinson.
+
+ Do not include deprecated API when compiling with
+ WEBKIT_DISABLE_DEPRECATED option.
+
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (GenerateFunction):
+ * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp:
+ * bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h:
+
2013-11-07 Brady Eidson <[email protected]>
Enhance SQL journal_mode setting code to be less likely to log an error.
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (158906 => 158907)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-11-08 06:08:41 UTC (rev 158906)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-11-08 08:09:23 UTC (rev 158907)
@@ -958,6 +958,10 @@
push(@symbols, "$returnType $functionName($symbolSig)\n");
+ if ($deprecationVersion) {
+ push(@hBody, "#if !defined(WEBKIT_DISABLE_DEPRECATED)\n");
+ }
+
# Insert introspection annotations
push(@hBody, "/**\n");
push(@hBody, " * ${functionName}:\n");
@@ -1001,8 +1005,14 @@
push(@hBody, "WEBKIT_API ");
}
push(@hBody, "$returnType\n$functionName($functionSig);\n");
+ if ($deprecationVersion) {
+ push(@hBody, "#endif /* WEBKIT_DISABLE_DEPRECATED */\n");
+ }
push(@hBody, "\n");
+ if ($deprecationVersion) {
+ push(@cBody, "#if !defined(WEBKIT_DISABLE_DEPRECATED)\n");
+ }
push(@cBody, "$returnType $functionName($functionSig)\n{\n");
push(@cBody, "#if ${parentConditionalString}\n") if $parentConditionalString;
push(@cBody, "#if ${conditionalString}\n") if $conditionalString;
@@ -1218,7 +1228,13 @@
push(@cBody, "#endif /* ${parentConditionalString} */\n");
}
- push(@cBody, "}\n\n");
+ push(@cBody, "}\n");
+
+ if ($deprecationVersion) {
+ push(@cBody, "#endif // WEBKIT_DISABLE_DEPRECATED\n");
+ }
+
+ push(@cBody, "\n");
}
sub ClassHasFunction {
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp (158906 => 158907)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp 2013-11-08 06:08:41 UTC (rev 158906)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp 2013-11-08 08:09:23 UTC (rev 158907)
@@ -147,6 +147,7 @@
return WebKit::kit(gobjectResult.get());
}
+#if !defined(WEBKIT_DISABLE_DEPRECATED)
gboolean webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error)
{
WebCore::JSMainThreadNullState state;
@@ -163,4 +164,5 @@
}
return result;
}
+#endif // WEBKIT_DISABLE_DEPRECATED
Modified: trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h (158906 => 158907)
--- trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h 2013-11-08 06:08:41 UTC (rev 158906)
+++ trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h 2013-11-08 08:09:23 UTC (rev 158907)
@@ -59,6 +59,7 @@
WEBKIT_API WebKitDOMNode*
webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index);
+#if !defined(WEBKIT_DISABLE_DEPRECATED)
/**
* webkit_dom_test_event_target_dispatch_event:
* @self: A #WebKitDOMTestEventTarget
@@ -71,6 +72,7 @@
**/
WEBKIT_DEPRECATED_FOR(webkit_dom_event_target_dispatch_event) gboolean
webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error);
+#endif /* WEBKIT_DISABLE_DEPRECATED */
G_END_DECLS
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
