Commit cb5d2466 authored by carlosgc@webkit.org's avatar carlosgc@webkit.org

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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160545 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3493ab27
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>
Clean up SVGScriptElement
......@@ -547,19 +547,6 @@ gdouble webkit_dom_html_media_element_get_initial_time(WebKitDOMHTMLMediaElement
return 0;
}
// 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__);
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)
......
......@@ -551,31 +551,6 @@ webkit_dom_html_media_element_get_start_time(WebKitDOMHTMLMediaElement* self);
WEBKIT_DEPRECATED gdouble
webkit_dom_html_media_element_get_initial_time(WebKitDOMHTMLMediaElement* self);
/**
* 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
......
......@@ -44,7 +44,5 @@ WebKitDOMNode* webkit_dom_property_node_list_item(void*, gulong)
gulong webkit_dom_property_node_list_get_length(void*)
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**)
......@@ -304,6 +304,11 @@ sub SkipFunction {
return 1;
}
# 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;
}
......@@ -324,7 +329,7 @@ sub SkipFunction {
return 1;
}
if ($function->signature->name eq "timeEnd" || $function->signature->name eq "profile" || $function->signature->name eq "profileEnd") {
if ($function->signature->name eq "timeEnd") {
return 1;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment