diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 16:17:29 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-17 16:17:29 +0000 |
| commit | 26d81d7f2d515cbf3babe720f79b1c2b89646100 (patch) | |
| tree | ef5b13c141a2dea428f49f7cf777f7678eb9de8e /chrome/test/data | |
| parent | 0944c3253e16066371a6d50640405e8be9bbe810 (diff) | |
| download | chromium_src-26d81d7f2d515cbf3babe720f79b1c2b89646100.zip chromium_src-26d81d7f2d515cbf3babe720f79b1c2b89646100.tar.gz chromium_src-26d81d7f2d515cbf3babe720f79b1c2b89646100.tar.bz2 | |
Revert 59715 - Second try of http://codereview.chromium.org/3322009 since it got reverted.
Added a media UI test case for fullscreen video implementation for Windows (which is not committed yet). However, it is currently disabled until the webkit patches are here.
Also changed the other cases in media_uitest.cc to stop using Sleep() in test code. Instead, NotificationObserver and NotificationRegistrar are used.
Thirdly, moved media_uitest.cc from ui_tests to interactive_ui_tests.
TEST=ui_tests, interactive_ui_tests
BUG=54838
Review URL: http://codereview.chromium.org/3407003
TBR=imcheng@chromium.org
Review URL: http://codereview.chromium.org/3448008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/data')
| -rw-r--r-- | chrome/test/data/media/player_fullscreen.html | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/chrome/test/data/media/player_fullscreen.html b/chrome/test/data/media/player_fullscreen.html deleted file mode 100644 index d31579c..0000000 --- a/chrome/test/data/media/player_fullscreen.html +++ /dev/null @@ -1,56 +0,0 @@ -<html> -<body> -<div id="player_container"></div> -<script> -var player = null; -var ready = false; - -// Parse the location and load the media file accordingly. -var url = window.location.href; -var url_parts = url.split('?'); - -// Make sure the URL is of the form "player.html?media_url". -var ok = false; -if (url_parts.length > 1) { - var media_url = url_parts[1]; - ok = true; - var container = document.getElementById('player_container'); - container.innerHTML = '<video id="player"></video>'; - player = document.getElementById('player'); - - // Install event handlers. - player.addEventListener('error', - function() { - document.title = "ERROR = " + player.error.code; - }, - false); - player.addEventListener('canplay', - function() { - if (!player.webkitSupportsFullscreen) { - document.title = "ERROR fullscreen unsupported"; - } else { - document.title = "READY"; - } - }, - false); - - // Starts the player. - player.src = media_url; - player.play(); - document.onclick = function () { - try { - player.webkitEnterFullScreen(); - } catch (err) {} - if (!player.webkitDisplayingFullscreen) { - document.title = "ERROR entering to fullscreen"; - } else { - document.title = "FULLSCREEN"; - } - }; -} -if (!ok) { - document.title = 'FAILED'; -} -</script> -</body> -</html> |