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

Unified Diff: third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp

Issue 2531603003: Only scroll on main if the targeted frames need to scroll on main (Closed)
Patch Set: Resolve conflict Created 4 years 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: 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 7e022a42b2eabb0f0b29719a3d16f0b2ced210ff..24bdf713dc49dc96cec156c32d75146a0d685a4c 100644
--- a/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
+++ b/third_party/WebKit/Source/web/tests/FrameThrottlingTest.cpp
@@ -496,7 +496,9 @@ TEST_F(FrameThrottlingTest, ScrollingCoordinatorShouldSkipThrottledFrame) {
compositeFrame();
EXPECT_FALSE(frameElement->contentDocument()->view()->canThrottleRendering());
// The fixed background in the throttled sub frame should be considered.
- EXPECT_TRUE(document().view()->shouldScrollOnMainThread());
+ EXPECT_TRUE(
+ frameElement->contentDocument()->view()->shouldScrollOnMainThread());
+ EXPECT_FALSE(document().view()->shouldScrollOnMainThread());
}
TEST_F(FrameThrottlingTest, ScrollingCoordinatorShouldSkipThrottledLayer) {

Powered by Google App Engine
This is Rietveld 408576698