| Index: third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
|
| diff --git a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
|
| index bbc356ffc47dab984665558f4d7ec54ca639f0a1..43abb2fade4c83eec88cd9a7e8d8ceefb6c78091 100644
|
| --- a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
|
| +++ b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
|
| @@ -542,7 +542,10 @@ TEST_P(FrameThrottlingTest, ScrollingCoordinatorShouldSkipThrottledFrame) {
|
| frameElement->contentDocument()->lifecycle().state());
|
| // The fixed background in the throttled sub frame should not cause main
|
| // thread scrolling.
|
| - EXPECT_FALSE(document().view()->shouldScrollOnMainThread());
|
| + EXPECT_FALSE(document()
|
| + .view()
|
| + ->layoutViewportScrollableArea()
|
| + ->shouldScrollOnMainThread());
|
|
|
| // Make the frame visible by changing its transform. This doesn't cause a
|
| // layout, but should still unthrottle the frame.
|
| @@ -550,9 +553,14 @@ TEST_P(FrameThrottlingTest, ScrollingCoordinatorShouldSkipThrottledFrame) {
|
| compositeFrame();
|
| EXPECT_FALSE(frameElement->contentDocument()->view()->canThrottleRendering());
|
| // The fixed background in the throttled sub frame should be considered.
|
| - EXPECT_TRUE(
|
| - frameElement->contentDocument()->view()->shouldScrollOnMainThread());
|
| - EXPECT_FALSE(document().view()->shouldScrollOnMainThread());
|
| + EXPECT_TRUE(frameElement->contentDocument()
|
| + ->view()
|
| + ->layoutViewportScrollableArea()
|
| + ->shouldScrollOnMainThread());
|
| + EXPECT_FALSE(document()
|
| + .view()
|
| + ->layoutViewportScrollableArea()
|
| + ->shouldScrollOnMainThread());
|
| }
|
|
|
| TEST_P(FrameThrottlingTest, ScrollingCoordinatorShouldSkipThrottledLayer) {
|
|
|