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

Unified Diff: cc/trees/layer_tree_host_unittest_scroll.cc

Issue 2676923002: End-to-end prototype of compositor scrolling with slimming paint v2 (Closed)
Patch Set: Add SPV2 test of didScroll callback Created 3 years, 10 months 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
« no previous file with comments | « cc/layers/layer.cc ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_unittest_scroll.cc
diff --git a/cc/trees/layer_tree_host_unittest_scroll.cc b/cc/trees/layer_tree_host_unittest_scroll.cc
index 59fbfb6a4f9632c9da3e1f7627aa0f60e6902672..b41705f0caebdbf2f53ad894030d084673fff27c 100644
--- a/cc/trees/layer_tree_host_unittest_scroll.cc
+++ b/cc/trees/layer_tree_host_unittest_scroll.cc
@@ -147,7 +147,7 @@ class LayerTreeHostScrollTestScrollSimple : public LayerTreeHostScrollTest {
}
}
- void DidScrollOuterViewport() { num_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_scrolls_++; }
void AfterTest() override { EXPECT_EQ(1, num_scrolls_); }
@@ -230,7 +230,7 @@ class LayerTreeHostScrollTestScrollMultipleRedraw
}
}
- void DidScrollOuterViewport() { num_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_scrolls_++; }
void AfterTest() override { EXPECT_EQ(1, num_scrolls_); }
@@ -412,7 +412,7 @@ class LayerTreeHostScrollTestScrollAbortedCommit
}
}
- void DidScrollOuterViewport() { num_impl_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_impl_scrolls_++; }
void AfterTest() override {
EXPECT_EQ(3, num_impl_scrolls_);
@@ -630,11 +630,11 @@ class LayerTreeHostScrollTestCaseWithChild : public LayerTreeHostScrollTest {
}
}
- void DidScroll() {
+ void DidScroll(const gfx::ScrollOffset&) {
ajuma 2017/02/06 21:28:52 Perhaps this (or one of the other tests in this fi
pdr. 2017/02/07 22:14:34 I talked offline with both Ali and Walter and both
final_scroll_offset_ = expected_scroll_layer_->scroll_offset();
}
- void DidScrollOuterViewport() { num_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_scrolls_++; }
void UpdateLayerTreeHost() override {
EXPECT_VECTOR_EQ(gfx::Vector2d(),
@@ -923,7 +923,7 @@ class LayerTreeHostScrollTestSimple : public LayerTreeHostScrollTest {
}
}
- void DidScrollOuterViewport() { num_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_scrolls_++; }
void AfterTest() override { EXPECT_EQ(1, num_scrolls_); }
@@ -1420,7 +1420,7 @@ class LayerTreeHostScrollTestLayerStructureChange
protected:
class FakeLayerScrollClient {
public:
- void DidScroll() {
+ void DidScroll(const gfx::ScrollOffset&) {
owner_->DidScroll(layer_);
}
LayerTreeHostScrollTestLayerStructureChange* owner_;
@@ -1572,7 +1572,7 @@ class LayerTreeHostScrollTestScrollMFBA : public LayerTreeHostScrollTest {
}
}
- void DidScrollOuterViewport() { num_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_scrolls_++; }
void AfterTest() override {
EXPECT_EQ(3, num_commits_);
@@ -1791,7 +1791,7 @@ class LayerTreeHostScrollTestScrollAbortedCommitMFBA
num_draws_++;
}
- void DidScrollOuterViewport() { num_impl_scrolls_++; }
+ void DidScrollOuterViewport(const gfx::ScrollOffset&) { num_impl_scrolls_++; }
void AfterTest() override {
EXPECT_EQ(3, num_impl_scrolls_);
« no previous file with comments | « cc/layers/layer.cc ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698