Diff
Modified: trunk/LayoutTests/ChangeLog (108326 => 108327)
--- trunk/LayoutTests/ChangeLog 2012-02-21 09:49:22 UTC (rev 108326)
+++ trunk/LayoutTests/ChangeLog 2012-02-21 10:33:53 UTC (rev 108327)
@@ -1,3 +1,23 @@
+2012-02-17 Philippe Normand <[email protected]>
+
+ [GStreamer] media/W3C failures
+ https://bugs.webkit.org/show_bug.cgi?id=75078
+
+ Reviewed by Martin Robinson.
+
+ Unskip now passing tests and add GTK baselines for them.
+
+ * platform/gtk/Skipped:
+ * platform/gtk/media/W3C/audio/canPlayType/canPlayType_supported_but_no_codecs_parameter_2-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_1-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_3-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_1-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_3-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_1-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_2-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_5-expected.txt: Added.
+ * platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_6-expected.txt: Added.
+
2012-02-21 Yuta Kitamura <[email protected]>
[Chromium] Unreviewed, update test expectations to reflect recent flakiness.
Modified: trunk/LayoutTests/platform/gtk/Skipped (108326 => 108327)
--- trunk/LayoutTests/platform/gtk/Skipped 2012-02-21 09:49:22 UTC (rev 108326)
+++ trunk/LayoutTests/platform/gtk/Skipped 2012-02-21 10:33:53 UTC (rev 108327)
@@ -1510,70 +1510,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=74409
plugins/netscape-plugin-page-cache-works.html
-# https://bugs.webkit.org/show_bug.cgi?id=75078
-media/W3C/audio/canPlayType/canPlayType_supported_but_no_codecs_parameter_2.html
-media/W3C/audio/events/event_canplay.html
-media/W3C/audio/events/event_canplay_manual.html
-media/W3C/audio/events/event_canplaythrough.html
-media/W3C/audio/events/event_canplaythrough_manual.html
-media/W3C/audio/events/event_loadeddata.html
-media/W3C/audio/events/event_loadeddata_manual.html
-media/W3C/audio/events/event_loadedmetadata.html
-media/W3C/audio/events/event_loadedmetadata_manual.html
-media/W3C/audio/events/event_order_canplay_canplaythrough.html
-media/W3C/audio/events/event_order_canplay_playing.html
-media/W3C/audio/events/event_order_loadedmetadata_loadeddata.html
-media/W3C/audio/events/event_order_loadstart_progress.html
-media/W3C/audio/events/event_play.html
-media/W3C/audio/events/event_playing.html
-media/W3C/audio/events/event_playing_manual.html
-media/W3C/audio/events/event_progress.html
-media/W3C/audio/events/event_progress_manual.html
-media/W3C/audio/events/event_timeupdate.html
-media/W3C/audio/events/event_timeupdate_manual.html
-media/W3C/audio/networkState/networkState_during_loadstart.html
-media/W3C/audio/paused/paused_false_during_play.html
-media/W3C/audio/readyState/readyState_during_canplay.html
-media/W3C/audio/readyState/readyState_during_canplaythrough.html
-media/W3C/audio/readyState/readyState_during_loadeddata.html
-media/W3C/audio/readyState/readyState_during_loadedmetadata.html
-media/W3C/audio/readyState/readyState_during_playing.html
-media/W3C/video/canPlayType/canPlayType_codecs_order_1.html
-media/W3C/video/canPlayType/canPlayType_codecs_order_3.html
-media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_1.html
-media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_3.html
-media/W3C/video/canPlayType/canPlayType_two_implies_one_1.html
-media/W3C/video/canPlayType/canPlayType_two_implies_one_2.html
-media/W3C/video/canPlayType/canPlayType_two_implies_one_5.html
-media/W3C/video/canPlayType/canPlayType_two_implies_one_6.html
-media/W3C/video/events/event_canplay.html
-media/W3C/video/events/event_canplay_manual.html
-media/W3C/video/events/event_canplaythrough.html
-media/W3C/video/events/event_canplaythrough_manual.html
-media/W3C/video/events/event_loadeddata.html
-media/W3C/video/events/event_loadeddata_manual.html
-media/W3C/video/events/event_loadedmetadata.html
-media/W3C/video/events/event_loadedmetadata_manual.html
-media/W3C/video/events/event_order_canplay_canplaythrough.html
-media/W3C/video/events/event_order_canplay_playing.html
-media/W3C/video/events/event_order_loadedmetadata_loadeddata.html
-media/W3C/video/events/event_order_loadstart_progress.html
-media/W3C/video/events/event_play.html
-media/W3C/video/events/event_playing.html
-media/W3C/video/events/event_playing_manual.html
-media/W3C/video/events/event_progress.html
-media/W3C/video/events/event_progress_manual.html
-media/W3C/video/events/event_timeupdate.html
-media/W3C/video/events/event_timeupdate_manual.html
-media/W3C/video/networkState/networkState_during_loadstart.html
-media/W3C/video/networkState/networkState_during_progress.html
-media/W3C/video/paused/paused_false_during_play.html
-media/W3C/video/readyState/readyState_during_canplay.html
-media/W3C/video/readyState/readyState_during_canplaythrough.html
-media/W3C/video/readyState/readyState_during_loadeddata.html
-media/W3C/video/readyState/readyState_during_loadedmetadata.html
-media/W3C/video/readyState/readyState_during_playing.html
-
# https://bugs.webkit.org/show_bug.cgi?id=75785
accessibility/textbox-role-reports-line-number.html
Added: trunk/LayoutTests/platform/gtk/media/W3C/audio/canPlayType/canPlayType_supported_but_no_codecs_parameter_2-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/audio/canPlayType/canPlayType_supported_but_no_codecs_parameter_2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/audio/canPlayType/canPlayType_supported_but_no_codecs_parameter_2-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+audio.canPlayType() - supported format w/o codecs parameter
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "maybe" is "maybe"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_1-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_1-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_1-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - codecs parameter order
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "probably" is "probably"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_3-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_3-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_codecs_order_3-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - codecs parameter order
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "probably" is "probably"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_1-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_1-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_1-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - supported format w/o codecs parameter
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "maybe" is "maybe"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_3-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_3-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_supported_but_no_codecs_parameter_3-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - supported format w/o codecs parameter
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "maybe" is "maybe"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_1-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_1-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_1-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - codecs parameter logic
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "probably" is "probably"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_2-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_2-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - codecs parameter logic
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "probably" is "probably"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_5-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_5-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_5-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - codecs parameter logic
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "probably" is "probably"
+
+TEST COMPLETE
+spec reference
+
+
Added: trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_6-expected.txt (0 => 108327)
--- trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_6-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/media/W3C/video/canPlayType/canPlayType_two_implies_one_6-expected.txt 2012-02-21 10:33:53 UTC (rev 108327)
@@ -0,0 +1,11 @@
+video.canPlayType() - codecs parameter logic
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS "probably" is "probably"
+
+TEST COMPLETE
+spec reference
+
+
Modified: trunk/Source/WebCore/ChangeLog (108326 => 108327)
--- trunk/Source/WebCore/ChangeLog 2012-02-21 09:49:22 UTC (rev 108326)
+++ trunk/Source/WebCore/ChangeLog 2012-02-21 10:33:53 UTC (rev 108327)
@@ -1,3 +1,15 @@
+2012-02-17 Philippe Normand <[email protected]>
+
+ [GStreamer] media/W3C failures
+ https://bugs.webkit.org/show_bug.cgi?id=75078
+
+ Reviewed by Martin Robinson.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+ (WebCore::MediaPlayerPrivateGStreamer::load): Clean out everything
+ after file:// url path to cope with media/W3C tests loading
+ file:///path/to/media.ext?some parameters.
+
2012-02-21 Matt Lilek <[email protected]>
Not reviewed, build fix for non-client-based Geolocation builds after r107982.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (108326 => 108327)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-02-21 09:49:22 UTC (rev 108326)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2012-02-21 10:33:53 UTC (rev 108327)
@@ -283,10 +283,18 @@
void MediaPlayerPrivateGStreamer::load(const String& url)
{
- g_object_set(m_playBin, "uri", url.utf8().data(), NULL);
- LOG_VERBOSE(Media, "Load %s", url.utf8().data());
+ KURL kurl(KURL(), url);
+ String cleanUrl(url);
+ // Clean out everything after file:// url path.
+ if (kurl.isLocalFile())
+ cleanUrl = cleanUrl.substring(0, kurl.pathEnd());
+
+ g_object_set(m_playBin, "uri", cleanUrl.utf8().data(), NULL);
+
+ LOG_VERBOSE(Media, "Load %s", cleanUrl.utf8().data());
+
if (m_preload == MediaPlayer::None) {
LOG_VERBOSE(Media, "Delaying load.");
m_delayingLoad = true;
