Skip to content

GitLab

T
tangled
Commit fc3b5f8e authored by watk@chromium.org's avatar watk@chromium.org
Browse files
Options

Complete replacement of REF OverlayFullscreenVideo 

Replace the runtime feature OverlayFullscreenVideo by
ForceOverlayFullscreenVideo. A previous change allows WebMediaPlayer
to decide whether to do overlay video, so this is no longer needed. The
replacement allows the feature to be forced on for layout tests.

BUG=511376
TEST=virtual/android/fullscreen layout tests, manual

Review URL: https://codereview.chromium.org/1311763004

git-svn-id: svn://svn.chromium.org/blink/trunk@201253 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent c4327ae2
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 23 deletions
third_party/WebKit/LayoutTests/fullscreen/compositor-touch-hit-rects-fullscreen-video-controls.html
View file @ fc3b5f8e
...@@ -24,7 +24,7 @@ window.onload = function () { ...@@ -24,7 +24,7 @@ window.onload = function () {
logRects('handler'); logRects('handler');
waitForEvent(document, 'webkitfullscreenchange', function() { waitForEvent(document, 'webkitfullscreenchange', function() {
if (window.internals.runtimeFlags.overlayFullscreenVideoEnabled || window.internals.runtimeFlags.forceOverlayFullscreenVideoEnabled) if (window.internals.runtimeFlags.forceOverlayFullscreenVideoEnabled)
consoleWrite("Should report another rect which is not on the document"); consoleWrite("Should report another rect which is not on the document");
else else
consoleWrite("Should keep rect on document"); consoleWrite("Should keep rect on document");
......
third_party/WebKit/LayoutTests/fullscreen/full-screen-iframe-allowed-video.html
View file @ fc3b5f8e
<!DOCTYPE html> <!DOCTYPE html>
<script> <script>
if (window.internals) if (window.internals)
runPixelTests = internals.runtimeFlags.overlayFullscreenVideoEnabled || internals.runtimeFlags.forceOverlayFullscreenVideoEnabled; runPixelTests = internals.runtimeFlags.forceOverlayFullscreenVideoEnabled;
</script> </script>
<script src="full-screen-test.js"></script> <script src="full-screen-test.js"></script>
<script> <script>
......
third_party/WebKit/LayoutTests/fullscreen/video-controls-timeline.html
View file @ fc3b5f8e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<video id="video" width="300" controls></video> <video id="video" width="300" controls></video>
<script> <script>
if (window.internals) if (window.internals)
runPixelTests = internals.runtimeFlags.overlayFullscreenVideoEnabled || internals.runtimeFlags.forceOverlayFullscreenVideoEnabled; runPixelTests = internals.runtimeFlags.forceOverlayFullscreenVideoEnabled;
</script> </script>
<script src="full-screen-test.js"></script> <script src="full-screen-test.js"></script>
<script src="../media/media-controls.js"></script> <script src="../media/media-controls.js"></script>
......
third_party/WebKit/LayoutTests/fullscreen/video-fail-to-enter-full-screen.html
View file @ fc3b5f8e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<video id="video" width="300"></video> <video id="video" width="300"></video>
<script> <script>
if (window.internals) if (window.internals)
runPixelTests = internals.runtimeFlags.overlayFullscreenVideoEnabled || internals.runtimeFlags.forceOverlayFullscreenVideoEnabled; runPixelTests = internals.runtimeFlags.forceOverlayFullscreenVideoEnabled;
</script> </script>
<script src="full-screen-test.js"></script> <script src="full-screen-test.js"></script>
<script src="../media/media-controls.js"></script> <script src="../media/media-controls.js"></script>
......
third_party/WebKit/LayoutTests/fullscreen/video-specified-size.html
View file @ fc3b5f8e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<video id="video" width="300" controls></video> <video id="video" width="300" controls></video>
<script> <script>
if (window.internals) if (window.internals)
runPixelTests = internals.runtimeFlags.overlayFullscreenVideoEnabled || internals.runtimeFlags.forceOverlayFullscreenVideoEnabled; runPixelTests = internals.runtimeFlags.forceOverlayFullscreenVideoEnabled;
</script> </script>
<script src="full-screen-test.js"></script> <script src="full-screen-test.js"></script>
<script src=../media/media-file.js></script> <script src=../media/media-file.js></script>
......
third_party/WebKit/Source/core/html/HTMLVideoElement.cpp
View file @ fc3b5f8e
...@@ -250,13 +250,7 @@ bool HTMLVideoElement::usesOverlayFullscreenVideo() const ...@@ -250,13 +250,7 @@ bool HTMLVideoElement::usesOverlayFullscreenVideo() const
if (RuntimeEnabledFeatures::forceOverlayFullscreenVideoEnabled()) if (RuntimeEnabledFeatures::forceOverlayFullscreenVideoEnabled())
return true; return true;
// TODO(watk): Remove this and the REF check below when the chromium side change to not return webMediaPlayer() && webMediaPlayer()->supportsOverlayFullscreenVideo();
// set OverlayFullscreenVideo on Android lands. http://crbug.com/511376
if (HTMLMediaElement::isMediaStreamURL(sourceURL().string()))
return false;
return RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
|| (webMediaPlayer() && webMediaPlayer()->supportsOverlayFullscreenVideo());
} }
void HTMLVideoElement::didMoveToNewDocument(Document& oldDocument) void HTMLVideoElement::didMoveToNewDocument(Document& oldDocument)
......
third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in
View file @ fc3b5f8e
...@@ -106,10 +106,6 @@ NotificationConstructor status=stable ...@@ -106,10 +106,6 @@ NotificationConstructor status=stable
NotificationExperimental status=test NotificationExperimental status=test
Notifications status=stable Notifications status=stable
OrientationEvent OrientationEvent
// Only enabled on Android, and for certain layout tests on Linux.
// TODO(watk): Delete this in favor of ForceOverlayFullscreenVideo after
// removing chromium's dependency on it. http://crbug.com/511376
OverlayFullscreenVideo
// For simulating Android's overlay fullscreen video in layout tests on Linux. // For simulating Android's overlay fullscreen video in layout tests on Linux.
ForceOverlayFullscreenVideo ForceOverlayFullscreenVideo
OverlayScrollbars OverlayScrollbars
......
third_party/WebKit/Source/web/WebRuntimeFeatures.cpp
View file @ fc3b5f8e
...@@ -259,11 +259,6 @@ void WebRuntimeFeatures::enableOverlayScrollbars(bool enable) ...@@ -259,11 +259,6 @@ void WebRuntimeFeatures::enableOverlayScrollbars(bool enable)
RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enable); RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(enable);
} }
void WebRuntimeFeatures::enableOverlayFullscreenVideo(bool enable)
{
RuntimeEnabledFeatures::setOverlayFullscreenVideoEnabled(enable);
}
void WebRuntimeFeatures::forceOverlayFullscreenVideo(bool enable) void WebRuntimeFeatures::forceOverlayFullscreenVideo(bool enable)
{ {
RuntimeEnabledFeatures::setForceOverlayFullscreenVideoEnabled(enable); RuntimeEnabledFeatures::setForceOverlayFullscreenVideoEnabled(enable);
......
third_party/WebKit/public/web/WebRuntimeFeatures.h
View file @ fc3b5f8e
...@@ -134,8 +134,6 @@ public: ...@@ -134,8 +134,6 @@ public:
BLINK_EXPORT static void enableOverlayScrollbars(bool); BLINK_EXPORT static void enableOverlayScrollbars(bool);
BLINK_EXPORT static void enableOverlayFullscreenVideo(bool);
BLINK_EXPORT static void forceOverlayFullscreenVideo(bool); BLINK_EXPORT static void forceOverlayFullscreenVideo(bool);
BLINK_EXPORT static void enableSharedWorker(bool); BLINK_EXPORT static void enableSharedWorker(bool);
......
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