Refactor overlay fullscreen video handling into a single callback

third_party/WebKit/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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/FullscreenController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Fullscreen.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/PageScaleConstraintsSet.h"
-#include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/layout/LayoutFullScreen.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/web/WebFrameClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebSettingsImpl.h"
 #include "web/WebViewImpl.h"
 
 namespace blink {
@@ skipping 24 matching lines @@
     updatePageScaleConstraints(false);
     m_webViewImpl->setPageScaleFactor(1.0f);
     if (m_webViewImpl->mainFrame()->isWebLocalFrame())
       m_webViewImpl->mainFrame()->setScrollOffset(WebSize());
     m_webViewImpl->setVisualViewportOffset(FloatPoint());
     m_haveEnteredFullscreen = true;
   }
 
   Fullscreen::from(document).didEnterFullscreenForElement(element);
   DCHECK_EQ(Fullscreen::currentFullScreenElementFrom(document), element);
-
-  if (isHTMLVideoElement(element)) {
-    HTMLVideoElement* videoElement = toHTMLVideoElement(element);
-    if (videoElement->usesOverlayFullscreenVideo() &&
-        m_webViewImpl->layerTreeView())
-      m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
-  }
 }
 
 void FullscreenController::didExitFullscreen() {
   if (!m_fullscreenFrame)
     return;
 
   if (m_haveEnteredFullscreen)
     updatePageScaleConstraints(true);
 
   if (Document* document = m_fullscreenFrame->document()) {
     if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*document)) {
       Element* element = fullscreen->currentFullScreenElement();
       if (element) {
         // When the client exits from full screen we have to call
         // fullyExitFullscreen to notify the document. While doing that,
         // suppress notifications back to the client.
         m_isCancelingFullscreen = true;
         Fullscreen::fullyExitFullscreen(*document);
         m_isCancelingFullscreen = false;
 
-        // If the video used overlay fullscreen mode, the background was made
-        // transparent. Restore the transparency.
-        if (isHTMLVideoElement(element) && m_webViewImpl->layerTreeView())
-          m_webViewImpl->layerTreeView()->setHasTransparentBackground(
-              m_webViewImpl->isTransparent());
-
         // We need to wait until style and layout are updated in order
         // to propertly restore scroll offsets since content may not be
         // overflowing in the same way until they do.
         if (m_haveEnteredFullscreen)
           m_needsScrollAndScaleRestore = true;
 
         fullscreen->didExitFullscreen();
       }
     }
   }
@@ skipping 46 matching lines @@
 
   // The client is exiting full screen, so don't send a notification.
   if (m_isCancelingFullscreen)
     return;
 
   WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(frame);
   if (webFrame && webFrame->client())
     webFrame->client()->exitFullscreen();
 }
 
+void FullscreenController::fullscreenElementChanged(Element* fromElement,
+                                                    Element* toElement) {
+  DCHECK_NE(fromElement, toElement);

[foolip, 2016/11/28 16:20:10]

Turns out this assert can actually fail for the "request then exit+request" case
in https://github.com/whatwg/fullscreen/issues/63 so I'll make sure there's an
equivalent test and fix this before landing.

[foolip, 2016/11/29 15:21:30]

I've fixed that now, this is now ready to land after
https://codereview.chromium.org/2527093003

+
+  if (toElement) {
+    DCHECK(Fullscreen::isCurrentFullScreenElement(*toElement));
+
+    if (isHTMLVideoElement(*toElement)) {
+      HTMLVideoElement& videoElement = toHTMLVideoElement(*toElement);
+      videoElement.didEnterFullscreen();
+
+      // If the video uses overlay fullscreen mode, make the background
+      // transparent.
+      if (videoElement.usesOverlayFullscreenVideo() &&
+          m_webViewImpl->layerTreeView()) {
+        m_webViewImpl->layerTreeView()->setHasTransparentBackground(true);
+      }
+    }
+  }
+
+  if (fromElement) {
+    DCHECK(!Fullscreen::isCurrentFullScreenElement(*fromElement));
+
+    if (isHTMLVideoElement(*fromElement)) {
+      // If the video used overlay fullscreen mode, restore the transparency.
+      if (m_webViewImpl->layerTreeView()) {
+        m_webViewImpl->layerTreeView()->setHasTransparentBackground(
+            m_webViewImpl->isTransparent());
+      }
+
+      HTMLVideoElement& videoElement = toHTMLVideoElement(*fromElement);
+      videoElement.didExitFullscreen();
+    }
+  }
+}
+
 void FullscreenController::updateSize() {
   if (!isFullscreen())
     return;
 
   updatePageScaleConstraints(false);
 
   LayoutFullScreen* layoutObject =
       Fullscreen::from(*m_fullscreenFrame->document()).fullScreenLayoutObject();
   if (layoutObject)
     layoutObject->updateStyle();
@@ skipping 40 matching lines @@
 
   m_webViewImpl->updateMainFrameLayoutSize();
 }
 
 DEFINE_TRACE(FullscreenController) {
   visitor->trace(m_provisionalFullscreenElement);
   visitor->trace(m_fullscreenFrame);
 }
 
 }  // namespace blink