diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/cc/layers/scrollbar_layer_impl_base.cc | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/cc/layers/scrollbar_layer_impl_base.cc')
| -rw-r--r-- | chromium/cc/layers/scrollbar_layer_impl_base.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chromium/cc/layers/scrollbar_layer_impl_base.cc b/chromium/cc/layers/scrollbar_layer_impl_base.cc index 35e716bdbd8..1d07a8349e4 100644 --- a/chromium/cc/layers/scrollbar_layer_impl_base.cc +++ b/chromium/cc/layers/scrollbar_layer_impl_base.cc @@ -94,16 +94,6 @@ void ScrollbarLayerImplBase::SetScrollLayerAndClipLayerByIds( ScrollbarParametersDidChange(false); } -gfx::Rect ScrollbarLayerImplBase::ScrollbarLayerRectToContentRect( - const gfx::RectF& layer_rect) const { - // Don't intersect with the bounds as in LayerRectToContentRect() because - // layer_rect here might be in coordinates of the containing layer. - gfx::RectF content_rect = gfx::ScaleRect(layer_rect, - contents_scale_x(), - contents_scale_y()); - return gfx::ToEnclosingRect(content_rect); -} - bool ScrollbarLayerImplBase::SetCurrentPos(float current_pos) { if (current_pos_ == current_pos) return false; @@ -249,7 +239,7 @@ gfx::Rect ScrollbarLayerImplBase::ComputeThumbQuadRect() const { thumb_length); } - return ScrollbarLayerRectToContentRect(thumb_rect); + return gfx::ToEnclosingRect(thumb_rect); } void ScrollbarLayerImplBase::ScrollbarParametersDidChange(bool on_resize) { |