Changeset 160545 in webkit

Timestamp:

Dec 13, 2013 7:41:09 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r155784): [GTK] Some methods incorrectly removed in r155784 and deprecated in r158662
​https://bugs.webkit.org/show_bug.cgi?id=125692

Reviewed by Martin Robinson.

In r155784 the build was fixed by skipping Console::profile() and
Console::profileEnd(), but the patch also skipped other methods
containing the profile method name. Those were incorrectly
deprecated in r158662 thinking that the property had been removed
in the idl.

• bindings/gobject/WebKitDOMDeprecated.cpp: Undeprecate

webkit_dom_html_head_element_get_profile and
webkit_dom_html_head_element_set_profile.

• bindings/gobject/WebKitDOMDeprecated.h: Ditto.
• bindings/gobject/WebKitDOMDeprecated.symbols: Ditto.
• bindings/scripts/CodeGeneratorGObject.pm:

(SkipFunction): Skip webkit_dom_console_profile and
webkit_dom_console_profile_end.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/gobject/WebKitDOMDeprecated.cpp (modified) (1 diff)
• bindings/gobject/WebKitDOMDeprecated.h (modified) (1 diff)
• bindings/gobject/WebKitDOMDeprecated.symbols (modified) (1 diff)
• bindings/scripts/CodeGeneratorGObject.pm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r155784): [GTK] Some methods incorrectly removed in r155784 and deprecated in r158662
+        https://bugs.webkit.org/show_bug.cgi?id=125692
+
+        Reviewed by Martin Robinson.
+
+        In r155784 the build was fixed by skipping Console::profile() and
+        Console::profileEnd(), but the patch also skipped other methods
+        containing the profile method name. Those were incorrectly
+        deprecated in r158662 thinking that the property had been removed
+        in the idl.
+
+        * bindings/gobject/WebKitDOMDeprecated.cpp: Undeprecate
+        webkit_dom_html_head_element_get_profile and
+        webkit_dom_html_head_element_set_profile.
+        * bindings/gobject/WebKitDOMDeprecated.h: Ditto.
+        * bindings/gobject/WebKitDOMDeprecated.symbols: Ditto.
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (SkipFunction): Skip webkit_dom_console_profile and
+        webkit_dom_console_profile_end.
+
 2013-12-13  Rob Buis  <rob.buis@samsung.com>
 

trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp

@@ -548 +548 @@
 }
 
-// WebKitDOMHTMLHeadElement
-
-gchar* webkit_dom_html_head_element_get_profile(WebKitDOMHTMLHeadElement* self)
-{
-    g_warning("%s: the HeadElement object has been removed from WebKit, this function does nothing.", __func__);
+// WebKitDOMProcessingInstruction
+
+gchar* webkit_dom_processing_instruction_get_data(WebKitDOMProcessingInstruction* self)
+{
+    g_warning("%s: this functionality has been removed from WebKit, this function does nothing.", __func__);
     return g_strdup("");
 }
 
-void webkit_dom_html_head_element_set_profile(WebKitDOMHTMLHeadElement* self, const gchar* value)
-{
-    g_warning("%s: the HeadElement object has been removed from WebKit, this function does nothing.", __func__);
-}
-
-// WebKitDOMProcessingInstruction
-
-gchar* webkit_dom_processing_instruction_get_data(WebKitDOMProcessingInstruction* self)
-{
-    g_warning("%s: this functionality has been removed from WebKit, this function does nothing.", __func__);
-    return g_strdup("");
-}
-
 void webkit_dom_processing_instruction_set_data(WebKitDOMProcessingInstruction* self, const gchar* value, GError** error)
 {

trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h

@@ -553 +553 @@
 
 /**
- * webkit_dom_html_head_element_get_profile:
- * @self: A #WebKitDOMHTMLHeadElement
- *
- * This functionality has been removed from WebKit, this function does nothing.
- *
- * Returns: a #gchar
- *
- * Deprecated: 2.4
- */
-WEBKIT_DEPRECATED gchar*
-webkit_dom_html_head_element_get_profile(WebKitDOMHTMLHeadElement* self);
-
-/**
- * webkit_dom_html_head_element_set_profile:
- * @self: A #WebKitDOMHTMLHeadElement
- * @value: A #gchar
- *
- * This functionality has been removed from WebKit, this function does nothing.
- *
- * Deprecated: 2.4
- */
-WEBKIT_DEPRECATED void
-webkit_dom_html_head_element_set_profile(WebKitDOMHTMLHeadElement* self, const gchar* value);
-
-/**
  * webkit_dom_processing_instruction_get_data:
  * @self: A #WebKitDOMProcessingInstruction

trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols

@@ -45 +45 @@
 gdouble webkit_dom_html_media_element_get_start_time(WebKitDOMHTMLMediaElement*)
 gdouble webkit_dom_html_media_element_get_initial_time(WebKitDOMHTMLMediaElement*)
-gchar* webkit_dom_html_head_element_get_profile(WebKitDOMHTMLHeadElement*)
-void webkit_dom_html_head_element_set_profile(WebKitDOMHTMLHeadElement*, const gchar*)
 gchar* webkit_dom_processing_instruction_get_data(WebKitDOMProcessingInstruction*)
 void webkit_dom_processing_instruction_set_data(WebKitDOMProcessingInstruction*, const gchar*, GError**)

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

@@ -305 +305 @@
     }
 
+    # Skip Console::profile() and Console::profileEnd() as they're not correctly generated for the moment.
+    if ($functionName eq "webkit_dom_console_profile" || $functionName eq "webkit_dom_console_profile_end") {
+        return 1;
+    }
+
     if ($function->signature->name eq "set" and $parentNode->extendedAttributes->{"TypedArray"}) {
         return 1;
@@ -325 +330 @@
     }
 
-    if ($function->signature->name eq "timeEnd" || $function->signature->name eq "profile" || $function->signature->name eq "profileEnd") {
+    if ($function->signature->name eq "timeEnd") {
         return 1;
     }