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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/layer_impl_unittest.cc

Issue 1038173002: Refactor delegated scrolling in LayerImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove "scrollOffsetDelegate" Created 5 years, 8 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
« cc/layers/layer_impl.h ('K') | « cc/layers/layer_impl.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | cc/trees/layer_tree_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl_unittest.cc
diff --git a/cc/layers/layer_impl_unittest.cc b/cc/layers/layer_impl_unittest.cc
index 1cdbd59bddb7dcef2dfb7cff8412f4cf285fe1c0..d9811bc1553a4f71bef65cc056a4a7e00b4818ed 100644
--- a/cc/layers/layer_impl_unittest.cc
+++ b/cc/layers/layer_impl_unittest.cc
@@ -516,112 +516,7 @@ TEST_F(LayerImplScrollTest, ScrollByWithNonZeroOffset) {
EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
}
-class ScrollDelegateIgnore : public LayerImpl::ScrollOffsetDelegate {
- public:
- void SetCurrentScrollOffset(const gfx::ScrollOffset& new_value) override {
- last_attempted_set_offset_ = new_value;
- }
- gfx::ScrollOffset last_attempted_set_offset() const {
- return last_attempted_set_offset_;
- }
-
- gfx::ScrollOffset GetCurrentScrollOffset() override {
- return gfx::ScrollOffset(fixed_offset_);
- }
- bool IsExternalFlingActive() const override { return false; }
- void Update() const override { }
-
- void set_fixed_offset(const gfx::Vector2dF& fixed_offset) {
- fixed_offset_ = fixed_offset;
- }
-
- private:
- gfx::ScrollOffset last_attempted_set_offset_;
- gfx::Vector2dF fixed_offset_;
-};
-
-TEST_F(LayerImplScrollTest, ScrollByWithIgnoringDelegate) {
- gfx::ScrollOffset scroll_offset(10, 5);
- layer()->PushScrollOffsetFromMainThread(scroll_offset);
-
- EXPECT_VECTOR_EQ(scroll_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
- EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
-
- ScrollDelegateIgnore delegate;
- gfx::Vector2dF fixed_offset(32, 12);
- delegate.set_fixed_offset(fixed_offset);
- layer()->SetScrollOffsetDelegate(&delegate);
- layer()->RefreshFromScrollDelegate();
-
- EXPECT_VECTOR_EQ(fixed_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- layer()->ScrollBy(gfx::Vector2dF(-100, 100));
-
- EXPECT_VECTOR_EQ(fixed_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- layer()->SetScrollOffsetDelegate(nullptr);
-
- EXPECT_VECTOR_EQ(fixed_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- gfx::Vector2dF scroll_delta(1, 1);
- layer()->ScrollBy(scroll_delta);
-
- EXPECT_VECTOR_EQ(fixed_offset + scroll_delta, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-}
-
-class ScrollDelegateAccept : public LayerImpl::ScrollOffsetDelegate {
- public:
- void SetCurrentScrollOffset(const gfx::ScrollOffset& new_value) override {
- current_offset_ = new_value;
- }
- gfx::ScrollOffset GetCurrentScrollOffset() override {
- return current_offset_;
- }
- bool IsExternalFlingActive() const override { return false; }
- void Update() const override { }
-
- private:
- gfx::ScrollOffset current_offset_;
-};
-
-TEST_F(LayerImplScrollTest, ScrollByWithAcceptingDelegate) {
- gfx::ScrollOffset scroll_offset(10, 5);
- layer()->PushScrollOffsetFromMainThread(scroll_offset);
-
- EXPECT_VECTOR_EQ(scroll_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
- EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
-
- ScrollDelegateAccept delegate;
- layer()->SetScrollOffsetDelegate(&delegate);
-
- EXPECT_VECTOR_EQ(scroll_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
- EXPECT_VECTOR_EQ(gfx::Vector2dF(), layer()->ScrollDelta());
-
- layer()->ScrollBy(gfx::Vector2dF(-100, 100));
-
- EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- layer()->SetScrollOffsetDelegate(nullptr);
-
- EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 80), layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- gfx::Vector2dF scroll_delta(1, 1);
- layer()->ScrollBy(scroll_delta);
-
- EXPECT_VECTOR_EQ(gfx::Vector2dF(1, 80), layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-}
-
-TEST_F(LayerImplScrollTest, ApplySentScrollsNoDelegate) {
+TEST_F(LayerImplScrollTest, ApplySentScrollsNoListener) {
gfx::ScrollOffset scroll_offset(10, 5);
gfx::Vector2dF scroll_delta(20.5f, 8.5f);
gfx::Vector2d sent_scroll_delta(12, -3);
@@ -646,57 +541,6 @@ TEST_F(LayerImplScrollTest, ApplySentScrollsNoDelegate) {
layer()->BaseScrollOffset());
}
-TEST_F(LayerImplScrollTest, ApplySentScrollsWithIgnoringDelegate) {
- gfx::ScrollOffset scroll_offset(10, 5);
- gfx::Vector2d sent_scroll_delta(12, -3);
- gfx::Vector2dF fixed_offset(32, 12);
-
- layer()->PushScrollOffsetFromMainThread(scroll_offset);
- layer()->ScrollBy(sent_scroll_delta);
- layer()->PullDeltaForMainThread();
- layer()->SetCurrentScrollOffset(scroll_offset);
- ScrollDelegateIgnore delegate;
- delegate.set_fixed_offset(fixed_offset);
- layer()->SetScrollOffsetDelegate(&delegate);
- layer()->RefreshFromScrollDelegate();
-
- EXPECT_VECTOR_EQ(fixed_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- layer()->ApplySentScrollDeltasFromAbortedCommit();
-
- EXPECT_VECTOR_EQ(fixed_offset, delegate.last_attempted_set_offset());
-
- EXPECT_VECTOR_EQ(fixed_offset, layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, sent_scroll_delta),
- layer()->BaseScrollOffset());
-}
-
-TEST_F(LayerImplScrollTest, ApplySentScrollsWithAcceptingDelegate) {
- gfx::ScrollOffset scroll_offset(10, 5);
- gfx::Vector2d sent_scroll_delta(12, -3);
- gfx::Vector2dF scroll_delta(20.5f, 8.5f);
-
- layer()->PushScrollOffsetFromMainThread(scroll_offset);
- layer()->ScrollBy(sent_scroll_delta);
- layer()->PullDeltaForMainThread();
- ScrollDelegateAccept delegate;
- layer()->SetScrollOffsetDelegate(&delegate);
- layer()->SetCurrentScrollOffset(scroll_offset +
- gfx::ScrollOffset(scroll_delta));
-
- EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, scroll_delta),
- layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
-
- layer()->ApplySentScrollDeltasFromAbortedCommit();
-
- EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, scroll_delta),
- layer()->CurrentScrollOffset());
- EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, sent_scroll_delta),
- layer()->BaseScrollOffset());
-}
-
TEST_F(LayerImplScrollTest, ScrollUserUnscrollableLayer) {
gfx::ScrollOffset scroll_offset(10, 5);
gfx::Vector2dF scroll_delta(20.5f, 8.5f);
« cc/layers/layer_impl.h ('K') | « cc/layers/layer_impl.cc ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | cc/trees/layer_tree_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698