Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1113)

Unified Diff: Source/web/FullscreenController.cpp

Issue 284913002: Revert of Don't show video fullscreen until DidEnterFullscreen() is called (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/FullscreenController.cpp
diff --git a/Source/web/FullscreenController.cpp b/Source/web/FullscreenController.cpp
index 7cac4ff07499a4288b0cd1cd7186cc88ad8306a8..44a6b33be6f5178601947040ac3f79372139e78b 100644
--- a/Source/web/FullscreenController.cpp
+++ b/Source/web/FullscreenController.cpp
@@ -89,16 +89,8 @@
if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) {
Element* element = FullscreenElementStack::currentFullScreenElementFrom(*doc);
ASSERT(element);
- if (isHTMLMediaElement(*element)) {
- HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
- if (mediaElement->player() && mediaElement->player()->canShowFullscreenOverlay()
- // FIXME: There is no embedder-side handling in layout test mode.
- && !isRunningLayoutTest()) {
- mediaElement->player()->showFullscreenOverlay();
- }
- if (m_webViewImpl->layerTreeView())
- m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
- }
+ if (isHTMLMediaElement(*element) && m_webViewImpl->layerTreeView())
+ m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
}
}
}
@@ -166,6 +158,18 @@
return;
}
+ if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
+ && isHTMLMediaElement(element)
+ // FIXME: There is no embedder-side handling in layout test mode.
+ && !isRunningLayoutTest()) {
+ HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
+ if (mediaElement->player() && mediaElement->player()->canShowFullscreenOverlay()) {
+ mediaElement->player()->showFullscreenOverlay();
+ m_provisionalFullScreenElement = element;
+ return;
+ }
+ }
+
// We need to transition to fullscreen mode.
if (WebViewClient* client = m_webViewImpl->client()) {
if (client->enterFullScreen())
@@ -178,7 +182,15 @@
// The client is exiting full screen, so don't send a notification.
if (m_isCancelingFullScreen)
return;
-
+ if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
+ && isHTMLMediaElement(element)
+ // FIXME: There is no embedder-side handling in layout test mode.
+ && !isRunningLayoutTest()) {
+ HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
+ if (mediaElement->player())
+ mediaElement->player()->hideFullscreenOverlay();
+ return;
+ }
if (WebViewClient* client = m_webViewImpl->client())
client->exitFullScreen();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698