Support subtitles for native fullscreen video

Source/web/FullscreenController.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "FullscreenController.h"
 
+#include "RuntimeEnabledFeatures.h"
 #include "WebFrame.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "core/dom/Document.h"
 #include "core/dom/FullscreenElementStack.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/page/Frame.h"
+#include "core/platform/LayoutTestSupport.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 PassOwnPtr<FullscreenController> FullscreenController::create(WebViewImpl* webViewImpl)
 {
     return adoptPtr(new FullscreenController(webViewImpl));
 }
 
@@ skipping 25 matching lines @@
 
     if (Document* doc = m_fullScreenFrame->document()) {
         if (FullscreenElementStack::isFullScreen(doc)) {
             if (!m_exitFullscreenPageScaleFactor) {
                 m_exitFullscreenPageScaleFactor = m_webViewImpl->pageScaleFactor();
                 m_exitFullscreenScrollOffset = m_webViewImpl->mainFrame()->scrollOffset();
                 m_webViewImpl->setPageScaleFactorPreservingScrollOffset(1.0f);
             }
 
             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);
+                }
+            }
         }
     }
 }
 
 void FullscreenController::willExitFullScreen()
 {
     if (!m_fullScreenFrame)
         return;
 
     if (Document* doc = m_fullScreenFrame->document()) {
         FullscreenElementStack* fullscreen = FullscreenElementStack::fromIfExists(doc);
         if (!fullscreen)
             return;
         if (fullscreen->isFullScreen(doc)) {
             // When the client exits from full screen we have to call webkitCancelFullScreen to
             // notify the document. While doing that, suppress notifications back to the client.
             m_isCancelingFullScreen = true;
             fullscreen->webkitCancelFullScreen();
             m_isCancelingFullScreen = false;
             fullscreen->webkitWillExitFullScreenForElement(0);
+            if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled() && m_webViewImpl->layerTreeView())
+                m_webViewImpl->layerTreeView()->setHasTransparentBackground(m_webViewImpl->isTransparent());
         }
     }
 }
 
 void FullscreenController::didExitFullScreen()
 {
     if (!m_fullScreenFrame)
         return;
 
     if (Document* doc = m_fullScreenFrame->document()) {
@@ skipping 23 matching lines @@
     }
 
     // We are already in fullscreen mode.
     if (m_fullScreenFrame) {
         m_provisionalFullScreenElement = element;
         willEnterFullScreen();
         didEnterFullScreen();
         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()) {
         if (client->enterFullScreen())
             m_provisionalFullScreenElement = element;
     }
 }
 
 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();
 }
 
 }