Skip to content

GitLab

T
tangled
Commit 253ec117 authored by Kenneth Russell's avatar Kenneth Russell Committed by Commit Bot
Browse files
Options

Revert "[Picture in Picture] Add modern media control." 

This reverts commit a776bce4.

Reason for revert: new layout test is failing on multiple platforms; see https://bugs.chromium.org/p/chromium/issues/detail?id=823109#c2 .

Original change's description:
> [Picture in Picture] Add modern media control.
> 
> Currently, there is only a PiP button for the legacy / non-modern
> set of media controls. This adds and enables the modern version.
> 
> BUG: 726619 823109
> Change-Id: Iddb2d8393d5cf519bb6e32639d5f640bc341fc6f
> Reviewed-on: https://chromium-review.googlesource.com/966980
> Commit-Queue: apacible <apacible@chromium.org>
> Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
> Reviewed-by: Tommy Steimel <steimel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548358}

TBR=mlamouri@chromium.org,apacible@chromium.org,steimel@chromium.org

Change-Id: I8b2b26e40ed3743858c99d993a1535899bfcbf36
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/997612Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548378}
parent d90e694f
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 41 deletions
third_party/WebKit/LayoutTests/media/picture-in-picture/controls/picture-in-picture-video-with-audio-only-button.html deleted 100644 → 0
View file @ d90e694f
<!DOCTYPE html>
<title>media controls picture in picture button for a video element with only audio</title>
<script src="../../../resources/testharness.js"></script>
<script src="../../../resources/testharnessreport.js"></script>
<script src="../../media-file.js"></script>
<script src="../../media-controls.js"></script>
<script src="../../controls/picture-in-picture.js"></script>
<body>
<script>
async_test(t => {
enablePictureInPictureForTest(t);
var video = document.createElement('video');
video.setAttribute('controls', '');
video.src = '../../content/test.wav';
document.body.appendChild(video);
video.onloadeddata = t.step_func_done(function() {
assertPictureInPictureButtonNotVisible(video);
});
video.onloadedmetadata = t.step_func(function() {
assertPictureInPictureButtonNotVisible(video);
});
});
</script>
</body>
\ No newline at end of file
third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp
View file @ 253ec117
......@@ -534,7 +534,9 @@ void MediaControlsImpl::InitializeControls() {
volume_slider_->SetIsWanted(false);
}
if (RuntimeEnabledFeatures::PictureInPictureEnabled()) {
// TODO(apacible): Enable for modern controls when SVG is added.
if (RuntimeEnabledFeatures::PictureInPictureEnabled() && !IsModern() &&
MediaElement().IsHTMLVideoElement()) {
picture_in_picture_button_ =
new MediaControlPictureInPictureButtonElement(*this);
picture_in_picture_button_->SetIsWanted(
......@@ -577,7 +579,8 @@ void MediaControlsImpl::InitializeControls() {
overflow_list_->AppendChild(
toggle_closed_captions_button_->CreateOverflowElement(
new MediaControlToggleClosedCaptionsButtonElement(*this)));
if (RuntimeEnabledFeatures::PictureInPictureEnabled()) {
if (RuntimeEnabledFeatures::PictureInPictureEnabled() && !IsModern() &&
MediaElement().IsHTMLVideoElement()) {
overflow_list_->AppendChild(
picture_in_picture_button_->CreateOverflowElement(
new MediaControlPictureInPictureButtonElement(*this)));
......
third_party/WebKit/Source/modules/media_controls/resources/ic_picture_in_picture.svg deleted 100644 → 0
View file @ d90e694f
<svg xmlns="http://www.w3.org/2000/svg" width="24px" height="24px" viewBox="0 0 24 24" fill="#000000">
<path d="M19 11h-8v6h8v-6zm4 8V4.98C23 3.88 22.1 3 21 3H3c-1.1 0-2 .88-2 1.98V19c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2zm-2 .02H3V4.97h18v14.05z"/>
<path fill="none" d="M0 0h24v24H0V0z"/>
</svg>
third_party/WebKit/Source/modules/media_controls/resources/modernMediaControls.css
View file @ 253ec117
......@@ -145,8 +145,7 @@ video::-internal-media-controls-overflow-button,
audio::-internal-media-controls-overflow-button,
video::-webkit-media-controls-toggle-closed-captions-button,
audio::-internal-media-controls-download-button,
video::-internal-media-controls-download-button,
video::-internal-media-controls-picture-in-picture-button {
video::-internal-media-controls-download-button {
-webkit-appearance: -internal-media-control;
background-size: 24px;
background-repeat: no-repeat;
......@@ -232,12 +231,6 @@ video::-internal-media-controls-overflow-button,
audio::-internal-media-controls-overflow-button {
background-image: -webkit-image-set(url(ic_menu.svg) 1x);
}
video::-internal-media-controls-picture-in-picture-button {
background-image: -webkit-image-set(
url(ic_picture_in_picture.svg) 1x);
}
video::-webkit-media-controls:not(.audio-only) [pseudo="-webkit-media-controls-panel"] [pseudo="-internal-media-controls-overflow-button"] {
background-image: -webkit-image-set(url(ic_menu_white.svg) 1x);
}
......
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