Delete layout_viewport_size.

cc/input/pinch_zoom_scrollbar.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/input/pinch_zoom_scrollbar.h"
 
 #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 {
 
 const float PinchZoomScrollbar::kDefaultOpacity = 0.5f;
 const float PinchZoomScrollbar::kFadeDurationInSeconds = 0.5f;
 
 PinchZoomScrollbar::PinchZoomScrollbar(
     WebKit::WebScrollbar::Orientation orientation, LayerTreeHost* owner)
   : orientation_(orientation),
     owner_(owner) {
@@ skipping 12 matching lines @@
     return root_scroll_layer->scroll_offset().x();
   else
     return root_scroll_layer->scroll_offset().y();
 }
 
 WebKit::WebPoint PinchZoomScrollbar::location() const {
   return WebKit::WebPoint();
 }
 
 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 with LTH?

+      owner_->device_viewport_size(), 1 / owner_->device_scale_factor()));
   gfx::Size size;
   int track_width = PinchZoomScrollbarGeometry::kTrackWidth;
   if (orientation_ == WebKit::WebScrollbar::Horizontal)
     size = gfx::Size(viewport_size.width() - track_width, track_width);
   else
     size = gfx::Size(track_width, viewport_size.height() - track_width);
   return WebKit::WebSize(size);
 }
 
 bool PinchZoomScrollbar::enabled() const {
@@ skipping 55 matching lines @@
 }
 bool PinchZoomScrollbar::isCustomScrollbar() const {
   return false;
 }
 
 WebKit::WebScrollbar::Orientation PinchZoomScrollbar::orientation() const {
   return orientation_;
 }
 
 }  // namespace cc