<!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>[167876] 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/167876">167876</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-28 01:06:54 -0700 (Mon, 28 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] TextTrack kind and mode attributes are enums since <a href="http://trac.webkit.org/projects/webkit/changeset/166180">r166180</a>
https://bugs.webkit.org/show_bug.cgi?id=132228
Reviewed by Martin Robinson.
We don't support enum values yet in GObject DOM bindings, but they
are internally strings anyway, so we can keep the old
implementations using strings as custom functions until we
properly support enums.
* bindings/gobject/WebKitDOMCustom.cpp:
(webkit_dom_text_track_get_kind):
(webkit_dom_text_track_get_mode):
(webkit_dom_text_track_set_mode):
* bindings/gobject/WebKitDOMCustom.h:
* bindings/gobject/WebKitDOMCustom.symbols:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMCustomcpp">trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMCustomh">trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h</a></li>
<li><a href="#trunkSourceWebCorebindingsgobjectWebKitDOMCustomsymbols">trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167875 => 167876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-28 08:03:00 UTC (rev 167875)
+++ trunk/Source/WebCore/ChangeLog 2014-04-28 08:06:54 UTC (rev 167876)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-04-28 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] TextTrack kind and mode attributes are enums since r166180
+ https://bugs.webkit.org/show_bug.cgi?id=132228
+
+ Reviewed by Martin Robinson.
+
+ We don't support enum values yet in GObject DOM bindings, but they
+ are internally strings anyway, so we can keep the old
+ implementations using strings as custom functions until we
+ properly support enums.
+
+ * bindings/gobject/WebKitDOMCustom.cpp:
+ (webkit_dom_text_track_get_kind):
+ (webkit_dom_text_track_get_mode):
+ (webkit_dom_text_track_set_mode):
+ * bindings/gobject/WebKitDOMCustom.h:
+ * bindings/gobject/WebKitDOMCustom.symbols:
+
+2014-04-28 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] TextTrack::addCue can raise an exception since r163974
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=132227
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp (167875 => 167876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2014-04-28 08:03:00 UTC (rev 167875)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.cpp 2014-04-28 08:06:54 UTC (rev 167876)
</span><span class="lines">@@ -28,6 +28,11 @@
</span><span class="cx"> #include "WebKitDOMPrivate.h"
</span><span class="cx"> #include "gobject/ConvertToUTF8String.h"
</span><span class="cx">
</span><ins>+#if ENABLE(VIDEO)
+#include "TextTrack.h"
+#include "WebKitDOMTextTrackPrivate.h"
+#endif
+
</ins><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElement* area)
</span><span class="lines">@@ -56,4 +61,47 @@
</span><span class="cx"> #endif /* ENABLE(VIDEO) */
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// WebKitDOMTextTrack:kind and WebKitDOMTextTrack:mode were converted into enums in r166180.
+// Since we don't support enums in our bindings yet, keep these implementation here as custom until
+// we add proper support for enums.
+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) */
+}
</ins><span class="cx">
</span><ins>+gchar* webkit_dom_text_track_get_mode(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->mode());
+ return result;
+#else
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
+ return 0;
+#endif /* ENABLE(VIDEO_TRACK) */
+}
+
+void webkit_dom_text_track_set_mode(WebKitDOMTextTrack* self, const gchar* value)
+{
+#if ENABLE(VIDEO_TRACK)
+ WebCore::JSMainThreadNullState state;
+ g_return_if_fail(WEBKIT_DOM_IS_TEXT_TRACK(self));
+ g_return_if_fail(value);
+ WebCore::TextTrack* item = WebKit::core(self);
+ WTF::String convertedValue = WTF::String::fromUTF8(value);
+ item->setMode(convertedValue);
+#else
+ WEBKIT_WARN_FEATURE_NOT_PRESENT("Video Track")
+#endif /* ENABLE(VIDEO_TRACK) */
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h (167875 => 167876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h 2014-04-28 08:03:00 UTC (rev 167875)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.h 2014-04-28 08:06:54 UTC (rev 167876)
</span><span class="lines">@@ -50,6 +50,33 @@
</span><span class="cx"> */
</span><span class="cx"> WEBKIT_API gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement* input);
</span><span class="cx">
</span><ins>+/**
+ * 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_mode:
+ * @self: A #WebKitDOMTextTrack
+ *
+ * Returns: A #gchar
+ */
+WEBKIT_API gchar*
+webkit_dom_text_track_get_mode(WebKitDOMTextTrack* self);
+
+/**
+ * webkit_dom_text_track_set_mode:
+ * @self: A #WebKitDOMTextTrack
+ * @value: A #gchar
+ *
+ */
+WEBKIT_API void
+webkit_dom_text_track_set_mode(WebKitDOMTextTrack* self, const gchar* value);
+
</ins><span class="cx"> G_END_DECLS
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsgobjectWebKitDOMCustomsymbols"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols (167875 => 167876)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols 2014-04-28 08:03:00 UTC (rev 167875)
+++ trunk/Source/WebCore/bindings/gobject/WebKitDOMCustom.symbols 2014-04-28 08:06:54 UTC (rev 167876)
</span><span class="lines">@@ -1,3 +1,6 @@
</span><span class="cx"> gboolean webkit_dom_html_text_area_element_is_edited(WebKitDOMHTMLTextAreaElement*)
</span><span class="cx"> gboolean webkit_dom_html_input_element_is_edited(WebKitDOMHTMLInputElement*)
</span><span class="cx"> void webkit_dom_html_media_element_set_current_time(WebKitDOMHTMLMediaElement*, gdouble, GError**)
</span><ins>+void webkit_dom_text_track_set_mode(WebKitDOMTextTrack*, const gchar*)
+gchar* webkit_dom_text_track_get_mode(WebKitDOMTextTrack*)
+gchar* webkit_dom_text_track_get_kind(WebKitDOMTextTrack*)
</ins></span></pre>
</div>
</div>
</body>
</html>