Reland "Implement FullScreen using top layer."

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 19 matching lines @@
 
 #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 {
 
 FullscreenController* FullscreenController::create(WebViewImpl* webViewImpl)
@@ skipping 73 matching lines @@
             }
         }
     }
 
     m_haveEnteredFullscreen = false;
     m_fullScreenFrame.clear();
 }
 
 void FullscreenController::enterFullScreenForElement(Element* element)
 {
+    // TODO(dsinclair): This should not be needed because we addToTopLayer
+    // in Fullscreen::pushFullscreenElementStack but, the WebView code doesn't
+    // call Fullscreen::requestFullscreen() and, instead, just enters and
+    // exists itself. This should be unified so there is one way to go
+    // fullscreen.  crbug.com/538158
+    element->document().addToTopLayer(element);
+
     // 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;
         didEnterFullScreen();
@@ skipping 15 matching lines @@
         if (!Fullscreen::from(element->document()).forCrossProcessAncestor())
             frame->client()->enterFullscreen();
         m_provisionalFullScreenElement = element;
     }
 }
 
 void FullscreenController::exitFullScreenForElement(Element* element)
 {
     DCHECK(element);
 
+    // TODO(dsinclair): This should not be needed because we addToTopLayer
+    // in Fullscreen::popFullscreenElementStack but, the WebView code doesn't
+    // call Fullscreen::requestFullscreen() and, instead, just enters and
+    // exists itself. This should be unified so there is one way to go
+    // fullscreen.  crbug.com/538158
+    element->document().removeFromTopLayer(element);
+
     // The client is exiting full screen, so don't send a notification.
     if (m_isCancelingFullScreen)
         return;
 
     WebLocalFrameImpl* frame = WebLocalFrameImpl::fromFrame(element->document().frame());
     if (frame && frame->client())
         frame->client()->exitFullscreen();
 }
 
 void FullscreenController::updateSize()
 {
     if (!isFullscreen())
         return;
 
     updatePageScaleConstraints(false);
 
-    LayoutFullScreen* layoutObject = Fullscreen::from(*m_fullScreenFrame->document()).fullScreenLayoutObject();
-    if (layoutObject)
-        layoutObject->updateStyle();
+    Document* document = m_fullScreenFrame->document();
+    if (Element* fullscreenElement = Fullscreen::currentFullScreenElementFrom(*document))
+        Fullscreen::from(fullscreenElement->document()).didUpdateSize(*fullscreenElement);
 }
 
 void FullscreenController::updatePageScaleConstraints(bool removeConstraints)
 {
     PageScaleConstraints fullscreenConstraints;
     if (!removeConstraints) {
         fullscreenConstraints = PageScaleConstraints(1.0, 1.0, 1.0);
         fullscreenConstraints.layoutSize = FloatSize(m_webViewImpl->size());
     }
     m_webViewImpl->pageScaleConstraintsSet().setFullscreenConstraints(fullscreenConstraints);
@@ skipping 11 matching lines @@
     m_webViewImpl->updateMainFrameLayoutSize();
 }
 
 DEFINE_TRACE(FullscreenController)
 {
     visitor->trace(m_provisionalFullScreenElement);
     visitor->trace(m_fullScreenFrame);
 }
 
 } // namespace blink
-