Reland "Sync requestFullscreen() and exitFullscreen() algorithms with the spec"

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 2012 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 1764 matching lines @@
   web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 2000));
   ASSERT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
 
   // Enter fullscreen.
   Document* document =
       web_view_impl->MainFrameImpl()->GetFrame()->GetDocument();
   Element* element = document->getElementById("fullscreenElement");
   UserGestureIndicator gesture(UserGestureToken::Create(document));
   Fullscreen::RequestFullscreen(*element);
   web_view_impl->DidEnterFullscreen();
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
   web_view_impl->UpdateAllLifecyclePhases();
 
   // Sanity-check. There should be no scrolling possible.
   ASSERT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
   ASSERT_EQ(0, web_view_impl->MainFrameImpl()
                    ->GetFrameView()
                    ->MaximumScrollOffset()
                    .Height());
 
   // Confirm that after exiting and doing a layout, the scroll and scale
   // parameters are reset. The page sets display: none on overflowing elements
   // while in fullscreen so if we try to restore before the style and layout
   // is applied the offsets will be clamped.
+  EXPECT_FALSE(web_view_impl->MainFrameImpl()->GetFrameView()->NeedsLayout());
   web_view_impl->DidExitFullscreen();
   EXPECT_TRUE(web_view_impl->MainFrameImpl()->GetFrameView()->NeedsLayout());
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
+  EXPECT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
   web_view_impl->UpdateAllLifecyclePhases();
-
   EXPECT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
 }
 
 // Tests that exiting and immediately reentering fullscreen doesn't cause the
 // scroll and scale restoration to occur when we enter fullscreen again.
 TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
   RegisterMockedHttpURLLoad("fullscreen_style.html");
   WebViewBase* web_view_impl =
       web_view_helper_.InitializeAndLoad(base_url_ + "fullscreen_style.html");
   web_view_impl->Resize(WebSize(800, 600));
   web_view_impl->UpdateAllLifecyclePhases();
 
   // Scroll the page down.
   web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 2000));
   ASSERT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
 
   // Enter fullscreen.
   Document* document =
       web_view_impl->MainFrameImpl()->GetFrame()->GetDocument();
   Element* element = document->getElementById("fullscreenElement");
   UserGestureIndicator gesture(UserGestureToken::Create(document));
   Fullscreen::RequestFullscreen(*element);
   web_view_impl->DidEnterFullscreen();
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
   web_view_impl->UpdateAllLifecyclePhases();
 
   // Sanity-check. There should be no scrolling possible.
   ASSERT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
   ASSERT_EQ(0, web_view_impl->MainFrameImpl()
                    ->GetFrameView()
                    ->MaximumScrollOffset()
                    .Height());
 
   // Exit and, without performing a layout, reenter fullscreen again. We
   // shouldn't try to restore the scroll and scale values when we layout to
   // enter fullscreen.
   web_view_impl->DidExitFullscreen();
   Fullscreen::RequestFullscreen(*element);
   web_view_impl->DidEnterFullscreen();
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
   web_view_impl->UpdateAllLifecyclePhases();
 
   // Sanity-check. There should be no scrolling possible.
   ASSERT_EQ(0, web_view_impl->MainFrame()->GetScrollOffset().height);
   ASSERT_EQ(0, web_view_impl->MainFrameImpl()
                    ->GetFrameView()
                    ->MaximumScrollOffset()
                    .Height());
 
   // When we exit now, we should restore the original scroll value.
   web_view_impl->DidExitFullscreen();
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
   web_view_impl->UpdateAllLifecyclePhases();
 
   EXPECT_EQ(2000, web_view_impl->MainFrame()->GetScrollOffset().height);
 }
 
 TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
   RegisterMockedHttpURLLoad("200-by-300.html");
   WebViewBase* web_view_impl =
       web_view_helper_.InitializeAndLoad(base_url_ + "200-by-300.html");
   web_view_impl->Resize(WebSize(100, 150));
@@ skipping 10 matching lines @@
   EXPECT_EQ(111, web_view_impl->MainFrame()->GetScrollOffset().height);
   EXPECT_EQ(12, web_view_impl->VisualViewportOffset().x);
   EXPECT_EQ(20, web_view_impl->VisualViewportOffset().y);
 
   Document* document =
       web_view_impl->MainFrameImpl()->GetFrame()->GetDocument();
   Element* element = document->body();
   UserGestureIndicator gesture(UserGestureToken::Create(document));
   Fullscreen::RequestFullscreen(*element);
   web_view_impl->DidEnterFullscreen();
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
+  web_view_impl->UpdateAllLifecyclePhases();
 
   // Page scale factor must be 1.0 during fullscreen for elements to be sized
   // properly.
   EXPECT_EQ(1.0f, web_view_impl->PageScaleFactor());
 
   // Make sure fullscreen nesting doesn't disrupt scroll/scale saving.
   Element* other_element = document->getElementById("content");
   Fullscreen::RequestFullscreen(*other_element);
 
   // Confirm that exiting fullscreen restores the parameters.
   web_view_impl->DidExitFullscreen();
+  web_view_impl->BeginFrame(WTF::MonotonicallyIncreasingTime());
   web_view_impl->UpdateAllLifecyclePhases();
 
   EXPECT_EQ(2.0f, web_view_impl->PageScaleFactor());
   EXPECT_EQ(94, web_view_impl->MainFrame()->GetScrollOffset().width);
   EXPECT_EQ(111, web_view_impl->MainFrame()->GetScrollOffset().height);
   EXPECT_EQ(12, web_view_impl->VisualViewportOffset().x);
   EXPECT_EQ(20, web_view_impl->VisualViewportOffset().y);
 }
 
 class PrintWebViewClient : public FrameTestHelpers::TestWebViewClient {
@@ skipping 2436 matching lines @@
   EXPECT_FALSE(frame_view->VisualViewportSuppliesScrollbars());
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     EXPECT_NE(nullptr,
               frame_view->LayoutViewportScrollableArea()->VerticalScrollbar());
   } else {
     EXPECT_NE(nullptr, frame_view->VerticalScrollbar());
   }
 }
 
 }  // namespace blink