Support subtitles for native fullscreen video

Source/web/FullscreenController.cpp

Index: Source/web/FullscreenController.cpp
diff --git a/Source/web/FullscreenController.cpp b/Source/web/FullscreenController.cpp
index f4154f9cfc598a860636a6582b78e4666178ce34..b03052cd02504231938bfb778d3fcb577ba90cfa 100644
--- a/Source/web/FullscreenController.cpp
+++ b/Source/web/FullscreenController.cpp
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "FullscreenController.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include "WebFrame.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
@@ -38,6 +39,7 @@
 #include "core/dom/FullscreenElementStack.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/page/Frame.h"
+#include "core/platform/LayoutTestSupport.h"
 
 using namespace WebCore;
 
@@ -83,6 +85,12 @@ void FullscreenController::didEnterFullScreen()
             }
 
             FullscreenElementStack::from(doc)->webkitDidEnterFullScreenForElement(0);
+            if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) {
+                if (Element* element = FullscreenElementStack::currentFullScreenElementFrom(doc)) {

[esprehn, 2013/09/13 02:46:07]

How can this Element be null? If this document is full screen shouldn't this
always be non-null per the top level if statement? It's very suspect that we
allow a Document to do didEnterFullScreen but have a null full screen element.

[trchen, 2013/09/13 05:14:58]

I'll change it to an ASSERT too. ;)

+                    if (element->isMediaElement() && m_webViewImpl->layerTreeView())
+                        m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
+                }
+            }
         }
     }
 }
@@ -103,6 +111,8 @@ void FullscreenController::willExitFullScreen()
             fullscreen->webkitCancelFullScreen();
             m_isCancelingFullScreen = false;
             fullscreen->webkitWillExitFullScreenForElement(0);
+            if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && m_webViewImpl->layerTreeView())
+                m_webViewImpl->layerTreeView()->setHasTransparentBackground(m_webViewImpl->isTransparent());
         }
     }
 }
@@ -146,16 +156,17 @@ void FullscreenController::enterFullScreenForElement(WebCore::Element* element)
         return;
     }
 
-#if USE(NATIVE_FULLSCREEN_VIDEO)
-    if (element && element->isMediaElement()) {
+    if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
+        && element && element->isMediaElement()
+        // FIXME: There is no embedder-side handling in layout test mode.

[esprehn, 2013/09/13 02:46:07]

What does this mean?

[trchen, 2013/09/13 05:14:58]

In layout test mode there is no real hardware overlaid media player, so
mediaElement->player()->canShowFullscreenOverlay() will always return false. As
a result, the video won't be able to enter fullscreen in a layout test. It is
okay for us to use the regular IPC in the test, since the special IPC only does
extra things that are irrelevant to the renderer.

+        && !isRunningLayoutTest()) {
         HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
-        if (mediaElement->player() && mediaElement->player()->canEnterFullscreen()) {
-            mediaElement->player()->enterFullscreen();
+        if (mediaElement->player() && mediaElement->player()->canShowFullscreenOverlay()) {
+            mediaElement->player()->showFullscreenOverlay();
             m_provisionalFullScreenElement = element;
+            return;
         }
-        return;
     }
-#endif
 
     // We need to transition to fullscreen mode.
     if (WebViewClient* client = m_webViewImpl->client()) {
@@ -169,14 +180,15 @@ void FullscreenController::exitFullScreenForElement(WebCore::Element* element)
     // The client is exiting full screen, so don't send a notification.
     if (m_isCancelingFullScreen)
         return;
-#if USE(NATIVE_FULLSCREEN_VIDEO)
-    if (element && element->isMediaElement()) {
+    if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
+        && element && element->isMediaElement()
+        // FIXME: There is no embedder-side handling in layout test mode.
+        && !isRunningLayoutTest()) {
         HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
         if (mediaElement->player())
-            mediaElement->player()->exitFullscreen();
+            mediaElement->player()->hideFullscreenOverlay();
         return;
     }
-#endif
     if (WebViewClient* client = m_webViewImpl->client())
         client->exitFullScreen();
 }