Skip to content

GitLab

T
tangled
Commit 131a5334 authored by Mounir Lamouri's avatar Mounir Lamouri Committed by Commit Bot
Browse files
Options

Revert "Remove default padding for cue text rendering" 

This reverts commit 6862f77d.

Reason for revert: bug 966345

Original change's description:
> Remove default padding for cue text rendering
> 
> Per spec there is no default padding for text track cue rendering.
> Removing the default padding for cue text.
> 
> BUG=930608, 843136
> 
> Change-Id: If931c1faff528a87d8a78808f30225ebe2377072
> Reviewed-on: https://chromium-review.googlesource.com/c/1475567
> Commit-Queue: srirama chandra sekhar <srirama.m@samsung.com>
> Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
> Reviewed-by: Fredrik Söderquist <fs@opera.com>
> Cr-Commit-Position: refs/heads/master@{#633624}

TBR=fs@opera.com,mlamouri@chromium.org,srirama.m@samsung.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 930608, 843136
Change-Id: If1183f0ef2b03f287b7ba562b4b45f5fff242b71
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1628480Reviewed-by: default avatarMounir Lamouri <mlamouri@chromium.org>
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663891}
parent 7dc8f744
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 51 deletions
third_party/blink/renderer/modules/media_controls/resources/legacyMediaControls.css
View file @ 131a5334
......@@ -638,6 +638,7 @@ video::cue {
display: inline;
background-color: rgba(0, 0, 0, 0.8);
padding: 2px 2px;
}
video::-webkit-media-text-track-region {
......
third_party/blink/renderer/modules/media_controls/resources/modernMediaControls.css
View file @ 131a5334
......@@ -1189,6 +1189,7 @@ video::cue {
display: inline;
background-color: rgba(0, 0, 0, 0.8);
padding: 2px 2px;
}
video::-webkit-media-text-track-region {
......
third_party/blink/web_tests/TestExpectations
View file @ 131a5334
......@@ -5734,3 +5734,9 @@ crbug.com/966932 [ Linux ] http/tests/devtools/a11y-axe-core/elements/main-tool-
# Sheriff 2019-05-27
crbug.com/942411 [ Win ] http/tests/devtools/network/network-search.js [ Pass Timeout ]
# Failing because of revert of If931c1faff528a87d8a78808f30225ebe2377072.
crbug.com/966345 external/wpt/webvtt/rendering/cues-with-video/processing-model/2_tracks.html [ Failure ]
crbug.com/966345 external/wpt/webvtt/rendering/cues-with-video/processing-model/3_tracks.html [ Failure ]
crbug.com/966345 external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_normal_wrapped.html [ Failure ]
crbug.com/966345 external/wpt/webvtt/rendering/cues-with-video/processing-model/selectors/cue_function/class_object/class_white-space_pre-line_wrapped.html [ Failure ]
third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue-ref.html deleted 100644 → 0
View file @ 7dc8f744
<!DOCTYPE html>
<html class="reftest-wait">
<title>Reference for track rendering with empty cue</title>
<script src="/common/reftest-wait.js"></script>
<style>
html { overflow:hidden }
body { margin:0 }
.container {
display: inline-block;
position: relative;
}
</style>
<div class="container">
<video width="320" height="180">
<source src="/media/white.webm" type="video/webm">
<source src="/media/white.mp4" type="video/mp4">
<script>
var video = document.querySelector("video");
video.addEventListener('playing', () => {
video.pause();
takeScreenshot();
}, { once: true});
video.play();
</script>
</video>
</div>
</html>
\ No newline at end of file
third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-empty-cue.html
View file @ 131a5334
<!DOCTYPE html>
<html class="reftest-wait">
<title>Track rendering with empty cue</title>
<link rel="match" href="track-cue-rendering-empty-cue-ref.html">
<style>
html { overflow:hidden }
body { margin:0 }
</style>
<script src="/common/reftest-wait.js"></script>
<video width="320" height="180">
<source src="/media/white.webm" type="video/webm">
<source src="/media/white.mp4" type="video/mp4">
<script>
var video = document.querySelector("video");
var track = video.addTextTrack("captions", "regular captions track", "en");
track.addCue(new VTTCue(0, 4, ""));
track.mode = "showing";
<title>Empty cues</title>
<script src="/common/media.js"></script>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
async_test(function(t) {
var video = document.createElement("video");
video.src = getVideoURI("/media/test");
video.addTextTrack("captions", "regular captions track", "en");
video.textTracks[0].addCue(new VTTCue(0, 4, ""));
video.addEventListener('playing', () => {
video.pause();
takeScreenshot();
}, { once: true});
video.onplaying = t.step_func_done();
video.play();
</script>
</video>
</html>
\ No newline at end of file
});
</script>
\ No newline at end of file
third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-line-doesnt-fit-ref.html
View file @ 131a5334
......@@ -20,6 +20,7 @@
background: green;
color: green;
font-size: 120px;
padding: 2px;
}
</style>
<div class="container">
......
third_party/blink/web_tests/external/wpt/html/semantics/embedded-content/media-elements/track/track-element/track-cue-rendering-transformed-video-ref.html
View file @ 131a5334
......@@ -22,6 +22,7 @@
background: green;
color: green;
font-size: 50px;
padding: 2px;
}
</style>
<div class="container">
......
third_party/blink/web_tests/media/track/track-cue-rendering-position-auto-expected.html
View file @ 131a5334
......@@ -30,6 +30,7 @@ var mediaFile = '../content/test.ogv';
background: green;
color: green;
font-size: 50px;
padding: 2px;
}
</style>
<div class="container">
......
third_party/blink/web_tests/media/track/track-cue-rendering-position-auto-rtl-expected.html
View file @ 131a5334
......@@ -32,6 +32,7 @@ var mediaFile = '../content/test.ogv';
background: green;
color: green;
font-size: 50px;
padding: 2px;
}
</style>
<div class="container">
......
third_party/blink/web_tests/media/track/track-cue-rendering-with-padding.html
View file @ 131a5334
......@@ -5,7 +5,7 @@
<script src="../../resources/testharnessreport.js"></script>
<style>
video::-webkit-media-text-track-display {
padding: 10px;
padding: 15px;
}
</style>
<video>
......
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