third_party/WebKit/Source/web/tests/WebFrameTest.cpp - Issue 2139303002: Clean up around methods to enter/exit fullscreen

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2139303002: Clean up around methods to enter/exit fullscreen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

index 12fa42170efcdce20439f7fbddd4b50aa80fb6ec..ed4ac67ca0dff77b64f86e395217f86e2070a114 100644

--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp

@@ -6470,7 +6470,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenLayerSize)

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Element* divFullscreen = document->getElementById("div1");

Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

ASSERT_TRUE(Fullscreen::isFullScreen(*document));

@@ -6503,7 +6503,7 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Element* divFullscreen = document->getElementById("div1");

Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

// Verify that the viewports are nonscrollable.

@@ -6517,7 +6517,7 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)

ASSERT_FALSE(visualViewportScrollLayer->userScrollableVertical());

// Verify that the viewports are scrollable upon exiting fullscreen.

- webViewImpl->didExitFullScreen();

+ webViewImpl->didExitFullscreen();

webViewImpl->updateAllLifecyclePhases();

ASSERT_FALSE(Fullscreen::isFullScreen(*document));

ASSERT_TRUE(layoutViewportScrollLayer->userScrollableHorizontal());

@@ -6540,7 +6540,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenMainFrame)

Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

// Verify that the main frame is still scrollable.

@@ -6575,7 +6575,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenSubframe)

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Element* divFullscreen = document->getElementById("div1");

Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

// Verify that the element is sized to the viewport.

@@ -6615,7 +6615,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenWithTinyViewport)

Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

EXPECT_EQ(384, layoutViewItem.logicalWidth().floor());

EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());

@@ -6623,7 +6623,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenWithTinyViewport)

EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());

EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());

- webViewImpl->didExitFullScreen();

+ webViewImpl->didExitFullscreen();

webViewImpl->updateAllLifecyclePhases();

EXPECT_EQ(320, layoutViewItem.logicalWidth().floor());

EXPECT_EQ(533, layoutViewItem.logicalHeight().floor());

@@ -6649,7 +6649,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenResizeWithTinyViewport)

Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

EXPECT_EQ(384, layoutViewItem.logicalWidth().floor());

EXPECT_EQ(640, layoutViewItem.logicalHeight().floor());

@@ -6669,7 +6669,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenResizeWithTinyViewport)

EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());

EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());

- webViewImpl->didExitFullScreen();

+ webViewImpl->didExitFullscreen();

webViewImpl->updateAllLifecyclePhases();

EXPECT_EQ(320, layoutViewItem.logicalWidth().floor());

EXPECT_EQ(192, layoutViewItem.logicalHeight().floor());

@@ -6708,7 +6708,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenRestoreScaleFactorUponExiting)

Fullscreen::from(*document).requestFullscreen(*document->body(), Fullscreen::PrefixedRequest);

}

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

client.m_screenInfo.rect.width = screenSizeMinusStatusBars.width;

client.m_screenInfo.rect.height = screenSizeMinusStatusBars.height;

@@ -6722,7 +6722,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenRestoreScaleFactorUponExiting)

EXPECT_FLOAT_EQ(1.0, webViewImpl->minimumPageScaleFactor());

EXPECT_FLOAT_EQ(1.0, webViewImpl->maximumPageScaleFactor());

- webViewImpl->didExitFullScreen();

+ webViewImpl->didExitFullscreen();

webViewImpl->updateAllLifecyclePhases();

client.m_screenInfo.rect.width = screenSizeMinusStatusBars.width;

client.m_screenInfo.rect.height = screenSizeMinusStatusBars.height;

@@ -6772,7 +6772,7 @@ TEST_P(ParameterizedWebFrameTest, ClearFullscreenConstraintsOnNavigation)

UserGestureIndicator gesture(DefinitelyProcessingUserGesture);

Fullscreen::from(*document).requestFullscreen(

*document->documentElement(), Fullscreen::PrefixedRequest);

- webViewImpl->didEnterFullScreen();

+ webViewImpl->didEnterFullscreen();

webViewImpl->updateAllLifecyclePhases();

// Entering fullscreen causes layout size and page scale limits to be

@@ -6789,7 +6789,7 @@ TEST_P(ParameterizedWebFrameTest, ClearFullscreenConstraintsOnNavigation)

KURL testURL = toKURL("about:blank");

WebFrame* frame = webViewHelper.webView()->mainFrame();

FrameTestHelpers::loadHTMLString(frame, source, testURL);

- webViewImpl->didExitFullScreen();

+ webViewImpl->didExitFullscreen();

webViewImpl->updateAllLifecyclePhases();

// Make sure the new page's layout size and scale factor limits aren't

« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.cpp ('k') | third_party/WebKit/Source/web/tests/WebViewTest.cpp » ('j') | no next file with comments »