third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html - Issue 1856383002: Convert css cue track tests from video-test.js to testharness.js based

Unified Diff: third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html

Issue 1856383002: Convert css cue track tests from video-test.js to testharness.js based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address review comments Created 4 years, 8 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/track/css-cue-for-video-in-shadow-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/cue-style-invalidation-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html

diff --git a/third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html b/third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html

index 222b9acf1846160f528fb589739be8aae0351d08..66c5ca8a9cf7ca4ac8c817fe995a9ba78fb671d1 100644

--- a/third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html

+++ b/third_party/WebKit/LayoutTests/media/track/cue-style-invalidation.html

@@ -1,9 +1,9 @@

<!DOCTYPE html>

+<title>Check that descendant style invalidation works with ::cue selectors.</title>

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

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

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

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

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

<style>

video::cue,

video::cue(c),

@@ -14,67 +14,53 @@ video::cue(.b:future) { background-color: red }

.cuefunc video::cue(c),

.past video::cue(i:past),

.future video::cue(.b:future) { background-color: green }

-// This selector would have triggered sibling subtree recalc if we didn't

-// support descendant invalidation for ::cue/::cue().

-#ascendant + div { color: pink }

</style>

+<div id="ascendant">

+ <video>

+ <track src="captions-webvtt/invalidation.vtt" kind="captions" default>

+ </video>

+</div>

-function seeked() {

- var red = "rgb(255, 0, 0)";

- var green = "rgb(0, 128, 0)";

- cueNode = textTrackDisplayElement(video, "cue");

- iNode = cueNode.firstElementChild;

- cNode = iNode.nextSibling.nextSibling;

- bNode = cNode.nextSibling.nextSibling;

- testExpected("getComputedStyle(cueNode).backgroundColor", red);

- ascendant.offsetTop;

- ascendant.classList.add("cue");

- if (window.internals)

- testExpected("internals.updateStyleAndReturnAffectedElementCount()", 8);

- testExpected("getComputedStyle(cueNode).backgroundColor", green);

+async_test(function(t) {

+ var video = document.querySelector('video');

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

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

+ var red = "rgb(255, 0, 0)";

+ var green = "rgb(0, 128, 0)";

- testExpected("getComputedStyle(cNode).backgroundColor", red);

- ascendant.offsetTop;

- ascendant.classList.add("cuefunc");

- if (window.internals)

- testExpected("internals.updateStyleAndReturnAffectedElementCount()", 1);

- testExpected("getComputedStyle(cNode).backgroundColor", green);

+ var cueNode = textTrackDisplayElement(video, "cue");

+ var iNode = cueNode.firstElementChild;

+ var cNode = iNode.nextSibling.nextSibling;

+ var bNode = cNode.nextSibling.nextSibling;

- testExpected("getComputedStyle(iNode).backgroundColor", red);

- ascendant.offsetTop;

- ascendant.classList.add("past");

- if (window.internals)

- testExpected("internals.updateStyleAndReturnAffectedElementCount()", 1);

- testExpected("getComputedStyle(iNode).backgroundColor", green);

+ assert_equals(getComputedStyle(cueNode).backgroundColor, red);

+ ascendant.offsetTop;

+ ascendant.classList.add("cue");

+ if (window.internals)

+ assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 8);

+ assert_equals(getComputedStyle(cueNode).backgroundColor, green);

- testExpected("getComputedStyle(bNode).backgroundColor", red);

- ascendant.offsetTop;

- ascendant.classList.add("future");

- if (window.internals)

- testExpected("internals.updateStyleAndReturnAffectedElementCount()", 1);

- testExpected("getComputedStyle(bNode).backgroundColor", green);

+ assert_equals(getComputedStyle(cNode).backgroundColor, red);

+ ascendant.offsetTop;

+ ascendant.classList.add("cuefunc");

+ if (window.internals)

+ assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1);

+ assert_equals(getComputedStyle(cNode).backgroundColor, green);

- endTest();

+ assert_equals(getComputedStyle(iNode).backgroundColor, red);

+ ascendant.offsetTop;

+ ascendant.classList.add("past");

+ if (window.internals)

+ assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1);

+ assert_equals(getComputedStyle(iNode).backgroundColor, green);

-window.onload = function() {

- consoleWrite("Check that descendant style invalidation works with ::cue selectors.");

- findMediaElement();

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

- waitForEvent("seeked", seeked);

- waitForEvent("canplaythrough", function() { video.currentTime = 0.1; });

-};

+ assert_equals(getComputedStyle(bNode).backgroundColor, red);

+ ascendant.offsetTop;

+ ascendant.classList.add("future");

+ if (window.internals)

+ assert_equals(internals.updateStyleAndReturnAffectedElementCount(), 1);

+ assert_equals(getComputedStyle(bNode).backgroundColor, green);

+ });

+ video.currentTime = 0.1;

+});

</script>

-<div id="ascendant">

- <video>

- <track src="captions-webvtt/invalidation.vtt" kind="captions" default>

- </video>

- <div></div>

-</div>

-<div>

- <div></div>

-</div>