Skip to content

GitLab

T
tangled
Commit 85e0a088 authored by vrk@chromium.org's avatar vrk@chromium.org
Browse files
Options

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.


git-svn-id: svn://svn.chromium.org/blink/trunk@93437 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 41662abd
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 0 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 85e0a088
2011-08-19 Victoria Kirst <vrk@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 <tony@chromium.org> 2011-08-19 Tony Chang <tony@chromium.org>
[chromium] Mark touch tests as failing on OSX 10.5. [chromium] Mark touch tests as failing on OSX 10.5.
third_party/WebKit/LayoutTests/media/video-load-preload-none-expected.txt 0 → 100644
View file @ 85e0a088
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
third_party/WebKit/LayoutTests/media/video-load-preload-none.html 0 → 100644
View file @ 85e0a088
<html>
<head>
<script src="media-file.js"></script>
<script src="video-test.js"></script>
<script>
function start()
{
findMediaElement();
video.src = findMediaFile("video", "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>
third_party/WebKit/Source/WebCore/ChangeLog
View file @ 85e0a088
2011-08-19 Victoria Kirst <vrk@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 <eae@chromium.org> 2011-08-19 Emil A Eklund <eae@chromium.org>
Switch RenderBlock to to new layout types Switch RenderBlock to to new layout types
third_party/WebKit/Source/WebCore/html/HTMLMediaElement.cpp
View file @ 85e0a088
...@@ -500,6 +500,7 @@ void HTMLMediaElement::load(ExceptionCode& ec) ...@@ -500,6 +500,7 @@ void HTMLMediaElement::load(ExceptionCode& ec)
prepareForLoad(); prepareForLoad();
loadInternal(); loadInternal();
} }
prepareToPlay();
} }
void HTMLMediaElement::prepareForLoad() void HTMLMediaElement::prepareForLoad()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment