Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2771)

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

Issue 497723002: Merge willEnter/willExitFullScreen into didEnter/didExitFullScreen (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index e9fe25075e30da4cbb98bbb76b731cbd6613dabf..577961847a1c87e2130f707c407412cd8247f561 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -5653,7 +5653,6 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)
blink::UserGestureIndicator gesture(blink::DefinitelyProcessingUserGesture);
Element* divFullscreen = document->getElementById("div1");
Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest);
- webViewImpl->willEnterFullScreen();
webViewImpl->didEnterFullScreen();
webViewImpl->layout();
@@ -5663,7 +5662,6 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable)
ASSERT_FALSE(webScrollLayer->scrollable());
// Verify that the main frame is scrollable upon exiting fullscreen.
- webViewImpl->willExitFullScreen();
webViewImpl->didExitFullScreen();
webViewImpl->layout();
ASSERT_FALSE(blink::Fullscreen::isFullScreen(*document));
@@ -5685,7 +5683,6 @@ TEST_F(WebFrameTest, FullscreenMainFrameScrollable)
Document* document = toWebLocalFrameImpl(webViewImpl->mainFrame())->frame()->document();
blink::UserGestureIndicator gesture(blink::DefinitelyProcessingUserGesture);
Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest);
- webViewImpl->willEnterFullScreen();
webViewImpl->didEnterFullScreen();
webViewImpl->layout();

Powered by Google App Engine
This is Rietveld 408576698