Skip to content

GitLab

T
tangled
Commit 6c4ad338 authored by kdsilva's avatar kdsilva Committed by Commit bot
Browse files
Options

Removing media controls download button feature flag 

BUG=601247

Review-Url: https://codereview.chromium.org/2337013005
Cr-Commit-Position: refs/heads/master@{#419153}
parent c8f706ab
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 22 deletions
chrome/android/javatests/src/org/chromium/chrome/browser/media/remote/CastTestBase.java
View file @ 6c4ad338
...@@ -535,16 +535,23 @@ public abstract class CastTestBase extends ChromeActivityTestCaseBase<ChromeActi ...@@ -535,16 +535,23 @@ public abstract class CastTestBase extends ChromeActivityTestCaseBase<ChromeActi
return new Rect(left, bar.top, right, bar.bottom); return new Rect(left, bar.top, right, bar.bottom);
} }
private Rect fullscreenButton(Rect videoRect) { private Rect downloadButton(Rect videoRect) {
Rect bar = controlBar(videoRect); Rect bar = controlBar(videoRect);
int right = bar.right - BUTTON_RIGHT_MARGIN; int right = bar.right - BUTTON_RIGHT_MARGIN;
int left = right - BUTTON_WIDTH; int left = right - BUTTON_WIDTH;
return new Rect(left, bar.top, right, bar.bottom); return new Rect(left, bar.top, right, bar.bottom);
} }
private Rect fullscreenButton(Rect videoRect) {
Rect downloadButton = downloadButton(videoRect);
int right = downloadButton.left;
int left = right - BUTTON_WIDTH;
return new Rect(left, downloadButton.top, right, downloadButton.bottom);
}
private Rect castButton(Rect videoRect) { private Rect castButton(Rect videoRect) {
Rect fullscreenButton = fullscreenButton(videoRect); Rect fullscreenButton = fullscreenButton(videoRect);
int right = fullscreenButton.left - BUTTON_RIGHT_MARGIN - FULLSCREEN_BUTTON_LEFT_MARGIN; int right = fullscreenButton.left;
int left = right - BUTTON_WIDTH; int left = right - BUTTON_WIDTH;
return new Rect(left, fullscreenButton.top, right, fullscreenButton.bottom); return new Rect(left, fullscreenButton.top, right, fullscreenButton.bottom);
} }
......
chrome/test/data/android/media/simple_video.html
View file @ 6c4ad338
<html> <html>
<title>test</title> <title>test</title>
<body bgcolor="Silver"> <body bgcolor="Silver">
<video src="test.webm" controls id="video"></video> <!-- Width should be large enough to dispaly all media controls without needing
an overflow menu. -->
<video src="test.webm" controls id="video" width=500></video>
</body> </body>
</html> </html>
third_party/WebKit/LayoutTests/TestExpectations
View file @ 6c4ad338
...@@ -1262,4 +1262,16 @@ crbug.com/646598 [ Mac ] virtual/display_list_2d_canvas/fast/canvas/text-renderi ...@@ -1262,4 +1262,16 @@ crbug.com/646598 [ Mac ] virtual/display_list_2d_canvas/fast/canvas/text-renderi
crbug.com/646598 virtual/gpu/fast/canvas/text-rendering-frameless-canvas.html [ Skip ] crbug.com/646598 virtual/gpu/fast/canvas/text-rendering-frameless-canvas.html [ Skip ]
crbug.com/646598 fast/canvas/text-rendering-frameless-canvas.html [ Skip ] crbug.com/646598 fast/canvas/text-rendering-frameless-canvas.html [ Skip ]
crbug.com/492785 virtual/rootlayerscrolls/scrollbars/custom-scrollbar-reconstruction-on-inserting-style-sheet.html [ Failure ] crbug.com/492785 [ Linux Mac Win7 ] virtual/rootlayerscrolls/scrollbars/custom-scrollbar-reconstruction-on-inserting-style-sheet.html [ Failure ]
crbug.com/601247 [ Mac Linux Win ] virtual/android/fullscreen/video-controls-timeline.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux Win ] virtual/android/fullscreen/full-screen-iframe-allowed-video.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux Win ] http/tests/loading/image-picture-no-download-after-source-removal.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux Win ] virtual/android/fullscreen/video-scrolled-iframe.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux Win ] paint/invalidation/video-mute-repaint.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux Win ] paint/invalidation/video-unmute-repaint.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux ] compositing/video/video-controls-layer-creation.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac Linux ] media/video-zoom-controls.html [ NeedsRebaseline ]
crbug.com/601247 [ Linux ] http/tests/media/video-buffered-range-contains-currentTime.html [ NeedsRebaseline ]
crbug.com/601247 [ Mac ] media/controls-timeline.html [ NeedsRebaseline ]
crbug.com/601247 [ Linux ] fast/overflow/overflow-height-float-not-removed-crash3.html [ NeedsRebaseline ]
third_party/WebKit/LayoutTests/media/controls-after-unload-expected.html
View file @ 6c4ad338
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
<title>controls after unload</title> <title>controls after unload</title>
</head> </head>
<body> <body>
<video controls></video> <video src="foo.mp4" controls></video>
</body> </body>
</html> </html>
third_party/WebKit/LayoutTests/media/track/track-cue-rendering-after-controls-added-expected.html
View file @ 6c4ad338
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
font-size: 50px; font-size: 50px;
} }
</style> </style>
<video controls style="border:1px solid gray"> <!-- Width should be large enough to display all of the media controls. -->
<video controls style="border:1px solid gray; width: 500px;">
<source src="opera/track/webvtt/rendering/reftest/media/white.webm" type="video/webm"> <source src="opera/track/webvtt/rendering/reftest/media/white.webm" type="video/webm">
<source src="opera/track/webvtt/rendering/reftest/media/white.mp4" type="video/mp4"> <source src="opera/track/webvtt/rendering/reftest/media/white.mp4" type="video/mp4">
</video> </video>
......
third_party/WebKit/LayoutTests/media/track/track-cue-rendering-after-controls-added.html
View file @ 6c4ad338
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
font-size: 50px; font-size: 50px;
} }
</style> </style>
<video style="border:1px solid gray"> <!-- Width should be large enough to display all of the media controls. -->
<video style="border:1px solid gray; width: 500px;">
<source src="opera/track/webvtt/rendering/reftest/media/white.webm" type="video/webm"> <source src="opera/track/webvtt/rendering/reftest/media/white.webm" type="video/webm">
<source src="opera/track/webvtt/rendering/reftest/media/white.mp4" type="video/mp4"> <source src="opera/track/webvtt/rendering/reftest/media/white.mp4" type="video/mp4">
</video> </video>
......
third_party/WebKit/LayoutTests/media/video-controls-download-button-displayed.html
View file @ 6c4ad338
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
<video controls></video> <video controls></video>
<script> <script>
async_test(function(t) { async_test(function(t) {
if (window.internals)
window.internals.runtimeFlags.mediaControlsDownloadButtonEnabled = true;
// Set up video // Set up video
var video = document.querySelector("video"); var video = document.querySelector("video");
video.src = findMediaFile("video", "content/test"); video.src = findMediaFile("video", "content/test");
......
third_party/WebKit/LayoutTests/media/video-controls-download-button-saves-media.html
View file @ 6c4ad338
...@@ -15,8 +15,6 @@ if (window.testRunner) { ...@@ -15,8 +15,6 @@ if (window.testRunner) {
testRunner.waitUntilExternalURLLoad(); testRunner.waitUntilExternalURLLoad();
} }
async_test(function(t) { async_test(function(t) {
if (window.internals)
window.internals.runtimeFlags.mediaControlsDownloadButtonEnabled = true;
// Set up video // Set up video
var video = document.querySelector("video"); var video = document.querySelector("video");
video.src = findMediaFile("video", "content/test"); video.src = findMediaFile("video", "content/test");
......
third_party/WebKit/LayoutTests/media/video-controls-overflow-menu-correct-ordering.html
View file @ 6c4ad338
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<video controls></video> <video controls></video>
<script> <script>
async_test(function(t) { async_test(function(t) {
if (window.internals)
window.internals.runtimeFlags.mediaControlsDownloadButtonEnabled = true;
// Set up video // Set up video
var video = document.querySelector("video"); var video = document.querySelector("video");
video.src = findMediaFile("video", "content/test"); video.src = findMediaFile("video", "content/test");
......
third_party/WebKit/LayoutTests/media/video-controls-overflow-menu-download-button.html
View file @ 6c4ad338
...@@ -13,8 +13,6 @@ if (window.testRunner) { ...@@ -13,8 +13,6 @@ if (window.testRunner) {
testRunner.waitUntilExternalURLLoad(); testRunner.waitUntilExternalURLLoad();
} }
async_test(function(t) { async_test(function(t) {
if (window.internals)
window.internals.runtimeFlags.mediaControlsDownloadButtonEnabled = true;
// Set up video // Set up video
var video = document.querySelector("video"); var video = document.querySelector("video");
video.src = findMediaFile("video", "content/test"); video.src = findMediaFile("video", "content/test");
......
third_party/WebKit/LayoutTests/media/video-controls-overflow-menu-text.html
View file @ 6c4ad338
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<video controls></video> <video controls></video>
<script> <script>
async_test(function(t) { async_test(function(t) {
if (window.internals)
window.internals.runtimeFlags.mediaControlsDownloadButtonEnabled = true;
// Set up video // Set up video
var video = document.querySelector("video"); var video = document.querySelector("video");
video.src = findMediaFile("video", "content/test"); video.src = findMediaFile("video", "content/test");
......
third_party/WebKit/LayoutTests/media/video-controls-overflow-menu-updates-appropriately.html
View file @ 6c4ad338
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
<video controls></video> <video controls></video>
<script> <script>
async_test(function(t) { async_test(function(t) {
if (window.internals)
window.internals.runtimeFlags.mediaControlsDownloadButtonEnabled = true;
// Set up video // Set up video
var video = document.querySelector("video"); var video = document.querySelector("video");
video.src = findMediaFile("video", "content/test"); video.src = findMediaFile("video", "content/test");
......
third_party/WebKit/Source/core/html/shadow/MediaControls.cpp
View file @ 6c4ad338
...@@ -307,8 +307,7 @@ void MediaControls::reset() ...@@ -307,8 +307,7 @@ void MediaControls::reset()
refreshCastButtonVisibilityWithoutUpdate(); refreshCastButtonVisibilityWithoutUpdate();
if (RuntimeEnabledFeatures::mediaControlsDownloadButtonEnabled()) m_downloadButton->setIsWanted(m_downloadButton->shouldDisplayDownloadButton());
m_downloadButton->setIsWanted(m_downloadButton->shouldDisplayDownloadButton());
} }
LayoutObject* MediaControls::layoutObjectForTextTrackLayout() LayoutObject* MediaControls::layoutObjectForTextTrackLayout()
......
third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
View file @ 6c4ad338
...@@ -258,4 +258,3 @@ WebShare status=experimental, origin_trial_feature_name=WebShare ...@@ -258,4 +258,3 @@ WebShare status=experimental, origin_trial_feature_name=WebShare
Worklet status=experimental Worklet status=experimental
ParseHTMLOnMainThread status=test ParseHTMLOnMainThread status=test
SendBeaconThrowForBlobWithNonSimpleType status=experimental SendBeaconThrowForBlobWithNonSimpleType status=experimental
MediaControlsDownloadButton settable_from_internals=True
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