<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167874] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167874">167874</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-28 00:57:18 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] TextTrackCue API changed in <a href="http://trac.webkit.org/projects/webkit/changeset/163649">r163649</a>
https://bugs.webkit.org/show_bug.cgi?id=132226
Reviewed by Martin Robinson.
TextTrackCue is now a base class and part of its API was moved to
the derived class VTTCue. Update the GObject DOM bindings to keep
backwards compatibility.
* PlatformGTK.cmake: Generate bindings for DataCue and VTTCue.
* bindings/gobject/WebKitDOMDeprecated.cpp:
(webkit_dom_text_track_cue_get_cue_as_html): Mark as deprecated in
favor of VTTCue API.
(webkit_dom_text_track_cue_get_vertical): Ditto.
(webkit_dom_text_track_cue_set_vertical): Ditto.
(webkit_dom_text_track_cue_get_snap_to_lines): Ditto.
(webkit_dom_text_track_cue_set_snap_to_lines): Ditto.
(webkit_dom_text_track_cue_get_line): Ditto.
(webkit_dom_text_track_cue_set_line): Ditto.
(webkit_dom_text_track_cue_get_position): Ditto.
(webkit_dom_text_track_cue_set_position): Ditto.
(webkit_dom_text_track_cue_get_size): Ditto.
(webkit_dom_text_track_cue_set_size): Ditto.
(webkit_dom_text_track_cue_get_align): Ditto.
(webkit_dom_text_track_cue_set_align): Ditto.
(webkit_dom_text_track_cue_get_text): Ditto.
(webkit_dom_text_track_cue_set_text): Ditto.
* bindings/gobject/WebKitDOMDeprecated.h:
* bindings/gobject/WebKitDOMDeprecated.symbols: Add new deprecated symbols.
* bindings/gobject/WebKitDOMPrivate.cpp:
(WebKit::wrap): Add generic wrap for TextTrackCue now that it's a
base class to generate DataCue or VTTCue objects.
* bindings/gobject/WebKitDOMPrivate.h:
* bindings/gobject/webkitdom.symbols: Add DataCue symbols.
* bindings/scripts/CodeGeneratorGObject.pm:
(IsPolymorphic): Add TextTrackCue to the list of polymorphic classes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedcpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedh">trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedsymbols">trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMPrivateh">trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectwebkitdomsymbols">trunk/Source/WebCore/bindings/gobject/webkitdom.symbols</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-04-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] TextTrackCue API changed in r163649
+ https://bugs.webkit.org/show_bug.cgi?id=132226
+
+ Reviewed by Martin Robinson.
+
+ TextTrackCue is now a base class and part of its API was moved to
+ the derived class VTTCue. Update the GObject DOM bindings to keep
+ backwards compatibility.
+
+ * PlatformGTK.cmake: Generate bindings for DataCue and VTTCue.
+ * bindings/gobject/WebKitDOMDeprecated.cpp:
+ (webkit_dom_text_track_cue_get_cue_as_html): Mark as deprecated in
+ favor of VTTCue API.
+ (webkit_dom_text_track_cue_get_vertical): Ditto.
+ (webkit_dom_text_track_cue_set_vertical): Ditto.
+ (webkit_dom_text_track_cue_get_snap_to_lines): Ditto.
+ (webkit_dom_text_track_cue_set_snap_to_lines): Ditto.
+ (webkit_dom_text_track_cue_get_line): Ditto.
+ (webkit_dom_text_track_cue_set_line): Ditto.
+ (webkit_dom_text_track_cue_get_position): Ditto.
+ (webkit_dom_text_track_cue_set_position): Ditto.
+ (webkit_dom_text_track_cue_get_size): Ditto.
+ (webkit_dom_text_track_cue_set_size): Ditto.
+ (webkit_dom_text_track_cue_get_align): Ditto.
+ (webkit_dom_text_track_cue_set_align): Ditto.
+ (webkit_dom_text_track_cue_get_text): Ditto.
+ (webkit_dom_text_track_cue_set_text): Ditto.
+ * bindings/gobject/WebKitDOMDeprecated.h:
+ * bindings/gobject/WebKitDOMDeprecated.symbols: Add new deprecated symbols.
+ * bindings/gobject/WebKitDOMPrivate.cpp:
+ (WebKit::wrap): Add generic wrap for TextTrackCue now that it's a
+ base class to generate DataCue or VTTCue objects.
+ * bindings/gobject/WebKitDOMPrivate.h:
+ * bindings/gobject/webkitdom.symbols: Add DataCue symbols.
+ * bindings/scripts/CodeGeneratorGObject.pm:
+ (IsPolymorphic): Add TextTrackCue to the list of polymorphic classes.
+
</ins><span class="cx"> 2014-04-27 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> Store the containing region map inside the flow thread
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -630,11 +630,13 @@
</span><span class="cx">
</span><span class="cx"> html/track/AudioTrack.idl
</span><span class="cx"> html/track/AudioTrackList.idl
</span><ins>+ html/track/DataCue.idl
</ins><span class="cx"> html/track/TextTrack.idl
</span><span class="cx"> html/track/TextTrackCue.idl
</span><span class="cx"> html/track/TextTrackCueList.idl
</span><span class="cx"> html/track/TextTrackList.idl
</span><span class="cx"> html/track/TrackEvent.idl
</span><ins>+ html/track/VTTCue.idl
</ins><span class="cx"> html/track/VideoTrack.idl
</span><span class="cx"> html/track/VideoTrackList.idl
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.cpp 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "WebKitDOMObject.h"
</span><span class="cx"> #include "WebKitDOMPrivate.h"
</span><span class="cx"> #include "WebKitDOMProcessingInstruction.h"
</span><ins>+#include "WebKitDOMVTTCue.h"
</ins><span class="cx"> #include "WebKitDOMWebKitNamedFlow.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -702,3 +703,95 @@
</span><span class="cx"> {
</span><span class="cx"> g_warning("The WebKitDOMHTMLInputElement:capture property has converted to a boolean according to the specification. This method does nothing. Use webkit_dom_html_input_element_set_capture_enabled() instead.");
</span><span class="cx"> }
</span><ins>+
+// WebKitDOMTextTrackCue
+
+WebKitDOMDocumentFragment* webkit_dom_text_track_cue_get_cue_as_html(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), nullptr);
+ return webkit_dom_vtt_cue_get_cue_as_html(WEBKIT_DOM_VTT_CUE(self));
+}
+
+gchar* webkit_dom_text_track_cue_get_vertical(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), nullptr);
+ return webkit_dom_vtt_cue_get_vertical(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_vertical(WebKitDOMTextTrackCue* self, const gchar* value, GError** error)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_vertical(WEBKIT_DOM_VTT_CUE(self), value, error);
+}
+
+gboolean webkit_dom_text_track_cue_get_snap_to_lines(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), FALSE);
+ return webkit_dom_vtt_cue_get_snap_to_lines(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_snap_to_lines(WebKitDOMTextTrackCue* self, gboolean value)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_snap_to_lines(WEBKIT_DOM_VTT_CUE(self), value);
+}
+
+glong webkit_dom_text_track_cue_get_line(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), -1);
+ return webkit_dom_vtt_cue_get_line(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_line(WebKitDOMTextTrackCue* self, glong value, GError** error)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_line(WEBKIT_DOM_VTT_CUE(self), value, error);
+}
+
+glong webkit_dom_text_track_cue_get_position(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), -1);
+ return webkit_dom_vtt_cue_get_position(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_position(WebKitDOMTextTrackCue* self, glong value, GError** error)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_position(WEBKIT_DOM_VTT_CUE(self), value, error);
+}
+
+glong webkit_dom_text_track_cue_get_size(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), -1);
+ return webkit_dom_vtt_cue_get_size(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_size(WebKitDOMTextTrackCue* self, glong value, GError** error)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_size(WEBKIT_DOM_VTT_CUE(self), value, error);
+}
+
+gchar* webkit_dom_text_track_cue_get_align(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), nullptr);
+ return webkit_dom_vtt_cue_get_align(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_align(WebKitDOMTextTrackCue* self, const gchar* value, GError** error)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_align(WEBKIT_DOM_VTT_CUE(self), value, error);
+}
+
+gchar* webkit_dom_text_track_cue_get_text(WebKitDOMTextTrackCue* self)
+{
+ g_return_val_if_fail(WEBKIT_DOM_IS_VTT_CUE(self), nullptr);
+ return webkit_dom_vtt_cue_get_text(WEBKIT_DOM_VTT_CUE(self));
+}
+
+void webkit_dom_text_track_cue_set_text(WebKitDOMTextTrackCue* self, const gchar* value)
+{
+ g_return_if_fail(WEBKIT_DOM_IS_VTT_CUE(self));
+ webkit_dom_vtt_cue_set_text(WEBKIT_DOM_VTT_CUE(self), value);
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.h 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -850,6 +850,169 @@
</span><span class="cx"> WEBKIT_DEPRECATED_FOR(webkit_dom_html_input_element_set_capture_enabled) void
</span><span class="cx"> webkit_dom_html_input_element_set_capture(WebKitDOMHTMLInputElement* self, const gchar* value);
</span><span class="cx">
</span><ins>+/**
+ * webkit_dom_text_track_cue_get_cue_as_html:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: (transfer none): A #WebKitDOMDocumentFragment
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_cue_as_html() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_cue_as_html) WebKitDOMDocumentFragment*
+webkit_dom_text_track_cue_get_cue_as_html(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_get_vertical:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #gchar
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_vertical() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_vertical) gchar*
+webkit_dom_text_track_cue_get_vertical(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_vertical:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #gchar
+ * @error: #GError
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_vertical() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_vertical) void
+webkit_dom_text_track_cue_set_vertical(WebKitDOMTextTrackCue* self, const gchar* value, GError** error);
+
+/**
+ * webkit_dom_text_track_cue_get_snap_to_lines:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #gboolean
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_snap_to_lines() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_snap_to_lines) gboolean
+webkit_dom_text_track_cue_get_snap_to_lines(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_snap_to_lines:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #gboolean
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_snap_to_lines() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_snap_to_lines) void
+webkit_dom_text_track_cue_set_snap_to_lines(WebKitDOMTextTrackCue* self, gboolean value);
+
+/**
+ * webkit_dom_text_track_cue_get_line:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #glong
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_line() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_line) glong
+webkit_dom_text_track_cue_get_line(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_line:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #glong
+ * @error: #GError
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_line() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_line) void
+webkit_dom_text_track_cue_set_line(WebKitDOMTextTrackCue* self, glong value, GError** error);
+
+/**
+ * webkit_dom_text_track_cue_get_position:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #glong
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_position() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_position) glong
+webkit_dom_text_track_cue_get_position(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_position:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #glong
+ * @error: #GError
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_position() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_position) void
+webkit_dom_text_track_cue_set_position(WebKitDOMTextTrackCue* self, glong value, GError** error);
+
+/**
+ * webkit_dom_text_track_cue_get_size:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #glong
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_size() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_size) glong
+webkit_dom_text_track_cue_get_size(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_size:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #glong
+ * @error: #GError
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_size() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_size) void
+webkit_dom_text_track_cue_set_size(WebKitDOMTextTrackCue* self, glong value, GError** error);
+
+/**
+ * webkit_dom_text_track_cue_get_align:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #gchar
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_align() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_align) gchar*
+webkit_dom_text_track_cue_get_align(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_align:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #gchar
+ * @error: #GError
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_align() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_align) void
+webkit_dom_text_track_cue_set_align(WebKitDOMTextTrackCue* self, const gchar* value, GError** error);
+
+/**
+ * webkit_dom_text_track_cue_get_text:
+ * @self: A #WebKitDOMTextTrackCue
+ *
+ * Returns: A #gchar
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_get_text() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_get_text) gchar*
+webkit_dom_text_track_cue_get_text(WebKitDOMTextTrackCue* self);
+
+/**
+ * webkit_dom_text_track_cue_set_text:
+ * @self: A #WebKitDOMTextTrackCue
+ * @value: A #gchar
+ *
+ * Deprecated: 2.6: Use webkit_dom_vtt_cue_set_text() instead.
+ */
+WEBKIT_DEPRECATED_FOR(webkit_dom_vtt_cue_set_text) void
+webkit_dom_text_track_cue_set_text(WebKitDOMTextTrackCue* self, const gchar* value);
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif /* WEBKIT_DISABLE_DEPRECATED */
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMDeprecatedsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMDeprecated.symbols 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -67,3 +67,18 @@
</span><span class="cx"> void webkit_dom_shadow_root_set_apply_author_styles(WebKitDOMShadowRoot*, gboolean)
</span><span class="cx"> void webkit_dom_shadow_root_set_inner_html(WebKitDOMShadowRoot*, const gchar*, GError**)
</span><span class="cx"> void webkit_dom_shadow_root_set_reset_style_inheritance(WebKitDOMShadowRoot*, gboolean)
</span><ins>+WebKitDOMDocumentFragment* webkit_dom_text_track_cue_get_cue_as_html(WebKitDOMTextTrackCue*)
+gchar* webkit_dom_text_track_cue_get_vertical(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_vertical(WebKitDOMTextTrackCue*, const gchar*, GError**)
+gboolean webkit_dom_text_track_cue_get_snap_to_lines(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_snap_to_lines(WebKitDOMTextTrackCue*, gboolean)
+glong webkit_dom_text_track_cue_get_line(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_line(WebKitDOMTextTrackCue*, glong, GError**)
+glong webkit_dom_text_track_cue_get_position(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_position(WebKitDOMTextTrackCue*, glong, GError**)
+glong webkit_dom_text_track_cue_get_size(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_size(WebKitDOMTextTrackCue*, glong, GError**)
+gchar* webkit_dom_text_track_cue_get_align(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_align(WebKitDOMTextTrackCue*, const gchar*, GError**)
+gchar* webkit_dom_text_track_cue_get_text(WebKitDOMTextTrackCue*)
+void webkit_dom_text_track_cue_set_text(WebKitDOMTextTrackCue*, const gchar*)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.cpp 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -64,6 +64,14 @@
</span><span class="cx"> #include "WebKitDOMUIEventPrivate.h"
</span><span class="cx"> #include "WebKitDOMWheelEventPrivate.h"
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO_TRACK)
+#include "DataCue.h"
+#include "VTTCue.h"
+#include "WebKitDOMDataCuePrivate.h"
+#include "WebKitDOMTextTrackCuePrivate.h"
+#include "WebKitDOMVTTCuePrivate.h"
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -168,4 +176,20 @@
</span><span class="cx"> return wrapBlob(blob);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO_TRACK)
+WebKitDOMTextTrackCue* wrap(TextTrackCue* cue)
+{
+ ASSERT(cue);
+
+ switch (cue->cueType()) {
+ case TextTrackCue::Data:
+ return WEBKIT_DOM_TEXT_TRACK_CUE(wrapDataCue(static_cast<DataCue*>(cue)));
+ case TextTrackCue::WebVTT:
+ case TextTrackCue::Generic:
+ return WEBKIT_DOM_TEXT_TRACK_CUE(wrapVTTCue(static_cast<VTTCue*>(cue)));
+ }
+ return wrapTextTrackCue(cue);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMPrivate.h 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> class HTMLCollection;
</span><span class="cx"> class EventTarget;
</span><span class="cx"> class Blob;
</span><ins>+class TextTrackCue;
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -46,6 +47,9 @@
</span><span class="cx"> WebKitDOMHTMLCollection* wrap(WebCore::HTMLCollection*);
</span><span class="cx"> WebKitDOMEventTarget* wrap(WebCore::EventTarget*);
</span><span class="cx"> WebKitDOMBlob* wrap(WebCore::Blob*);
</span><ins>+#if ENABLE(VIDEO_TRACK)
+WebKitDOMTextTrackCue* wrap(WebCore::TextTrackCue*);
+#endif
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // WebKitDOMPrivate_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectwebkitdomsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/webkitdom.symbols (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/gobject/webkitdom.symbols 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -1761,3 +1761,19 @@
</span><span class="cx"> WebKitDOMVideoTrack* webkit_dom_video_track_list_get_track_by_id(WebKitDOMVideoTrackList*, const gchar*)
</span><span class="cx"> gboolean webkit_dom_video_track_list_dispatch_event(WebKitDOMVideoTrackList*, WebKitDOMEvent*, GError**)
</span><span class="cx"> gulong webkit_dom_video_track_list_get_length(WebKitDOMVideoTrackList*)
</span><ins>+gboolean webkit_dom_vtt_cue_get_snap_to_lines(WebKitDOMVTTCue*)
+void webkit_dom_vtt_cue_set_line(WebKitDOMVTTCue*, gdouble, GError**)
+WebKitDOMDocumentFragment* webkit_dom_vtt_cue_get_cue_as_html(WebKitDOMVTTCue*)
+gdouble webkit_dom_vtt_cue_get_size(WebKitDOMVTTCue*)
+gdouble webkit_dom_vtt_cue_get_position(WebKitDOMVTTCue*)
+void webkit_dom_vtt_cue_set_size(WebKitDOMVTTCue*, gdouble, GError**)
+void webkit_dom_vtt_cue_set_vertical(WebKitDOMVTTCue*, const gchar*, GError**)
+void webkit_dom_vtt_cue_set_align(WebKitDOMVTTCue*, const gchar*, GError**)
+gchar* webkit_dom_vtt_cue_get_vertical(WebKitDOMVTTCue*)
+void webkit_dom_vtt_cue_set_snap_to_lines(WebKitDOMVTTCue*, gboolean)
+gdouble webkit_dom_vtt_cue_get_line(WebKitDOMVTTCue*)
+void webkit_dom_vtt_cue_set_text(WebKitDOMVTTCue*, const gchar*)
+void webkit_dom_vtt_cue_set_position(WebKitDOMVTTCue*, gdouble, GError**)
+gchar* webkit_dom_vtt_cue_get_text(WebKitDOMVTTCue*)
+gchar* webkit_dom_vtt_cue_get_align(WebKitDOMVTTCue*)
+gchar* webkit_dom_data_cue_get_text(WebKitDOMDataCue*)
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorGObjectpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm (167873 => 167874)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-04-28 07:51:42 UTC (rev 167873)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm 2014-04-28 07:57:18 UTC (rev 167874)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> "Event" => 1, "CSSRule" => 1, "CSSValue" => 1, "StyleSheet" => 1, "MediaList" => 1,
</span><span class="cx"> "Counter" => 1, "Rect" => 1, "RGBColor" => 1, "XPathExpression" => 1, "XPathResult" => 1,
</span><span class="cx"> "NodeIterator" => 1, "TreeWalker" => 1, "AbstractView" => 1, "Blob" => 1, "DOMTokenList" => 1,
</span><del>- "HTMLCollection" => 1);
</del><ins>+ "HTMLCollection" => 1, "TextTrackCue" => 1);
</ins><span class="cx">
</span><span class="cx"> # List of function parameters that are allowed to be NULL
</span><span class="cx"> my $canBeNullParams = {
</span><span class="lines">@@ -1460,7 +1460,7 @@
</span><span class="cx"> sub IsPolymorphic {
</span><span class="cx"> my $type = shift;
</span><span class="cx">
</span><del>- return scalar(grep {$_ eq $type} qw(Blob Event HTMLCollection Node StyleSheet));
</del><ins>+ return scalar(grep {$_ eq $type} qw(Blob Event HTMLCollection Node StyleSheet TextTrackCue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateEventTargetIface {
</span></span></pre>
</div>
</div>
</body>
</html>