Title: [158732] trunk/Source/WebCore
- Revision
- 158732
- Author
- [email protected]
- Date
- 2013-11-06 00:14:46 -0800 (Wed, 06 Nov 2013)
Log Message
[GStreamer] Override label() and language() in Audio and VideoTrackPrivateGStreamer
https://bugs.webkit.org/show_bug.cgi?id=123836
The tests are currently flakey because we only get the label and language if we get
tags after the track client is set.
Patch by Brendan Long <[email protected]> on 2013-11-06
Reviewed by Philippe Normand.
No new tests because the tests already exist (this fixes flakeyness).
* platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h: Override label() and language() to use m_label and m_language.
* platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h: Same.
* platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h: Make m_label and m_language protected so they can be used in the functions above.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158731 => 158732)
--- trunk/Source/WebCore/ChangeLog 2013-11-06 08:13:33 UTC (rev 158731)
+++ trunk/Source/WebCore/ChangeLog 2013-11-06 08:14:46 UTC (rev 158732)
@@ -1,3 +1,19 @@
+2013-11-06 Brendan Long <[email protected]>
+
+ [GStreamer] Override label() and language() in Audio and VideoTrackPrivateGStreamer
+ https://bugs.webkit.org/show_bug.cgi?id=123836
+
+ The tests are currently flakey because we only get the label and language if we get
+ tags after the track client is set.
+
+ Reviewed by Philippe Normand.
+
+ No new tests because the tests already exist (this fixes flakeyness).
+
+ * platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h: Override label() and language() to use m_label and m_language.
+ * platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h: Same.
+ * platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h: Make m_label and m_language protected so they can be used in the functions above.
+
2013-11-05 Andreas Kling <[email protected]>
RenderBlockFlow should only expose its line boxes as RootInlineBox.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h (158731 => 158732)
--- trunk/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h 2013-11-06 08:13:33 UTC (rev 158731)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/AudioTrackPrivateGStreamer.h 2013-11-06 08:14:46 UTC (rev 158732)
@@ -45,6 +45,10 @@
virtual void setActive(bool enabled) OVERRIDE { setEnabled(enabled); }
virtual int trackIndex() const OVERRIDE { return m_index; }
+
+ virtual AtomicString label() const OVERRIDE { return m_label; }
+ virtual AtomicString language() const OVERRIDE { return m_language; }
+
virtual void labelChanged(const String&) OVERRIDE;
virtual void languageChanged(const String&) OVERRIDE;
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h (158731 => 158732)
--- trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2013-11-06 08:13:33 UTC (rev 158731)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/TrackPrivateBaseGStreamer.h 2013-11-06 08:14:46 UTC (rev 158732)
@@ -60,10 +60,11 @@
gint m_index;
GRefPtr<GstElement> m_playbin;
+ String m_label;
+ String m_language;
+
private:
GRefPtr<GstPad> m_pad;
- String m_label;
- String m_language;
guint m_activeTimerHandler;
guint m_tagTimerHandler;
};
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h (158731 => 158732)
--- trunk/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h 2013-11-06 08:13:33 UTC (rev 158731)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/VideoTrackPrivateGStreamer.h 2013-11-06 08:14:46 UTC (rev 158732)
@@ -45,6 +45,10 @@
virtual void setActive(bool enabled) OVERRIDE { setSelected(enabled); }
virtual int trackIndex() const OVERRIDE { return m_index; }
+
+ virtual AtomicString label() const OVERRIDE { return m_label; }
+ virtual AtomicString language() const OVERRIDE { return m_language; }
+
virtual void labelChanged(const String&) OVERRIDE;
virtual void languageChanged(const String&) OVERRIDE;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
