third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html - Issue 2123573002: Convert video-[enter, mouse, scales]* tests to testharness.js

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html

Issue 2123573002: Convert video-[enter, mouse, scales]* tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/media/video-mouse-focus-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-scales-in-media-document-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html

diff --git a/third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html b/third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html

index e3854c69f863f5164affa925b927710413684cd1..5f0c12e43c09af8251a70fc21c9489f2a953411c 100644

--- a/third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html

+++ b/third_party/WebKit/LayoutTests/media/video-scales-in-media-document.html

@@ -1,34 +1,23 @@

-<html>

- <head>

- <script src="media-file.js"></script>

- <!-- TODO(foolip): Convert test to testharness.js. crbug.com/588956

- (Please avoid writing new tests using video-test.js) -->

- <script src="video-test.js"></script>

- <script>

- function canPlayThrough(event) {

- var video = event.target;

- testExpected(video.offsetWidth, 200);

- testExpected(video.offsetHeight, 164);

- endTest();

- }

+<!DOCTYPE html>

+<title>Test that video(media) documents scale to fit undersized containers.</title>

+<script src="../resources/testharness.js"></script>

+<script src="../resources/testharnessreport.js"></script>

+<script src="media-file.js"></script>

+<iframe style="width: 200px; height: 200px;"></iframe>

+<script>

+async_test(function(t) {

+ var iframe = document.querySelector("iframe");

- function iframeLoad() {

- var iframe = document.querySelector("iframe");

- var video = iframe.contentDocument.querySelector("video");

- video.addEventListener("canplaythrough", canPlayThrough);

- video.load()

- }

+ iframe.onload = t.step_func(function() {

+ var video = iframe.contentDocument.querySelector("video");

+ video.oncanplaythrough = t.step_func_done(function() {

+ assert_equals(video.offsetWidth, 200);

+ assert_equals(video.offsetHeight, 164);

+ });

- function load() {

- var iframe = document.querySelector("iframe");

- iframe.onload = iframeLoad;

- iframe.src = findMediaFile("video", "content/counting");

- }

- </script>

- </head>

+ video.load();

+ });

- <body onload="load()">

- <p>Test that video media documents scale to fit undersized containers.</p>

- <iframe style="width: 200px; height: 200px;"></iframe>

- </body>

-</html>

+ iframe.src = findMediaFile("video", "content/counting");

+});

+</script>