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

Unified Diff: cc/layers/solid_color_scrollbar_layer_impl.cc

Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Draft for review. Created 7 years, 1 month 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/layers/solid_color_scrollbar_layer_impl.cc
diff --git a/cc/layers/solid_color_scrollbar_layer_impl.cc b/cc/layers/solid_color_scrollbar_layer_impl.cc
index 9f46a8080f513adc1c1f3118cdda77debed87aea..a4c52015b109191b2716fb2e42e7e3caf48e8f01 100644
--- a/cc/layers/solid_color_scrollbar_layer_impl.cc
+++ b/cc/layers/solid_color_scrollbar_layer_impl.cc
@@ -15,19 +15,24 @@ scoped_ptr<SolidColorScrollbarLayerImpl> SolidColorScrollbarLayerImpl::Create(
int id,
ScrollbarOrientation orientation,
int thumb_thickness,
- bool is_left_side_vertical_scrollbar) {
+ bool is_left_side_vertical_scrollbar,
+ bool is_overlay) {
return make_scoped_ptr(new SolidColorScrollbarLayerImpl(
tree_impl, id, orientation, thumb_thickness,
- is_left_side_vertical_scrollbar));
+ is_left_side_vertical_scrollbar, is_overlay));
}
SolidColorScrollbarLayerImpl::~SolidColorScrollbarLayerImpl() {}
scoped_ptr<LayerImpl> SolidColorScrollbarLayerImpl::CreateLayerImpl(
LayerTreeImpl* tree_impl) {
- return SolidColorScrollbarLayerImpl::Create(
- tree_impl, id(), orientation(), thumb_thickness_,
- is_left_side_vertical_scrollbar()).PassAs<LayerImpl>();
+ return SolidColorScrollbarLayerImpl::Create(tree_impl,
+ id(),
+ orientation(),
+ thumb_thickness_,
+ is_left_side_vertical_scrollbar(),
+ is_overlay_scrollbar())
+ .PassAs<LayerImpl>();
}
SolidColorScrollbarLayerImpl::SolidColorScrollbarLayerImpl(
@@ -35,9 +40,10 @@ SolidColorScrollbarLayerImpl::SolidColorScrollbarLayerImpl(
int id,
ScrollbarOrientation orientation,
int thumb_thickness,
- bool is_left_side_vertical_scrollbar)
+ bool is_left_side_vertical_scrollbar,
+ bool is_overlay)
: ScrollbarLayerImplBase(tree_impl, id, orientation,
- is_left_side_vertical_scrollbar),
+ is_left_side_vertical_scrollbar, is_overlay),
thumb_thickness_(thumb_thickness),
color_(tree_impl->settings().solid_color_scrollbar_color) {}

Powered by Google App Engine
This is Rietveld 408576698