Make new-style page scale work on Android.

cc/pinch_zoom_viewport.cc

Index: cc/pinch_zoom_viewport.cc
diff --git a/cc/pinch_zoom_viewport.cc b/cc/pinch_zoom_viewport.cc
index dab6c9ca823cc57b18ef53eb3c503f41a5948813..8ddd6f1720af423d5a5c895ec6c5f6e2e2175824 100644
--- a/cc/pinch_zoom_viewport.cc
+++ b/cc/pinch_zoom_viewport.cc
@@ -50,16 +50,16 @@ bool PinchZoomViewport::SetPageScaleFactorAndLimits(
   return true;
 }
 
-gfx::RectF PinchZoomViewport::Bounds() const {
-  gfx::RectF bounds(gfx::PointF(), layout_viewport_size_);
-  bounds.Scale(1 / total_page_scale_factor());
-  bounds += zoomed_viewport_offset_;
-  return bounds;
+gfx::RectF PinchZoomViewport::ZoomedViewport() const {
+  gfx::SizeF layout_space_device_viewport_size = gfx::ScaleSize(
+      device_viewport_size_, 1 / (device_scale_factor_ * total_page_scale_factor()));

[danakj, 2013/01/17 23:30:36]

nit: 80col

+  return gfx::RectF(gfx::PointAtOffsetFromOrigin(zoomed_viewport_offset_),
+                    layout_space_device_viewport_size);
 }
 
 gfx::Vector2dF PinchZoomViewport::ApplyScroll(const gfx::Vector2dF delta) {
   gfx::Vector2dF overflow;
-  gfx::RectF pinched_bounds = Bounds() + delta;
+  gfx::RectF pinched_bounds = ZoomedViewport() + delta;
 
   if (pinched_bounds.x() < 0) {
     overflow.set_x(pinched_bounds.x());