Diff
Modified: trunk/Source/WebCore/ChangeLog (160288 => 160289)
--- trunk/Source/WebCore/ChangeLog 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/ChangeLog 2013-12-08 18:22:29 UTC (rev 160289)
@@ -1,5 +1,31 @@
2013-12-08 Carlos Garcia Campos <[email protected]>
+ [GTK] Do not skip attributes with only custom setter
+ https://bugs.webkit.org/show_bug.cgi?id=125417
+
+ Reviewed by Gustavo Noronha Silva.
+
+ For attributes with a custom setter, we now generate the code as a
+ read-only attribute with a getter method, unless it also has a
+ custom getter in which case the attribute is skipped.
+
+ * bindings/gobject/GNUmakefile.am: Generate WebKitDOMMediaController
+ that is now required by an attribute having a custom setter.
+ * bindings/gobject/WebKitDOMCustom.cpp: Remove methods that are now generated.
+ * bindings/gobject/WebKitDOMCustom.h: Ditto.
+ * bindings/gobject/WebKitDOMCustom.symbols: Ditto.
+ * bindings/gobject/webkitdom.symbols: Add new symbols.
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (SkipAttribute): Do not skip attributes having a custom setter.
+ (GetWriteableProperties): Do not include attributes having a
+ custom setter.
+ (GenerateProperty): Do not return early for attributes having
+ custom setter.
+ (GenerateFunctions): Do not generate setter for attributes having
+ a custom setter.
+
+2013-12-08 Carlos Garcia Campos <[email protected]>
+
[GTK] Do not generate new dispatch_event methods marked as deprecated
https://bugs.webkit.org/show_bug.cgi?id=125416
Modified: trunk/Source/WebCore/bindings/gobject/GNUmakefile.am (160288 => 160289)
--- trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/bindings/gobject/GNUmakefile.am 2013-12-08 18:22:29 UTC (rev 160289)
@@ -207,6 +207,8 @@
DerivedSources/webkitdom/WebKitDOMKeyboardEventPrivate.h \
DerivedSources/webkitdom/WebKitDOMLocation.cpp \
DerivedSources/webkitdom/WebKitDOMLocationPrivate.h \
+ DerivedSources/webkitdom/WebKitDOMMediaController.cpp \
+ DerivedSources/webkitdom/WebKitDOMMediaControllerPrivate.h \
DerivedSources/webkitdom/WebKitDOMMediaError.cpp \
DerivedSources/webkitdom/WebKitDOMMediaErrorPrivate.h \
DerivedSources/webkitdom/WebKitDOMMediaList.cpp \
@@ -287,6 +289,7 @@
DerivedSources/webkitdom/WebKitDOMCSSStyleDeclaration.h \
DerivedSources/webkitdom/WebKitDOMCSSStyleSheet.h \
DerivedSources/webkitdom/WebKitDOMCSSValue.h \
+ DerivedSources/webkitdom/WebKitDOMMediaController.h \
DerivedSources/webkitdom/WebKitDOMMediaList.h \
DerivedSources/webkitdom/WebKitDOMMediaQueryList.h \
DerivedSources/webkitdom/WebKitDOMStyleMedia.h \
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp (160288 => 160289)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2013-12-08 18:22:29 UTC (rev 160289)
@@ -20,15 +20,12 @@
#include "WebKitDOMCustom.h"
#include "JSMainThreadExecState.h"
-#include "WebKitDOMAudioTrackPrivate.h"
#include "WebKitDOMHTMLInputElement.h"
#include "WebKitDOMHTMLInputElementPrivate.h"
#include "WebKitDOMHTMLMediaElementPrivate.h"
#include "WebKitDOMHTMLTextAreaElement.h"
#include "WebKitDOMHTMLTextAreaElementPrivate.h"
#include "WebKitDOMPrivate.h"
-#include "WebKitDOMTextTrackPrivate.h"
-#include "WebKitDOMVideoTrackPrivate.h"
#include "gobject/ConvertToUTF8String.h"
using namespace WebKit;
@@ -59,87 +56,4 @@
#endif /* ENABLE(VIDEO) */
}
-gchar* webkit_dom_audio_track_get_kind(WebKitDOMAudioTrack* self)
-{
-#if ENABLE(VIDEO_TRACK)
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_AUDIO_TRACK(self), 0);
- WebCore::AudioTrack* item = WebKit::core(self);
- gchar* result = convertToUTF8String(item->kind());
- return result;
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
- return 0;
-#endif /* ENABLE(VIDEO_TRACK) */
-}
-gchar* webkit_dom_audio_track_get_language(WebKitDOMAudioTrack* self)
-{
-#if ENABLE(VIDEO_TRACK)
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_AUDIO_TRACK(self), 0);
- WebCore::AudioTrack* item = WebKit::core(self);
- gchar* result = convertToUTF8String(item->language());
- return result;
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
- return 0;
-#endif /* ENABLE(VIDEO_TRACK) */
-}
-
-gchar* webkit_dom_text_track_get_kind(WebKitDOMTextTrack* self)
-{
-#if ENABLE(VIDEO_TRACK)
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_TEXT_TRACK(self), 0);
- WebCore::TextTrack* item = WebKit::core(self);
- gchar* result = convertToUTF8String(item->kind());
- return result;
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
- return 0;
-#endif /* ENABLE(VIDEO_TRACK) */
-}
-
-gchar* webkit_dom_text_track_get_language(WebKitDOMTextTrack* self)
-{
-#if ENABLE(VIDEO_TRACK)
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_TEXT_TRACK(self), 0);
- WebCore::TextTrack* item = WebKit::core(self);
- gchar* result = convertToUTF8String(item->language());
- return result;
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
- return 0;
-#endif /* ENABLE(VIDEO_TRACK) */
-}
-
-gchar* webkit_dom_video_track_get_kind(WebKitDOMVideoTrack* self)
-{
-#if ENABLE(VIDEO_TRACK)
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_VIDEO_TRACK(self), 0);
- WebCore::VideoTrack* item = WebKit::core(self);
- gchar* result = convertToUTF8String(item->kind());
- return result;
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
- return 0;
-#endif /* ENABLE(VIDEO_TRACK) */
-}
-
-gchar* webkit_dom_video_track_get_language(WebKitDOMVideoTrack* self)
-{
-#if ENABLE(VIDEO_TRACK)
- WebCore::JSMainThreadNullState state;
- g_return_val_if_fail(WEBKIT_DOM_IS_VIDEO_TRACK(self), 0);
- WebCore::VideoTrack* item = WebKit::core(self);
- gchar* result = convertToUTF8String(item->language());
- return result;
-#else
- WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
- return 0;
-#endif /* ENABLE(VIDEO_TRACK) */
-}
-
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h (160288 => 160289)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h 2013-12-08 18:22:29 UTC (rev 160289)
@@ -50,54 +50,6 @@
*/
WEBKIT_API gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement* input);
-/**
- * webkit_dom_audio_track_get_kind:
- * @self: A #WebKitDOMAudioTrack
- *
- * Returns: A #gchar
- */
-WEBKIT_API gchar* webkit_dom_audio_track_get_kind(WebKitDOMAudioTrack* self);
-
-/**
- * webkit_dom_audio_track_get_language:
- * @self: A #WebKitDOMAudioTrack
- *
- * Returns: A #gchar
- */
-WEBKIT_API gchar* webkit_dom_audio_track_get_language(WebKitDOMAudioTrack* self);
-
-/**
- * webkit_dom_text_track_get_kind:
- * @self: A #WebKitDOMTextTrack
- *
- * Returns: A #gchar
- */
-WEBKIT_API gchar* webkit_dom_text_track_get_kind(WebKitDOMTextTrack* self);
-
-/**
- * webkit_dom_text_track_get_language:
- * @self: A #WebKitDOMTextTrack
- *
- * Returns: A #gchar
- */
-WEBKIT_API gchar* webkit_dom_text_track_get_language(WebKitDOMTextTrack* self);
-
-/**
- * webkit_dom_video_track_get_kind:
- * @self: A #WebKitDOMVideoTrack
- *
- * Returns: A #gchar
- */
-WEBKIT_API gchar* webkit_dom_video_track_get_kind(WebKitDOMVideoTrack* self);
-
-/**
- * webkit_dom_video_track_get_language:
- * @self: A #WebKitDOMVideoTrack
- *
- * Returns: A #gchar
- */
-WEBKIT_API gchar* webkit_dom_video_track_get_language(WebKitDOMVideoTrack* self);
-
G_END_DECLS
#endif
Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols (160288 => 160289)
--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols 2013-12-08 18:22:29 UTC (rev 160289)
@@ -1,9 +1,3 @@
gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElement*)
gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*)
void webkit_dom_html_media_element_set_current_time(WebKitDOMHTMLMediaElement*, gdouble, GError**)
-gchar* webkit_dom_audio_track_get_kind(WebKitDOMAudioTrack*)
-gchar* webkit_dom_audio_track_get_language(WebKitDOMAudioTrack*)
-gchar* webkit_dom_text_track_get_kind(WebKitDOMTextTrack*)
-gchar* webkit_dom_text_track_get_language(WebKitDOMTextTrack*)
-gchar* webkit_dom_video_track_get_kind(WebKitDOMVideoTrack*)
-gchar* webkit_dom_video_track_get_language(WebKitDOMVideoTrack*)
Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (160288 => 160289)
--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2013-12-08 18:22:29 UTC (rev 160289)
@@ -30,6 +30,25 @@
gchar* webkit_dom_css_value_get_css_text(WebKitDOMCSSValue*)
void webkit_dom_css_value_set_css_text(WebKitDOMCSSValue*, const gchar*, GError**)
gushort webkit_dom_css_value_get_css_value_type(WebKitDOMCSSValue*)
+void webkit_dom_media_controller_play(WebKitDOMMediaController*)
+void webkit_dom_media_controller_pause(WebKitDOMMediaController*)
+void webkit_dom_media_controller_unpause(WebKitDOMMediaController*)
+WebKitDOMTimeRanges* webkit_dom_media_controller_get_buffered(WebKitDOMMediaController*)
+WebKitDOMTimeRanges* webkit_dom_media_controller_get_seekable(WebKitDOMMediaController*)
+gdouble webkit_dom_media_controller_get_duration(WebKitDOMMediaController*)
+gdouble webkit_dom_media_controller_get_current_time(WebKitDOMMediaController*)
+void webkit_dom_media_controller_set_current_time(WebKitDOMMediaController*, gdouble)
+gboolean webkit_dom_media_controller_get_paused(WebKitDOMMediaController*)
+WebKitDOMTimeRanges* webkit_dom_media_controller_get_played(WebKitDOMMediaController*)
+gchar* webkit_dom_media_controller_get_playback_state(WebKitDOMMediaController*)
+gdouble webkit_dom_media_controller_get_default_playback_rate(WebKitDOMMediaController*)
+void webkit_dom_media_controller_set_default_playback_rate(WebKitDOMMediaController*, gdouble)
+gdouble webkit_dom_media_controller_get_playback_rate(WebKitDOMMediaController*)
+void webkit_dom_media_controller_set_playback_rate(WebKitDOMMediaController*, gdouble)
+gdouble webkit_dom_media_controller_get_volume(WebKitDOMMediaController*)
+void webkit_dom_media_controller_set_volume(WebKitDOMMediaController*, gdouble, GError**)
+gboolean webkit_dom_media_controller_get_muted(WebKitDOMMediaController*)
+void webkit_dom_media_controller_set_muted(WebKitDOMMediaController*, gboolean)
gchar* webkit_dom_media_list_item(WebKitDOMMediaList*, gulong)
void webkit_dom_media_list_delete_medium(WebKitDOMMediaList*, const gchar*, GError**)
void webkit_dom_media_list_append_medium(WebKitDOMMediaList*, const gchar*, GError**)
@@ -991,6 +1010,7 @@
WebKitDOMVideoTrackList* webkit_dom_html_media_element_get_video_tracks(WebKitDOMHTMLMediaElement*)
gchar* webkit_dom_html_media_element_get_media_group(WebKitDOMHTMLMediaElement*)
void webkit_dom_html_media_element_set_media_group(WebKitDOMHTMLMediaElement*, const gchar*)
+WebKitDOMMediaController* webkit_dom_html_media_element_get_controller(WebKitDOMHTMLMediaElement*)
gboolean webkit_dom_html_menu_element_get_compact(WebKitDOMHTMLMenuElement*)
void webkit_dom_html_menu_element_set_compact(WebKitDOMHTMLMenuElement*, gboolean)
gchar* webkit_dom_html_meta_element_get_content(WebKitDOMHTMLMetaElement*)
@@ -1068,6 +1088,7 @@
WebKitDOMNode* webkit_dom_html_options_collection_named_item(WebKitDOMHTMLOptionsCollection*, const gchar*)
glong webkit_dom_html_options_collection_get_selected_index(WebKitDOMHTMLOptionsCollection*)
void webkit_dom_html_options_collection_set_selected_index(WebKitDOMHTMLOptionsCollection*, glong)
+gulong webkit_dom_html_options_collection_get_length(WebKitDOMHTMLOptionsCollection*)
gchar* webkit_dom_html_paragraph_element_get_align(WebKitDOMHTMLParagraphElement*)
void webkit_dom_html_paragraph_element_set_align(WebKitDOMHTMLParagraphElement*, const gchar*)
gchar* webkit_dom_html_param_element_get_name(WebKitDOMHTMLParamElement*)
@@ -1312,12 +1333,6 @@
gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElement*)
gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*)
void webkit_dom_html_media_element_set_current_time(WebKitDOMHTMLMediaElement*, gdouble, GError**)
-gchar* webkit_dom_audio_track_get_kind(WebKitDOMAudioTrack*)
-gchar* webkit_dom_audio_track_get_language(WebKitDOMAudioTrack*)
-gchar* webkit_dom_text_track_get_kind(WebKitDOMTextTrack*)
-gchar* webkit_dom_text_track_get_language(WebKitDOMTextTrack*)
-gchar* webkit_dom_video_track_get_kind(WebKitDOMVideoTrack*)
-gchar* webkit_dom_video_track_get_language(WebKitDOMVideoTrack*)
WebKitDOMBlob* webkit_dom_blob_webkit_slice(WebKitDOMBlob*, gint64, gint64, const gchar*)
gchar* webkit_dom_html_element_get_id(WebKitDOMHTMLElement*)
void webkit_dom_html_element_set_id(WebKitDOMHTMLElement*, const gchar*)
@@ -1482,6 +1497,14 @@
void webkit_dom_history_forward(WebKitDOMHistory*)
void webkit_dom_history_go(WebKitDOMHistory*, glong)
gulong webkit_dom_history_get_length(WebKitDOMHistory*)
+gchar* webkit_dom_location_get_href(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_protocol(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_host(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_hostname(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_port(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_pathname(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_search(WebKitDOMLocation*)
+gchar* webkit_dom_location_get_hash(WebKitDOMLocation*)
gchar* webkit_dom_location_get_origin(WebKitDOMLocation*)
WebKitDOMDOMStringList* webkit_dom_location_get_ancestor_origins(WebKitDOMLocation*)
GType webkit_dom_object_get_type(void)
@@ -1625,7 +1648,9 @@
glong webkit_dom_wheel_event_get_wheel_delta(WebKitDOMWheelEvent*)
gboolean webkit_dom_wheel_event_get_webkit_direction_inverted_from_device(WebKitDOMWheelEvent*)
gchar* webkit_dom_audio_track_get_id(WebKitDOMAudioTrack*)
+gchar* webkit_dom_audio_track_get_kind(WebKitDOMAudioTrack*)
gchar* webkit_dom_audio_track_get_label(WebKitDOMAudioTrack*)
+gchar* webkit_dom_audio_track_get_language(WebKitDOMAudioTrack*)
gboolean webkit_dom_audio_track_get_enabled(WebKitDOMAudioTrack*)
void webkit_dom_audio_track_set_enabled(WebKitDOMAudioTrack*, gboolean)
WebKitDOMAudioTrack* webkit_dom_audio_track_list_item(WebKitDOMAudioTrackList*, gulong)
@@ -1652,7 +1677,9 @@
void webkit_dom_text_track_remove_cue(WebKitDOMTextTrack*, WebKitDOMTextTrackCue*, GError**)
gboolean webkit_dom_text_track_dispatch_event(WebKitDOMTextTrack*, WebKitDOMEvent*, GError**)
gchar* webkit_dom_text_track_get_id(WebKitDOMTextTrack*)
+gchar* webkit_dom_text_track_get_kind(WebKitDOMTextTrack*)
gchar* webkit_dom_text_track_get_label(WebKitDOMTextTrack*)
+gchar* webkit_dom_text_track_get_language(WebKitDOMTextTrack*)
gchar* webkit_dom_text_track_get_mode(WebKitDOMTextTrack*)
void webkit_dom_text_track_set_mode(WebKitDOMTextTrack*, const gchar*)
WebKitDOMTextTrackCueList* webkit_dom_text_track_get_cues(WebKitDOMTextTrack*)
@@ -1690,7 +1717,9 @@
WebKitDOMTextTrackCue* webkit_dom_text_track_cue_list_get_cue_by_id(WebKitDOMTextTrackCueList*, const gchar*)
gulong webkit_dom_text_track_cue_list_get_length(WebKitDOMTextTrackCueList*)
gchar* webkit_dom_video_track_get_id(WebKitDOMVideoTrack*)
+gchar* webkit_dom_video_track_get_kind(WebKitDOMVideoTrack*)
gchar* webkit_dom_video_track_get_label(WebKitDOMVideoTrack*)
+gchar* webkit_dom_video_track_get_language(WebKitDOMVideoTrack*)
gboolean webkit_dom_video_track_get_selected(WebKitDOMVideoTrack*)
void webkit_dom_video_track_set_selected(WebKitDOMVideoTrack*, gboolean)
WebKitDOMVideoTrack* webkit_dom_video_track_list_item(WebKitDOMVideoTrackList*, gulong)
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (160288 => 160289)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-12-08 18:16:04 UTC (rev 160288)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2013-12-08 18:22:29 UTC (rev 160289)
@@ -188,8 +188,7 @@
my $attribute = shift;
if ($attribute->signature->extendedAttributes->{"Custom"}
- || $attribute->signature->extendedAttributes->{"CustomGetter"}
- || $attribute->signature->extendedAttributes->{"CustomSetter"}) {
+ || $attribute->signature->extendedAttributes->{"CustomGetter"}) {
return 1;
}
@@ -430,7 +429,8 @@
# FIXME: We are not generating setters for 'Replaceable'
# attributes now, but we should somehow.
my $replaceable = $property->signature->extendedAttributes->{"Replaceable"};
- if (!$property->isReadOnly && $hasGtypeSignature && !$replaceable) {
+ my $custom = $property->signature->extendedAttributes->{"CustomSetter"};
+ if (!$property->isReadOnly && $hasGtypeSignature && !$replaceable && !$custom) {
push(@result, $property);
}
}
@@ -500,12 +500,10 @@
my $writeable = !$attribute->isReadOnly;
my $mutableString = "read-only";
- my $custom = $attribute->signature->extendedAttributes->{"Custom"};
- if ($writeable && $custom) {
+ my $hasCustomSetter = $attribute->signature->extendedAttributes->{"CustomSetter"};
+ if ($writeable && $hasCustomSetter) {
$mutableStringconst = "read-only (due to custom functions needed in webkitdom)";
- return;
- }
- if ($writeable && !$custom) {
+ } elsif ($writeable) {
$gparamflag = "WEBKIT_PARAM_READWRITE";
$mutableStringconst = "read-write";
}
@@ -1303,7 +1301,8 @@
# FIXME: We are not generating setters for 'Replaceable'
# attributes now, but we should somehow.
- if ($attribute->isReadOnly || $attribute->signature->extendedAttributes->{"Replaceable"}) {
+ my $custom = $attribute->signature->extendedAttributes->{"CustomSetter"};
+ if ($attribute->isReadOnly || $attribute->signature->extendedAttributes->{"Replaceable"} || $custom) {
next TOP;
}
