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 87d0d515b38f97ec0d3333f7def605d26eac153b..2ed8a8af04e653b6ab71bf1308924aad277b9e76 100644 |
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp |
@@ -805,10 +805,11 @@ TEST_P(WebViewTest, TextInputInfoUpdateStyleAndLayout) { |
->setIdAttribute("foo"); |
// This should not DCHECK. |
- EXPECT_EQ(WebTextInputTypeText, webViewImpl->mainFrameImpl() |
- ->inputMethodController() |
- ->textInputInfo() |
- .type); |
+ EXPECT_EQ(WebTextInputTypeText, |
+ webViewImpl->mainFrameImpl() |
+ ->inputMethodController() |
+ ->textInputInfo() |
+ .type); |
} |
void WebViewTest::testInputMode(WebTextInputMode expectedInputMode, |
@@ -817,10 +818,11 @@ void WebViewTest::testInputMode(WebTextInputMode expectedInputMode, |
WebViewImpl* webViewImpl = |
m_webViewHelper.initializeAndLoad(m_baseURL + htmlFile); |
webViewImpl->setInitialFocus(false); |
- EXPECT_EQ(expectedInputMode, webViewImpl->mainFrameImpl() |
- ->inputMethodController() |
- ->textInputInfo() |
- .inputMode); |
+ EXPECT_EQ(expectedInputMode, |
+ webViewImpl->mainFrameImpl() |
+ ->inputMethodController() |
+ ->textInputInfo() |
+ .inputMode); |
} |
TEST_P(WebViewTest, InputMode) { |
@@ -1674,18 +1676,21 @@ TEST_P(WebViewTest, BackForwardRestoreScroll) { |
// Go back, then forward, then back again. |
mainFrameLocal->loader().load( |
FrameLoadRequest( |
- nullptr, FrameLoader::resourceRequestFromHistoryItem( |
- item1.get(), WebCachePolicy::UseProtocolCachePolicy)), |
+ nullptr, |
+ FrameLoader::resourceRequestFromHistoryItem( |
+ item1.get(), WebCachePolicy::UseProtocolCachePolicy)), |
FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad); |
mainFrameLocal->loader().load( |
FrameLoadRequest( |
- nullptr, FrameLoader::resourceRequestFromHistoryItem( |
- item2.get(), WebCachePolicy::UseProtocolCachePolicy)), |
+ nullptr, |
+ FrameLoader::resourceRequestFromHistoryItem( |
+ item2.get(), WebCachePolicy::UseProtocolCachePolicy)), |
FrameLoadTypeBackForward, item2.get(), HistorySameDocumentLoad); |
mainFrameLocal->loader().load( |
FrameLoadRequest( |
- nullptr, FrameLoader::resourceRequestFromHistoryItem( |
- item1.get(), WebCachePolicy::UseProtocolCachePolicy)), |
+ nullptr, |
+ FrameLoader::resourceRequestFromHistoryItem( |
+ item1.get(), WebCachePolicy::UseProtocolCachePolicy)), |
FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad); |
// Click a different anchor |
@@ -1698,13 +1703,15 @@ TEST_P(WebViewTest, BackForwardRestoreScroll) { |
// forward navigation. |
mainFrameLocal->loader().load( |
FrameLoadRequest( |
- nullptr, FrameLoader::resourceRequestFromHistoryItem( |
- item1.get(), WebCachePolicy::UseProtocolCachePolicy)), |
+ nullptr, |
+ FrameLoader::resourceRequestFromHistoryItem( |
+ item1.get(), WebCachePolicy::UseProtocolCachePolicy)), |
FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad); |
mainFrameLocal->loader().load( |
FrameLoadRequest( |
- nullptr, FrameLoader::resourceRequestFromHistoryItem( |
- item3.get(), WebCachePolicy::UseProtocolCachePolicy)), |
+ nullptr, |
+ FrameLoader::resourceRequestFromHistoryItem( |
+ item3.get(), WebCachePolicy::UseProtocolCachePolicy)), |
FrameLoadTypeBackForward, item3.get(), HistorySameDocumentLoad); |
EXPECT_EQ(0, webViewImpl->mainFrame()->getScrollOffset().width); |
EXPECT_GT(webViewImpl->mainFrame()->getScrollOffset().height, 2000); |
@@ -1733,10 +1740,11 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleFullscreenStyles) { |
// Sanity-check. There should be no scrolling possible. |
ASSERT_EQ(0, webViewImpl->mainFrame()->getScrollOffset().height); |
- ASSERT_EQ(0, webViewImpl->mainFrameImpl() |
- ->frameView() |
- ->maximumScrollOffset() |
- .height()); |
+ ASSERT_EQ(0, |
+ webViewImpl->mainFrameImpl() |
+ ->frameView() |
+ ->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 |
@@ -1772,10 +1780,11 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) { |
// Sanity-check. There should be no scrolling possible. |
ASSERT_EQ(0, webViewImpl->mainFrame()->getScrollOffset().height); |
- ASSERT_EQ(0, webViewImpl->mainFrameImpl() |
- ->frameView() |
- ->maximumScrollOffset() |
- .height()); |
+ ASSERT_EQ(0, |
+ webViewImpl->mainFrameImpl() |
+ ->frameView() |
+ ->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 |
@@ -1787,10 +1796,11 @@ TEST_P(WebViewTest, FullscreenResetScrollAndScaleExitAndReenter) { |
// Sanity-check. There should be no scrolling possible. |
ASSERT_EQ(0, webViewImpl->mainFrame()->getScrollOffset().height); |
- ASSERT_EQ(0, webViewImpl->mainFrameImpl() |
- ->frameView() |
- ->maximumScrollOffset() |
- .height()); |
+ ASSERT_EQ(0, |
+ webViewImpl->mainFrameImpl() |
+ ->frameView() |
+ ->maximumScrollOffset() |
+ .height()); |
// When we exit now, we should restore the original scroll value. |
webViewImpl->didExitFullscreen(); |