Index: cc/layers/scrollbar_layer_impl_base.cc |
diff --git a/cc/layers/scrollbar_layer_impl_base.cc b/cc/layers/scrollbar_layer_impl_base.cc |
index 839c0b7f927d488f9ce76813ebd40b7abf66569f..640a26e208d9de6e50587224afa0dfc7964094f4 100644 |
--- a/cc/layers/scrollbar_layer_impl_base.cc |
+++ b/cc/layers/scrollbar_layer_impl_base.cc |
@@ -107,7 +107,8 @@ bool ScrollbarLayerImplBase::SetThumbThicknessScaleFactor(float factor) { |
return true; |
} |
-gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect() const { |
+gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRectWithThumbThicknessScale( |
+ float thumb_thickness_scale_factor) const { |
// Thumb extent is the length of the thumb in the scrolling direction, thumb |
// thickness is in the perpendicular direction. Here's an example of a |
// horizontal scrollbar - inputs are above the scrollbar, computed values |
@@ -185,7 +186,7 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect() const { |
} |
float thumb_thickness_adjustment = |
- thumb_thickness * (1.f - thumb_thickness_scale_factor_); |
+ thumb_thickness * (1.f - thumb_thickness_scale_factor); |
gfx::RectF thumb_rect; |
if (orientation_ == HORIZONTAL) { |
@@ -206,6 +207,16 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect() const { |
return gfx::ToEnclosingRect(thumb_rect); |
} |
+gfx::Rect ScrollbarLayerImplBase::ComputeExpandedThumbQuadRect() const { |
+ DCHECK(is_overlay_scrollbar()); |
+ return ComputeThumbQuadRectWithThumbThicknessScale(1.f); |
+} |
+ |
+gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect() const { |
+ return ComputeThumbQuadRectWithThumbThicknessScale( |
+ thumb_thickness_scale_factor_); |
+} |
+ |
void ScrollbarLayerImplBase::SetOverlayScrollbarLayerOpacityAnimated( |
float opacity) { |
DCHECK(is_overlay_scrollbar()); |