Refactor delegated scrolling in LayerImpl

cc/layers/layer_impl_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layers/layer_impl.h"
 
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
@@ skipping 498 matching lines @@
 
   layer()->ScrollBy(gfx::Vector2dF(100, -100));
   EXPECT_VECTOR_EQ(gfx::Vector2dF(50, 0), layer()->CurrentScrollOffset());
 
   EXPECT_VECTOR_EQ(
       gfx::ScrollOffsetWithDelta(scroll_offset, layer()->ScrollDelta()),
       layer()->CurrentScrollOffset());
   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);
 
   layer()->PushScrollOffsetFromMainThread(scroll_offset);
   layer()->ScrollBy(sent_scroll_delta);
   layer()->PullDeltaForMainThread();
   layer()->SetCurrentScrollOffset(scroll_offset +
                                   gfx::ScrollOffset(scroll_delta));
 
   EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, scroll_delta),
                    layer()->CurrentScrollOffset());
   EXPECT_VECTOR_EQ(scroll_delta, layer()->ScrollDelta());
   EXPECT_VECTOR_EQ(scroll_offset, layer()->BaseScrollOffset());
 
   layer()->ApplySentScrollDeltasFromAbortedCommit();
 
   EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, scroll_delta),
                    layer()->CurrentScrollOffset());
   EXPECT_VECTOR_EQ(scroll_delta - sent_scroll_delta, layer()->ScrollDelta());
   EXPECT_VECTOR_EQ(gfx::ScrollOffsetWithDelta(scroll_offset, sent_scroll_delta),
                    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);
 
   layer()->set_user_scrollable_vertical(false);
   layer()->PushScrollOffsetFromMainThread(scroll_offset);
   gfx::Vector2dF unscrolled = layer()->ScrollBy(scroll_delta);
 
   EXPECT_VECTOR_EQ(gfx::Vector2dF(0, 8.5f), unscrolled);
   EXPECT_VECTOR_EQ(gfx::Vector2dF(30.5f, 5), layer()->CurrentScrollOffset());
@@ skipping 174 matching lines @@
 
   ASSERT_TRUE(layer(IV_SCROLL, ACTIVE)->scrollable());
 
   ASSERT_TRUE(LayerHasScrollbar(OV_SCROLL, ACTIVE));
   ASSERT_TRUE(LayerHasScrollbar(IV_CLIP, ACTIVE));
   ASSERT_TRUE(LayerHasScrollbar(IV_SCROLL, ACTIVE));
 }
 
 }  // namespace
 }  // namespace cc