Revert 183623 "Fix fullscreen elements in pinch viewport mode."

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 48 matching lines @@
 #include "core/frame/Settings.h"
 #include "core/html/HTMLDocument.h"
 #include "core/html/HTMLFormElement.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/URLTestHelpers.h"
 #include "platform/DragImage.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/network/ResourceError.h"
 #include "platform/scroll/ScrollbarTheme.h"
 #include "platform/weborigin/SchemeRegistry.h"
@@ skipping 57 matching lines @@
         EXPECT_EQ((expected).y(), (actual).y()); \
     } while (false)
 
 #define EXPECT_FLOAT_POINT_EQ(expected, actual) \
     do { \
         EXPECT_FLOAT_EQ((expected).x(), (actual).x()); \
         EXPECT_FLOAT_EQ((expected).y(), (actual).y()); \
     } while (false)
 
 
+class FakeCompositingWebViewClient : public FrameTestHelpers::TestWebViewClient {
+public:
+    virtual bool enterFullScreen() override { return true; }
+};
+
 class WebFrameTest : public testing::Test {
 protected:
     WebFrameTest()
         : m_baseURL("http://internal.test/")
         , m_notBaseURL("http://external.test/")
         , m_chromeURL("chrome://")
     {
     }
 
     virtual ~WebFrameTest()
@@ skipping 519 matching lines @@
     runPendingTasks();
 }
 
 class FixedLayoutTestWebViewClient : public FrameTestHelpers::TestWebViewClient {
  public:
     virtual WebScreenInfo screenInfo() override { return m_screenInfo; }
 
     WebScreenInfo m_screenInfo;
 };
 
-class FakeCompositingWebViewClient : public FixedLayoutTestWebViewClient {
-public:
-    virtual bool enterFullScreen() override { return true; }
-};
-
 // Viewport settings need to be set before the page gets loaded
 static void enableViewportSettings(WebSettings* settings)
 {
     settings->setViewportMetaEnabled(true);
     settings->setViewportEnabled(true);
     settings->setMainFrameResizesAreOrientationChanges(true);
     settings->setShrinksViewportContentToFit(true);
 }
 
 // Helper function to set autosizing multipliers on a document.
@@ skipping 5393 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, 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();
-    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());
-
-}
-
 TEST_F(WebFrameTest, FullscreenLayerNonScrollable)
 {
     FakeCompositingWebViewClient client;
     registerMockedHttpURLLoad("fullscreen_div.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     int viewportWidth = 640;
     int viewportHeight = 480;
-    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, &configueCompositingWebView);
     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();
 
-    // Verify that the main frame is nonscrollable.
+    // Verify that the main frame bounds are empty.
     ASSERT_TRUE(Fullscreen::isFullScreen(*document));
     WebLayer* webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();
-    ASSERT_FALSE(webScrollLayer->userScrollableHorizontal());
-    ASSERT_FALSE(webScrollLayer->userScrollableVertical());
+    ASSERT_EQ(WebSize(), webScrollLayer->bounds());
 
     // Verify that the main frame is scrollable upon exiting fullscreen.
     webViewImpl->didExitFullScreen();
     webViewImpl->layout();
     ASSERT_FALSE(Fullscreen::isFullScreen(*document));
     webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();
-    ASSERT_TRUE(webScrollLayer->userScrollableHorizontal());
-    ASSERT_TRUE(webScrollLayer->userScrollableVertical());
+    ASSERT_NE(WebSize(), webScrollLayer->bounds());
 }
 
 TEST_F(WebFrameTest, FullscreenMainFrameScrollable)
 {
     FakeCompositingWebViewClient client;
     registerMockedHttpURLLoad("fullscreen_div.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     int viewportWidth = 640;
     int viewportHeight = 480;
-    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configurePinchVirtualViewport);
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, &configueCompositingWebView);
     webViewImpl->resize(WebSize(viewportWidth, viewportHeight));
     webViewImpl->layout();
 
     Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();
     UserGestureIndicator gesture(DefinitelyProcessingUserGesture);
     Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest);
     webViewImpl->didEnterFullScreen();
     webViewImpl->layout();
 
     // Verify that the main frame is still scrollable.
     ASSERT_TRUE(Fullscreen::isFullScreen(*document));
     WebLayer* webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();
     ASSERT_TRUE(webScrollLayer->scrollable());
-    ASSERT_TRUE(webScrollLayer->userScrollableHorizontal());
-    ASSERT_TRUE(webScrollLayer->userScrollableVertical());
 }
 
 TEST_F(WebFrameTest, RenderBlockPercentHeightDescendants)
 {
     registerMockedHttpURLLoad("percent-height-descendants.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "percent-height-descendants.html");
 
     WebView* webView = webViewHelper.webView();
     webView->resize(WebSize(800, 800));
@@ skipping 577 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