summaryrefslogtreecommitdiffstats
path: root/chromium/cc/layers/scrollbar_layer_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-13 16:23:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-02-14 10:37:21 +0000
commit38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch)
treec4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/cc/layers/scrollbar_layer_unittest.cc
parente684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff)
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/cc/layers/scrollbar_layer_unittest.cc')
-rw-r--r--chromium/cc/layers/scrollbar_layer_unittest.cc43
1 files changed, 0 insertions, 43 deletions
diff --git a/chromium/cc/layers/scrollbar_layer_unittest.cc b/chromium/cc/layers/scrollbar_layer_unittest.cc
index 4425f722798..c46e3eef674 100644
--- a/chromium/cc/layers/scrollbar_layer_unittest.cc
+++ b/chromium/cc/layers/scrollbar_layer_unittest.cc
@@ -252,49 +252,6 @@ TEST_F(ScrollbarLayerTest, RepaintOverlayWhenResourceDisposed) {
}
}
-TEST_F(ScrollbarLayerTest, ShouldScrollNonOverlayOnMainThread) {
- // Create and attach a non-overlay scrollbar.
- std::unique_ptr<Scrollbar> scrollbar(new FakeScrollbar);
- LayerImpl* layer_impl_tree_root = LayerImplForScrollAreaAndScrollbar(
- layer_tree_host_.get(), std::move(scrollbar), false, false, 0, 0);
- PaintedScrollbarLayerImpl* scrollbar_layer_impl =
- static_cast<PaintedScrollbarLayerImpl*>(
- layer_impl_tree_root->layer_tree_impl()->LayerById(
- scrollbar_layer_id_));
- ScrollTree& scroll_tree =
- layer_impl_tree_root->layer_tree_impl()->property_trees()->scroll_tree;
- ScrollNode* scroll_node =
- scroll_tree.Node(scrollbar_layer_impl->scroll_tree_index());
-
- // When the scrollbar is not an overlay scrollbar, the scroll should be
- // responded to on the main thread as the compositor does not yet implement
- // scrollbar scrolling.
- InputHandler::ScrollStatus status = layer_tree_host_->host_impl()->TryScroll(
- gfx::PointF(), InputHandler::TOUCHSCREEN, scroll_tree, scroll_node);
- EXPECT_EQ(InputHandler::SCROLL_ON_MAIN_THREAD, status.thread);
- EXPECT_EQ(MainThreadScrollingReason::kScrollbarScrolling,
- status.main_thread_scrolling_reasons);
-
- // Create and attach an overlay scrollbar.
- scrollbar.reset(new FakeScrollbar(false, false, true));
-
- layer_impl_tree_root = LayerImplForScrollAreaAndScrollbar(
- layer_tree_host_.get(), std::move(scrollbar), false, false, 0, 0);
- scrollbar_layer_impl = static_cast<PaintedScrollbarLayerImpl*>(
- layer_impl_tree_root->layer_tree_impl()->LayerById(scrollbar_layer_id_));
- scroll_tree =
- layer_impl_tree_root->layer_tree_impl()->property_trees()->scroll_tree;
- scroll_node = scroll_tree.Node(scrollbar_layer_impl->scroll_tree_index());
-
- // The user shouldn't be able to drag an overlay scrollbar and the scroll
- // may be handled in the compositor.
- status = layer_tree_host_->host_impl()->TryScroll(
- gfx::PointF(), InputHandler::TOUCHSCREEN, scroll_tree, scroll_node);
- EXPECT_EQ(InputHandler::SCROLL_IGNORED, status.thread);
- EXPECT_EQ(MainThreadScrollingReason::kNotScrollable,
- status.main_thread_scrolling_reasons);
-}
-
class FakeNinePatchScrollbar : public FakeScrollbar {
public:
bool UsesNinePatchThumbResource() const override { return true; }