Don't show video fullscreen until DidEnterFullscreen() is called, and disable fullscreen for non-me…

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 21 matching lines @@
 #include "web/FullscreenController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/FullscreenElementStack.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLMediaElement.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebViewClient.h"
+#include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 
 using namespace WebCore;
 
 namespace blink {
 
 PassOwnPtr<FullscreenController> FullscreenController::create(WebViewImpl* webViewImpl)
 {
     return adoptPtr(new FullscreenController(webViewImpl));
 }
@@ skipping 32 matching lines @@
                 m_exitFullscreenPinchViewportOffset = m_webViewImpl->pinchViewportOffset();
                 m_webViewImpl->setPageScaleFactor(1.0f);
                 m_webViewImpl->setMainFrameScrollOffset(IntPoint());
                 m_webViewImpl->setPinchViewportOffset(FloatPoint());
             }
 
             FullscreenElementStack::from(*doc).webkitDidEnterFullScreenForElement(0);
             if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()) {
                 Element* element = FullscreenElementStack::currentFullScreenElementFrom(*doc);
                 ASSERT(element);
-                if (isHTMLMediaElement(*element) && m_webViewImpl->layerTreeView())
-                    m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
+                if (isHTMLMediaElement(*element)) {
+                    HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
+                    if (mediaElement->webMediaPlayer() && mediaElement->webMediaPlayer()->canEnterFullscreen()
+                        // FIXME: There is no embedder-side handling in layout test mode.
+                        && !isRunningLayoutTest()) {
+                        mediaElement->webMediaPlayer()->enterFullscreen();
+                    }
+                    if (m_webViewImpl->layerTreeView())
+                        m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
+                }
             }
         }
     }
 }
 
 void FullscreenController::willExitFullScreen()
 {
     if (!m_fullScreenFrame)
         return;
 
@@ skipping 33 matching lines @@
                 fullscreen->webkitDidExitFullScreenForElement(0);
             }
         }
     }
 
     m_fullScreenFrame.clear();
 }
 
 void FullscreenController::enterFullScreenForElement(WebCore::Element* element)
 {
+    if (m_webViewImpl->settingsImpl()->disallowFullscreenForNonMediaElements() && !isHTMLMediaElement(element))
+        return;
+
     // We are already transitioning to fullscreen for a different element.
     if (m_provisionalFullScreenElement) {
         m_provisionalFullScreenElement = element;
         return;
     }
 
     // We are already in fullscreen mode.
     if (m_fullScreenFrame) {
         m_provisionalFullScreenElement = element;
         willEnterFullScreen();
         didEnterFullScreen();
         return;
     }
 
-    if (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
-        && isHTMLMediaElement(element)
-        // FIXME: There is no embedder-side handling in layout test mode.
-        && !isRunningLayoutTest()) {
-        HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
-        if (mediaElement->webMediaPlayer() && mediaElement->webMediaPlayer()->canEnterFullscreen()) {
-            mediaElement->webMediaPlayer()->enterFullscreen();
-            m_provisionalFullScreenElement = element;
-            return;
-        }
-    }
-
     // 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 (RuntimeEnabledFeatures::overlayFullscreenVideoEnabled()
-        && isHTMLMediaElement(element)
-        // FIXME: There is no embedder-side handling in layout test mode.
-        && !isRunningLayoutTest()) {
-        HTMLMediaElement* mediaElement = toHTMLMediaElement(element);
-        if (mediaElement->webMediaPlayer())
-            mediaElement->webMediaPlayer()->exitFullscreen();
-        return;
-    }
     if (WebViewClient* client = m_webViewImpl->client())
         client->exitFullScreen();
 }
 
 }