Changeset 158907 in webkit

Timestamp:

Nov 8, 2013 12:09:23 AM (11 years ago)

Author:

Carlos Garcia Campos

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (3 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp (modified) (2 diffs)
• bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <beidson@apple.com>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm

@@ -959 +959 @@
     push(@symbols, "$returnType $functionName($symbolSig)\n");
 
+    if ($deprecationVersion) {
+        push(@hBody, "#if !defined(WEBKIT_DISABLE_DEPRECATED)\n");
+    }
+
     # Insert introspection annotations
     push(@hBody, "/**\n");
@@ -1002 +1006 @@
     }
     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;
@@ -1219 +1229 @@
     }
 
-    push(@cBody, "}\n\n");
+    push(@cBody, "}\n");
+
+    if ($deprecationVersion) {
+        push(@cBody, "#endif // WEBKIT_DISABLE_DEPRECATED\n");
+    }
+
+    push(@cBody, "\n");
 }
 

trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp

@@ -148 +148 @@
 }
 
+#if !defined(WEBKIT_DISABLE_DEPRECATED)
 gboolean webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error)
 {
@@ -164 +165 @@
     return result;
 }
+#endif // WEBKIT_DISABLE_DEPRECATED
 

trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h

@@ -60 +60 @@
 webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index);
 
+#if !defined(WEBKIT_DISABLE_DEPRECATED)
 /**
  * webkit_dom_test_event_target_dispatch_event:
@@ -72 +73 @@
 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