Replace RenderFullscreen with top layer - Take II

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 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 50 matching lines @@
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/loader/DocumentThreadableLoader.h"
 #include "core/loader/DocumentThreadableLoaderClient.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/ThreadableLoader.h"
 #include "core/page/EventHandler.h"
 #include "core/page/Page.h"
 #include "core/rendering/HitTestResult.h"
-#include "core/rendering/RenderFullScreen.h"
 #include "core/rendering/RenderView.h"
 #include "core/rendering/compositing/RenderLayerCompositor.h"
 #include "core/testing/NullExecutionContext.h"
 #include "core/testing/URLTestHelpers.h"
 #include "modules/mediastream/MediaStream.h"
 #include "modules/mediastream/MediaStreamRegistry.h"
 #include "platform/DragImage.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/geometry/FloatRect.h"
@@ skipping 6083 matching lines @@
     // Show the top controls by just 1px, since we're zoomed in to 2X, that
     // should allow an extra 0.5px of scrolling, but since we quantize to ints
     // it should clamp such that we don't show anything outside bounds.
     webView->applyViewportDeltas(WebSize(0, 0), 1.0f, 1.0f);
     EXPECT_POINT_EQ(IntPoint(50, 50), frameView->maximumScrollPosition());
 
     webView->applyViewportDeltas(WebSize(0, 0), 1.0f, 2.0f);
     EXPECT_POINT_EQ(IntPoint(50, 51), frameView->maximumScrollPosition());
 }
 
+TEST_F(WebFrameTest, FullscreenCleanTopLayerAndFullscreenStack)
+{
+    FakeCompositingWebViewClient client;
+    registerMockedHttpURLLoad("fullscreen_div.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    int viewportWidth = 640;
+    int viewportHeight = 480;
+    client.m_screenInfo.rect.width = viewportWidth;
+    client.m_screenInfo.rect.height = viewportHeight;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
+    webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
+    webViewImpl->layout();
+
+    UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
+    Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();
+    Fullscreen& fullscreen = Fullscreen::from(*document);
+
+    Element* divFullscreen = document->getElementById("div1");
+    fullscreen.requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
+    webViewImpl->didEnterFullScreen();
+    ASSERT_TRUE(Fullscreen::isFullScreen(*document));
+
+    // Sanity check. We should have both in our stack.
+    ASSERT_EQ(fullscreen.fullScreenElementStack().size(), 1UL);
+    ASSERT_EQ(document->topLayerElements().size(), 2UL);
+
+    fullscreen.exitFullscreen();
+    webViewImpl->didExitFullScreen();
+
+    ASSERT_EQ(fullscreen.fullScreenElementStack().size(), 0UL);
+    ASSERT_EQ(document->topLayerElements().size(), 0UL);
+}
+
 TEST_F(WebFrameTest, FullscreenLayerSize)
 {
     FakeCompositingWebViewClient client;
     registerMockedHttpURLLoad("fullscreen_div.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     int viewportWidth = 640;
     int viewportHeight = 480;
     client.m_screenInfo.rect.width = viewportWidth;
     client.m_screenInfo.rect.height = viewportHeight;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
     webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
     webViewImpl->layout();
 
     Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();
     UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
     Element* divFullscreen = document->getElementById("div1");
     Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
     webViewImpl->didEnterFullScreen();
     webViewImpl->layout();
     ASSERT_TRUE(Fullscreen::isFullScreen(*document));
 
     // Verify that the element is sized to the viewport.
-    RenderFullScreen* fullscreenRenderer = Fullscreen::from(*document).fullScreenRenderer();
+    Element* fullscreenElement = Fullscreen::currentFullScreenElementFrom(*document);
+    RenderBox* fullscreenRenderer = toRenderBox(fullscreenElement->renderer());
     EXPECT_EQ(viewportWidth, fullscreenRenderer->logicalWidth().toInt());
     EXPECT_EQ(viewportHeight, fullscreenRenderer->logicalHeight().toInt());
 
     // Verify it's updated after a device rotation.
     client.m_screenInfo.rect.width = viewportHeight;
     client.m_screenInfo.rect.height = viewportWidth;
     webViewImpl->resize(WebSize(viewportHeight, viewportWidth));
     webViewImpl->layout();
     EXPECT_EQ(viewportHeight, fullscreenRenderer->logicalWidth().toInt());
     EXPECT_EQ(viewportWidth, fullscreenRenderer->logicalHeight().toInt());
@@ skipping 78 matching lines @@
     webViewImpl->layout();
 
     Document* document = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame()->firstChild())->frame()->document();
     UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
     Element* divFullscreen = document->getElementById("div1");
     Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
     webViewImpl->didEnterFullScreen();
     webViewImpl->layout();
 
     // Verify that the element is sized to the viewport.
-    RenderFullScreen* fullscreenRenderer = Fullscreen::from(*document).fullScreenRenderer();
+    Element* fullscreenElement = Fullscreen::currentFullScreenElementFrom(*document);
+    RenderBox* fullscreenRenderer = toRenderBox(fullscreenElement->renderer());
     EXPECT_EQ(viewportWidth, fullscreenRenderer->logicalWidth().toInt());
     EXPECT_EQ(viewportHeight, fullscreenRenderer->logicalHeight().toInt());
 
     // Verify it's updated after a device rotation.
     client.m_screenInfo.rect.width = viewportHeight;
     client.m_screenInfo.rect.height = viewportWidth;
     webViewImpl->resize(WebSize(viewportHeight, viewportWidth));
     webViewImpl->layout();
     EXPECT_EQ(viewportHeight, fullscreenRenderer->logicalWidth().toInt());
     EXPECT_EQ(viewportWidth, fullscreenRenderer->logicalHeight().toInt());
@@ skipping 617 matching lines @@
     EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
 
     // Neither should a page reload.
     localFrame->reload();
     EXPECT_EQ(4u, frameClient.provisionalLoadCount());
     EXPECT_FALSE(frameClient.wasLastProvisionalLoadATransition());
     EXPECT_EQ(1u, frameClient.navigationalDataReceivedCount());
 }
 
 } // namespace