Test both viewports' scrollability during fullscreen-video

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 6505 matching lines @@
     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 viewports are nonscrollable.
     ASSERT_TRUE(Fullscreen::isFullScreen(*document));
-    WebLayer* webScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();
-    ASSERT_FALSE(webScrollLayer->userScrollableHorizontal());
-    ASSERT_FALSE(webScrollLayer->userScrollableVertical());
+    FrameView* frameView = webViewHelper.webViewImpl()->mainFrameImpl()->frameView();
+    WebLayer* layoutViewportScrollLayer = webViewImpl->compositor()->scrollLayer()->platformLayer();

[bokan, 2015/08/18 12:35:49]

It's probably slightly more clear to get this via
frameView->layoutViewportScrollableArea()->scrollLayer()

[Hugo Holgersson, 2015/08/20 21:12:56]

Hmm, I got a compile error when I tried that.

[Hugo Holgersson, 2015/08/21 17:28:47]

Let's keep this lookup unchanged for now.

+    WebLayer* visualViewportScrollLayer = frameView->page()->frameHost().visualViewport().scrollLayer()->platformLayer();
+    ASSERT_FALSE(layoutViewportScrollLayer->userScrollableHorizontal());
+    ASSERT_FALSE(layoutViewportScrollLayer->userScrollableVertical());
+    ASSERT_FALSE(visualViewportScrollLayer->userScrollableHorizontal());
+    ASSERT_FALSE(visualViewportScrollLayer->userScrollableVertical());
 
-    // Verify that the main frame is scrollable upon exiting fullscreen.
+    // Verify that the viewports are 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_TRUE(layoutViewportScrollLayer->userScrollableHorizontal());
+    ASSERT_TRUE(layoutViewportScrollLayer->userScrollableVertical());
+    ASSERT_TRUE(visualViewportScrollLayer->userScrollableHorizontal());
+    ASSERT_TRUE(visualViewportScrollLayer->userScrollableVertical());
 }
 
 TEST_P(ParameterizedWebFrameTest, FullscreenMainFrame)
 {
     FakeCompositingWebViewClient client;
     registerMockedHttpURLLoad("fullscreen_div.html");
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     int viewportWidth = 640;
     int viewportHeight = 480;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "fullscreen_div.html", true, 0, &client, configureAndroid);
@@ skipping 1491 matching lines @@
 
 TEST_F(WebFrameTest, MaxFramesDetach)
 {
     registerMockedHttpURLLoad("max-frames-detach.html");
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "max-frames-detach.html", true);
     webViewImpl->mainFrameImpl()->collectGarbage();
 }
 
 } // namespace blink