| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/scrollbar_geometry_fixed_thumb.h" | 7 #include "cc/scrollbar_geometry_fixed_thumb.h" |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <public/WebRect.h> | 10 #include <public/WebRect.h> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 ScrollbarGeometryFixedThumb::~ScrollbarGeometryFixedThumb() | 24 ScrollbarGeometryFixedThumb::~ScrollbarGeometryFixedThumb() |
| 25 { | 25 { |
| 26 } | 26 } |
| 27 | 27 |
| 28 void ScrollbarGeometryFixedThumb::update(WebScrollbar* scrollbar) | 28 void ScrollbarGeometryFixedThumb::update(WebScrollbar* scrollbar) |
| 29 { | 29 { |
| 30 int length = ScrollbarGeometryStub::thumbLength(scrollbar); | 30 int length = ScrollbarGeometryStub::thumbLength(scrollbar); |
| 31 | 31 |
| 32 if (scrollbar->orientation() == WebScrollbar::Horizontal) | 32 if (scrollbar->orientation() == WebScrollbar::Horizontal) |
| 33 m_thumbSize = IntSize(length, scrollbar->size().height); | 33 m_thumbSize = gfx::Size(length, scrollbar->size().height); |
| 34 else | 34 else |
| 35 m_thumbSize = IntSize(scrollbar->size().width, length); | 35 m_thumbSize = gfx::Size(scrollbar->size().width, length); |
| 36 } | 36 } |
| 37 | 37 |
| 38 WebScrollbarThemeGeometry* ScrollbarGeometryFixedThumb::clone() const | 38 WebScrollbarThemeGeometry* ScrollbarGeometryFixedThumb::clone() const |
| 39 { | 39 { |
| 40 ScrollbarGeometryFixedThumb* geometry = new ScrollbarGeometryFixedThumb(make
_scoped_ptr(ScrollbarGeometryStub::clone())); | 40 ScrollbarGeometryFixedThumb* geometry = new ScrollbarGeometryFixedThumb(make
_scoped_ptr(ScrollbarGeometryStub::clone())); |
| 41 geometry->m_thumbSize = m_thumbSize; | 41 geometry->m_thumbSize = m_thumbSize; |
| 42 return geometry; | 42 return geometry; |
| 43 } | 43 } |
| 44 | 44 |
| 45 int ScrollbarGeometryFixedThumb::thumbLength(WebScrollbar* scrollbar) | 45 int ScrollbarGeometryFixedThumb::thumbLength(WebScrollbar* scrollbar) |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 afterThumbRect = WebRect(trackRect.x, trackRect.y + beforeThumbRect.heig
ht, trackRect.width, trackRect.y + trackRect.height - beforeThumbRect.y - before
ThumbRect.height); | 85 afterThumbRect = WebRect(trackRect.x, trackRect.y + beforeThumbRect.heig
ht, trackRect.width, trackRect.y + trackRect.height - beforeThumbRect.y - before
ThumbRect.height); |
| 86 } | 86 } |
| 87 } | 87 } |
| 88 | 88 |
| 89 ScrollbarGeometryFixedThumb::ScrollbarGeometryFixedThumb(scoped_ptr<WebScrollbar
ThemeGeometry> geometry) | 89 ScrollbarGeometryFixedThumb::ScrollbarGeometryFixedThumb(scoped_ptr<WebScrollbar
ThemeGeometry> geometry) |
| 90 : ScrollbarGeometryStub(geometry.Pass()) | 90 : ScrollbarGeometryStub(geometry.Pass()) |
| 91 { | 91 { |
| 92 } | 92 } |
| 93 | 93 |
| 94 } | 94 } |
| OLD | NEW |