Index: cc/input/pinch_zoom_scrollbar.cc |
diff --git a/cc/input/pinch_zoom_scrollbar.cc b/cc/input/pinch_zoom_scrollbar.cc |
index e28781011b9517e6a8a366a49acc517cb8ddd009..764a2b9637d8ddd6b4fd52a863cbcaf7d20cd861 100644 |
--- a/cc/input/pinch_zoom_scrollbar.cc |
+++ b/cc/input/pinch_zoom_scrollbar.cc |
@@ -7,6 +7,7 @@ |
#include "cc/input/pinch_zoom_scrollbar_geometry.h" |
#include "cc/layers/layer.h" |
#include "cc/trees/layer_tree_host.h" |
+#include "ui/gfx/size_conversions.h" |
namespace cc { |
@@ -39,7 +40,8 @@ WebKit::WebPoint PinchZoomScrollbar::location() const { |
} |
WebKit::WebSize PinchZoomScrollbar::size() const { |
- gfx::Size viewport_size = owner_->layout_viewport_size(); |
+ gfx::Size viewport_size = gfx::ToCeiledSize(gfx::ScaleSize( |
danakj
2013/04/09 00:04:35
Is there a nice way to not duplicate this logic wi
|
+ owner_->device_viewport_size(), 1 / owner_->device_scale_factor())); |
gfx::Size size; |
int track_width = PinchZoomScrollbarGeometry::kTrackWidth; |
if (orientation_ == WebKit::WebScrollbar::Horizontal) |