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

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 17550008: Make IsSolidColor() a property on CC scrollbar layers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index 362f1f455785559b1354e4599ab6f6940b52171f..0db91b1d3bab683fb570082061aa2b05f89d0e41 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -79,7 +79,7 @@ class LayerTreeHostImplTest : public testing::Test,
LayerTreeSettings settings;
settings.minimum_occlusion_tracking_size = gfx::Size();
settings.impl_side_painting = true;
- settings.solid_color_scrollbars = true;
+ settings.force_solid_color_scrollbars = true;
host_impl_ = LayerTreeHostImpl::Create(settings,
this,
@@ -690,7 +690,8 @@ TEST_F(LayerTreeHostImplTest, ScrollVerticallyByPageReturnsCorrectValue) {
cc::ScrollbarLayerImpl::Create(
host_impl_->active_tree(),
20,
- VERTICAL));
+ VERTICAL,
+ false));
vertical_scrollbar->SetBounds(gfx::Size(15, 1000));
host_impl_->RootScrollLayer()->SetVerticalScrollbarLayer(
vertical_scrollbar.get());
@@ -1053,7 +1054,8 @@ TEST_F(LayerTreeHostImplTest, ScrollbarLinearFadeScheduling) {
scoped_ptr<ScrollbarLayerImpl> scrollbar = ScrollbarLayerImpl::Create(
host_impl_->active_tree(),
4,
- VERTICAL);
+ VERTICAL,
+ false);
scroll->SetVerticalScrollbarLayer(scrollbar.get());
scroll->AddChild(contents.Pass());

Powered by Google App Engine
This is Rietveld 408576698