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

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

Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index b294ca1d60e980d490c88ab563e0888c6ece2e20..3e150b99cbe38baa760d47c63fdf75868f6e8c22 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -1725,6 +1725,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Fullscreen::requestFullscreen(*element);
   webViewImpl->didEnterFullscreen();
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
   webViewImpl->updateAllLifecyclePhases();
 
   // Sanity-check. There should be no scrolling possible.
@@ -1738,10 +1739,12 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) {
   // 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(webViewImpl->mainFrameImpl()->frameView()->needsLayout());
   webViewImpl->didExitFullscreen();
   EXPECT_TRUE(webViewImpl->mainFrameImpl()->frameView()->needsLayout());
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
+  EXPECT_EQ(0, webViewImpl->mainFrame()->getScrollOffset().height);
   webViewImpl->updateAllLifecyclePhases();
-
   EXPECT_EQ(2000, webViewImpl->mainFrame()->getScrollOffset().height);
 }
 
@@ -1766,6 +1769,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Fullscreen::requestFullscreen(*element);
   webViewImpl->didEnterFullscreen();
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
   webViewImpl->updateAllLifecyclePhases();
 
   // Sanity-check. There should be no scrolling possible.
@@ -1781,6 +1785,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
   webViewImpl->didExitFullscreen();
   Fullscreen::requestFullscreen(*element);
   webViewImpl->didEnterFullscreen();
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
   webViewImpl->updateAllLifecyclePhases();
 
   // Sanity-check. There should be no scrolling possible.
@@ -1792,6 +1797,7 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) {
 
   // When we exit now, we should restore the original scroll value.
   webViewImpl->didExitFullscreen();
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
   webViewImpl->updateAllLifecyclePhases();
 
   EXPECT_EQ(2000, webViewImpl->mainFrame()->getScrollOffset().height);
@@ -1823,6 +1829,8 @@ TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
   UserGestureIndicator gesture(DocumentUserGestureToken::create(document));
   Fullscreen::requestFullscreen(*element);
   webViewImpl->didEnterFullscreen();
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
+  webViewImpl->updateAllLifecyclePhases();
 
   // Page scale factor must be 1.0 during fullscreen for elements to be sized
   // properly.
@@ -1834,6 +1842,7 @@ TEST_P(WebViewTest, EnterFullscreenResetScrollAndScaleState) {
 
   // Confirm that exiting fullscreen restores the parameters.
   webViewImpl->didExitFullscreen();
+  webViewImpl->beginFrame(WTF::monotonicallyIncreasingTime());
   webViewImpl->updateAllLifecyclePhases();
 
   EXPECT_EQ(2.0f, webViewImpl->pageScaleFactor());