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 ae3e9cf891a4b7e0b65b18344b50d90188858ef4..de994b83c3e3f851793349286e8c5845d3a1324a 100644 |
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp |
@@ -6437,7 +6437,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenLayerSize) |
Document* document = webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
Element* divFullscreen = document->getElementById("div1"); |
- Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |
EXPECT_EQ(Fullscreen::currentFullScreenElementFrom(*document), divFullscreen); |
@@ -6470,7 +6470,7 @@ TEST_F(WebFrameTest, FullscreenLayerNonScrollable) |
Document* document = webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
Element* divFullscreen = document->getElementById("div1"); |
- Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |
@@ -6507,7 +6507,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenMainFrame) |
Document* document = webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
- Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |
@@ -6542,7 +6542,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenSubframe) |
Document* document = toWebLocalFrameImpl(webViewHelper.webView()->mainFrame()->firstChild())->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
Element* divFullscreen = document->getElementById("div1"); |
- Fullscreen::from(*document).requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*divFullscreen, Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |
@@ -6582,7 +6582,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenWithTinyViewport) |
Document* document = webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
- Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |
EXPECT_EQ(384, layoutViewItem.logicalWidth().floor()); |
@@ -6616,7 +6616,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenResizeWithTinyViewport) |
LayoutViewItem layoutViewItem = webViewHelper.webView()->mainFrameImpl()->frameView()->layoutViewItem(); |
Document* document = webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
- Fullscreen::from(*document).requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*document->documentElement(), Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |
EXPECT_EQ(384, layoutViewItem.logicalWidth().floor()); |
@@ -6673,7 +6673,7 @@ TEST_P(ParameterizedWebFrameTest, FullscreenRestoreScaleFactorUponExiting) |
{ |
Document* document = webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
- Fullscreen::from(*document).requestFullscreen(*document->body(), Fullscreen::PrefixedRequest); |
+ Fullscreen::requestFullscreen(*document->body(), Fullscreen::PrefixedRequest); |
} |
webViewImpl->didEnterFullscreen(); |
@@ -6738,7 +6738,7 @@ TEST_P(ParameterizedWebFrameTest, ClearFullscreenConstraintsOnNavigation) |
Document* document = |
webViewImpl->mainFrameImpl()->frame()->document(); |
UserGestureIndicator gesture(DefinitelyProcessingUserGesture); |
- Fullscreen::from(*document).requestFullscreen( |
+ Fullscreen::requestFullscreen( |
*document->documentElement(), Fullscreen::PrefixedRequest); |
webViewImpl->didEnterFullscreen(); |
webViewImpl->updateAllLifecyclePhases(); |