diff options
author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 17:06:47 +0000 |
---|---|---|
committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-30 17:06:47 +0000 |
commit | 1960a71906faa6a6d8590935a80c774a3ffe58b0 (patch) | |
tree | c14e2bded3de4e297406c01680ebadf559b118f6 /cc/trees/layer_tree_host_impl_unittest.cc | |
parent | 011d7c7083ef5523ca07200df849d6d27d959f52 (diff) | |
download | chromium_src-1960a71906faa6a6d8590935a80c774a3ffe58b0.zip chromium_src-1960a71906faa6a6d8590935a80c774a3ffe58b0.tar.gz chromium_src-1960a71906faa6a6d8590935a80c774a3ffe58b0.tar.bz2 |
Make it possible to delegate root layer scroll offset outside of cc.
This change makes it possible for the embedder to own the root layer
scroll offset.
BUG=b/6029133
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=197178
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/13869006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees/layer_tree_host_impl_unittest.cc')
-rw-r--r-- | cc/trees/layer_tree_host_impl_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index ce2add2..c88b595 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -162,7 +162,7 @@ class LayerTreeHostImplTest : public testing::Test, } static void ExpectClearedScrollDeltasRecursive(LayerImpl* layer) { - ASSERT_EQ(layer->scroll_delta(), gfx::Vector2d()); + ASSERT_EQ(layer->ScrollDelta(), gfx::Vector2d()); for (size_t i = 0; i < layer->children().size(); ++i) ExpectClearedScrollDeltasRecursive(layer->children()[i]); } @@ -681,7 +681,7 @@ TEST_F(LayerTreeHostImplTest, ScrollVerticallyByPageReturnsCorrectValue) { // Trying to scroll with a vertical scrollbar will succeed. EXPECT_TRUE(host_impl_->ScrollVerticallyByPage( gfx::Point(), WebKit::WebScrollbar::ScrollForward)); - EXPECT_FLOAT_EQ(875.f, host_impl_->RootScrollLayer()->scroll_delta().y()); + EXPECT_FLOAT_EQ(875.f, host_impl_->RootScrollLayer()->ScrollDelta().y()); EXPECT_TRUE(host_impl_->ScrollVerticallyByPage( gfx::Point(), WebKit::WebScrollbar::ScrollBackward)); } |