Reland "Implement FullScreen using top layer."

third_party/WebKit/Source/web/FullscreenController.cpp

Index: third_party/WebKit/Source/web/FullscreenController.cpp
diff --git a/third_party/WebKit/Source/web/FullscreenController.cpp b/third_party/WebKit/Source/web/FullscreenController.cpp
index 39914a73940dcf01d9f2124f027be96f377eb904..13aef5e9500fb86cace18a265203ebeb0818487c 100644
--- a/third_party/WebKit/Source/web/FullscreenController.cpp
+++ b/third_party/WebKit/Source/web/FullscreenController.cpp
@@ -37,7 +37,6 @@
 #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"
@@ -131,6 +130,13 @@ void FullscreenController::didExitFullScreen()
 
 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;
@@ -166,6 +172,13 @@ 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;
@@ -182,9 +195,9 @@ void FullscreenController::updateSize()
 
     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)
@@ -216,4 +229,3 @@ DEFINE_TRACE(FullscreenController)
 }
 
 } // namespace blink
-