Index: third_party/WebKit/Source/core/frame/RootFrameViewportTest.cpp |
diff --git a/third_party/WebKit/Source/core/frame/RootFrameViewportTest.cpp b/third_party/WebKit/Source/core/frame/RootFrameViewportTest.cpp |
index 54d335fddf20ff57559364c3edbf043e61e7d59d..b22aacebad6eaf7b6ca1cfa76b55ba0275c0765a 100644 |
--- a/third_party/WebKit/Source/core/frame/RootFrameViewportTest.cpp |
+++ b/third_party/WebKit/Source/core/frame/RootFrameViewportTest.cpp |
@@ -307,15 +307,15 @@ TEST_F(RootFrameViewportTest, ScrollIntoView) { |
// resized (as is the case when the ChromeOS keyboard comes up) but not |
// scaled. |
visual_viewport->SetViewportSize(IntSize(100, 100)); |
- root_frame_viewport->ScrollIntoView(LayoutRect(100, 250, 50, 50), |
- ScrollAlignment::kAlignToEdgeIfNeeded, |
- ScrollAlignment::kAlignToEdgeIfNeeded); |
+ root_frame_viewport->ScrollIntoView( |
+ LayoutRect(100, 250, 50, 50), ScrollAlignment::kAlignToEdgeIfNeeded, |
+ ScrollAlignment::kAlignToEdgeIfNeeded, false); |
EXPECT_SIZE_EQ(ScrollOffset(50, 150), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(0, 50), visual_viewport->GetScrollOffset()); |
- root_frame_viewport->ScrollIntoView(LayoutRect(25, 75, 50, 50), |
- ScrollAlignment::kAlignToEdgeIfNeeded, |
- ScrollAlignment::kAlignToEdgeIfNeeded); |
+ root_frame_viewport->ScrollIntoView( |
+ LayoutRect(25, 75, 50, 50), ScrollAlignment::kAlignToEdgeIfNeeded, |
+ ScrollAlignment::kAlignToEdgeIfNeeded, false); |
EXPECT_SIZE_EQ(ScrollOffset(25, 75), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(0, 0), visual_viewport->GetScrollOffset()); |
@@ -324,15 +324,15 @@ TEST_F(RootFrameViewportTest, ScrollIntoView) { |
visual_viewport->SetScale(2); |
root_frame_viewport->SetScrollOffset(ScrollOffset(), kProgrammaticScroll); |
- root_frame_viewport->ScrollIntoView(LayoutRect(50, 75, 50, 75), |
- ScrollAlignment::kAlignToEdgeIfNeeded, |
- ScrollAlignment::kAlignToEdgeIfNeeded); |
+ root_frame_viewport->ScrollIntoView( |
+ LayoutRect(50, 75, 50, 75), ScrollAlignment::kAlignToEdgeIfNeeded, |
+ ScrollAlignment::kAlignToEdgeIfNeeded, false); |
EXPECT_SIZE_EQ(ScrollOffset(0, 0), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(50, 75), visual_viewport->GetScrollOffset()); |
- root_frame_viewport->ScrollIntoView(LayoutRect(190, 290, 10, 10), |
- ScrollAlignment::kAlignToEdgeIfNeeded, |
- ScrollAlignment::kAlignToEdgeIfNeeded); |
+ root_frame_viewport->ScrollIntoView( |
+ LayoutRect(190, 290, 10, 10), ScrollAlignment::kAlignToEdgeIfNeeded, |
+ ScrollAlignment::kAlignToEdgeIfNeeded, false); |
EXPECT_SIZE_EQ(ScrollOffset(100, 150), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(50, 75), visual_viewport->GetScrollOffset()); |
@@ -347,19 +347,21 @@ TEST_F(RootFrameViewportTest, ScrollIntoView) { |
root_frame_viewport->ScrollIntoView( |
LayoutRect(root_frame_viewport->VisibleContentRect(kExcludeScrollbars)), |
ScrollAlignment::kAlignToEdgeIfNeeded, |
- ScrollAlignment::kAlignToEdgeIfNeeded); |
+ ScrollAlignment::kAlignToEdgeIfNeeded, false); |
EXPECT_SIZE_EQ(ScrollOffset(50, 50), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(0, 10), visual_viewport->GetScrollOffset()); |
root_frame_viewport->ScrollIntoView( |
LayoutRect(root_frame_viewport->VisibleContentRect(kExcludeScrollbars)), |
- ScrollAlignment::kAlignCenterAlways, ScrollAlignment::kAlignCenterAlways); |
+ ScrollAlignment::kAlignCenterAlways, ScrollAlignment::kAlignCenterAlways, |
+ false); |
EXPECT_SIZE_EQ(ScrollOffset(50, 50), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(0, 10), visual_viewport->GetScrollOffset()); |
root_frame_viewport->ScrollIntoView( |
LayoutRect(root_frame_viewport->VisibleContentRect(kExcludeScrollbars)), |
- ScrollAlignment::kAlignTopAlways, ScrollAlignment::kAlignTopAlways); |
+ ScrollAlignment::kAlignTopAlways, ScrollAlignment::kAlignTopAlways, |
+ false); |
EXPECT_SIZE_EQ(ScrollOffset(50, 50), layout_viewport->GetScrollOffset()); |
EXPECT_SIZE_EQ(ScrollOffset(0, 10), visual_viewport->GetScrollOffset()); |
} |