Title: [93437] trunk
- Revision
- 93437
- Author
- v...@chromium.org
- Date
- 2011-08-19 14:12:26 -0700 (Fri, 19 Aug 2011)
Log Message
Tell media player to prepareToPlay() at end of HTMLMediaElement::load()
https://bugs.webkit.org/show_bug.cgi?id=66414
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/video-load-preload-none.html
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::load):
LayoutTests:
* media/video-load-preload-none-expected.txt: Added.
* media/video-load-preload-none.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (93436 => 93437)
--- trunk/LayoutTests/ChangeLog 2011-08-19 20:57:59 UTC (rev 93436)
+++ trunk/LayoutTests/ChangeLog 2011-08-19 21:12:26 UTC (rev 93437)
@@ -1,3 +1,13 @@
+2011-08-19 Victoria Kirst <v...@chromium.org>
+
+ Tell media player to prepareToPlay() at end of HTMLMediaElement::load()
+ https://bugs.webkit.org/show_bug.cgi?id=66414
+
+ Reviewed by Eric Carlson.
+
+ * media/video-load-preload-none-expected.txt: Added.
+ * media/video-load-preload-none.html: Added.
+
2011-08-19 Tony Chang <t...@chromium.org>
[chromium] Mark touch tests as failing on OSX 10.5.
Added: trunk/LayoutTests/media/video-load-preload-none-expected.txt (0 => 93437)
--- trunk/LayoutTests/media/video-load-preload-none-expected.txt (rev 0)
+++ trunk/LayoutTests/media/video-load-preload-none-expected.txt 2011-08-19 21:12:26 UTC (rev 93437)
@@ -0,0 +1,9 @@
+Test that an explicit load() to a media element whose preload is set to "none" still loads the video.
+
+EXPECTED (video.preload == 'none') OK
+EXPECTED (video.readyState == '0') OK
+EXPECTED (video.readyState == '0') OK
+RUN(video.load())
+EVENT(loadedmetadata)
+END OF TEST
+
Added: trunk/LayoutTests/media/video-load-preload-none.html (0 => 93437)
--- trunk/LayoutTests/media/video-load-preload-none.html (rev 0)
+++ trunk/LayoutTests/media/video-load-preload-none.html 2011-08-19 21:12:26 UTC (rev 93437)
@@ -0,0 +1,32 @@
+<html>
+ <head>
+ <script src=""
+ <script src=""
+ <script>
+ function start()
+ {
+ findMediaElement();
+ video.src = "" "content/test");
+
+ testExpected("video.preload", "none");
+ testExpected("video.readyState", HTMLMediaElement.HAVE_NOTHING);
+ waitForEventAndEnd('loadedmetadata');
+
+ // Wait 250ms before load()ing to make sure setting src does not kick off the load
+ // (i.e. preload=none should still be respected).
+ setTimeout(load, 250);
+ }
+ function load()
+ {
+ testExpected("video.readyState", HTMLMediaElement.HAVE_NOTHING);
+ run("video.load()");
+ }
+ </script>
+ </head>
+
+ <body>
+ <video preload="none"></video>
+ <p>Test that an explicit load() to a media element whose preload is set to "none" still loads the video.</p>
+ <script>start();</script>
+ </body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (93436 => 93437)
--- trunk/Source/WebCore/ChangeLog 2011-08-19 20:57:59 UTC (rev 93436)
+++ trunk/Source/WebCore/ChangeLog 2011-08-19 21:12:26 UTC (rev 93437)
@@ -1,3 +1,15 @@
+2011-08-19 Victoria Kirst <v...@chromium.org>
+
+ Tell media player to prepareToPlay() at end of HTMLMediaElement::load()
+ https://bugs.webkit.org/show_bug.cgi?id=66414
+
+ Reviewed by Eric Carlson.
+
+ Test: media/video-load-preload-none.html
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::load):
+
2011-08-19 Emil A Eklund <e...@chromium.org>
Switch RenderBlock to to new layout types
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (93436 => 93437)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2011-08-19 20:57:59 UTC (rev 93436)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2011-08-19 21:12:26 UTC (rev 93437)
@@ -500,6 +500,7 @@
prepareForLoad();
loadInternal();
}
+ prepareToPlay();
}
void HTMLMediaElement::prepareForLoad()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
