Changeset 167875 in webkit

Timestamp:

Apr 28, 2014 1:03:00 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] TextTrack::addCue can raise an exception since r163974
​https://bugs.webkit.org/show_bug.cgi?id=132227

Reviewed by Martin Robinson.

webkit_dom_text_track_add_cue() now receives a GError paramater
which is an API break. Add
webkit_dom_text_track_add_cue_with_error and keep
webkit_dom_text_track_add_cue as deprecated to keep API
compatibility.

• bindings/gobject/WebKitDOMDeprecated.cpp:

(webkit_dom_text_track_add_cue):

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

(GetEffectiveFunctionName):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] TextTrack::addCue can raise an exception since r163974
+        https://bugs.webkit.org/show_bug.cgi?id=132227
+
+        Reviewed by Martin Robinson.
+
+        webkit_dom_text_track_add_cue() now receives a GError paramater
+        which is an API break. Add
+        webkit_dom_text_track_add_cue_with_error and keep
+        webkit_dom_text_track_add_cue as deprecated to keep API
+        compatibility.
+
+        * bindings/gobject/WebKitDOMDeprecated.cpp:
+        (webkit_dom_text_track_add_cue):
+        * bindings/gobject/WebKitDOMDeprecated.h:
+        * bindings/gobject/WebKitDOMDeprecated.symbols:
+        * bindings/gobject/webkitdom.symbols:
+        * bindings/scripts/CodeGeneratorGObject.pm:
+        (GetEffectiveFunctionName):
+
 2014-04-28  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -30 +30 @@
 #include "WebKitDOMPrivate.h"
 #include "WebKitDOMProcessingInstruction.h"
+#include "WebKitDOMTextTrack.h"
 #include "WebKitDOMVTTCue.h"
 #include "WebKitDOMWebKitNamedFlow.h"
@@ -796 +797 @@
     webkit_dom_vtt_cue_set_text(WEBKIT_DOM_VTT_CUE(self), value);
 }
+
+// WebKitDOMTextTrack
+
+void webkit_dom_text_track_add_cue(WebKitDOMTextTrack* self, WebKitDOMTextTrackCue* cue)
+{
+    return webkit_dom_text_track_add_cue_with_error(self, cue, nullptr);
+}

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

@@ -1014 +1014 @@
 webkit_dom_text_track_cue_set_text(WebKitDOMTextTrackCue* self, const gchar* value);
 
+/**
+ * webkit_dom_text_track_add_cue:
+ * @self: A #WebKitDOMTextTrack
+ * @cue: A #WebKitDOMTextTrackCue
+ *
+ * Deprecated: 2.6: Use webkit_dom_text_track_add_cue_with_error() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_text_track_add_cue_with_error) void
+webkit_dom_text_track_add_cue(WebKitDOMTextTrack* self, WebKitDOMTextTrackCue* cue);
+
 G_END_DECLS
 

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

@@ -83 +83 @@
 gchar* webkit_dom_text_track_cue_get_text(WebKitDOMTextTrackCue*)
 void webkit_dom_text_track_cue_set_text(WebKitDOMTextTrackCue*, const gchar*)
+void webkit_dom_text_track_add_cue(WebKitDOMTextTrack*, WebKitDOMTextTrackCue*)

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

@@ -1705 +1705 @@
 gulong webkit_dom_html_video_element_get_webkit_dropped_frame_count(WebKitDOMHTMLVideoElement*)
 void webkit_dom_text_track_add_cue(WebKitDOMTextTrack*, WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_add_cue_with_error(WebKitDOMTextTrack*, WebKitDOMTextTrackCue*, GError**)
 void webkit_dom_text_track_remove_cue(WebKitDOMTextTrack*, WebKitDOMTextTrackCue*, GError**)
 gboolean webkit_dom_text_track_dispatch_event(WebKitDOMTextTrack*, WebKitDOMEvent*, GError**)

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

@@ -941 +941 @@
     if ($functionName eq "webkit_dom_html_input_element_get_capture") {
         return "webkit_dom_html_input_element_get_capture_enabled";
+    }
+
+    # webkit_dom_text_track_add_cue raises an exception since r163974. We need to add a with_error version to
+    # keep API backwards compatibility.
+    if ($functionName eq "webkit_dom_text_track_add_cue") {
+        return "webkit_dom_text_track_add_cue_with_error";
     }