Delete zoomed_viewport_offset_ and its users.

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 3f3e3a1d0cbb752ae63bed9028b547af90347f97..2a2b03d28c1ec15642ba551783259d8a3f68b3c1 100644
--- a/cc/pinch_zoom_viewport.cc
+++ b/cc/pinch_zoom_viewport.cc
@@ -50,42 +50,9 @@ bool PinchZoomViewport::SetPageScaleFactorAndLimits(
   return true;
 }
 
-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()));
-  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 = ZoomedViewport() + delta;
-
-  if (pinched_bounds.x() < 0) {
-    overflow.set_x(pinched_bounds.x());
-    pinched_bounds.set_x(0);
-  }
-
-  if (pinched_bounds.y() < 0) {
-    overflow.set_y(pinched_bounds.y());
-    pinched_bounds.set_y(0);
-  }
-
-  if (pinched_bounds.right() > layout_viewport_size_.width()) {
-    overflow.set_x(pinched_bounds.right() - layout_viewport_size_.width());
-    pinched_bounds += gfx::Vector2dF(
-      layout_viewport_size_.width() - pinched_bounds.right(), 0);
-  }
-
-  if (pinched_bounds.bottom() > layout_viewport_size_.height()) {
-    overflow.set_y(pinched_bounds.bottom() - layout_viewport_size_.height());
-    pinched_bounds += gfx::Vector2dF(
-      0, layout_viewport_size_.height() - pinched_bounds.bottom());
-  }
-  zoomed_viewport_offset_ = pinched_bounds.OffsetFromOrigin();
-
-  return overflow;
+gfx::SizeF PinchZoomViewport::LayoutSpaceViewportSize() const {

[danakj, 2013/01/22 23:42:15]

This is just some math. Can you inline in the header please?

+  return gfx::ScaleSize(device_viewport_size_,
+                        1 / (device_scale_factor_ * total_page_scale_factor()));
 }
 
 gfx::Transform PinchZoomViewport::ImplTransform(
@@ -93,17 +60,8 @@ gfx::Transform PinchZoomViewport::ImplTransform(
   gfx::Transform transform;
   transform.Scale(page_scale_delta_, page_scale_delta_);
 
-  // If the pinch state is applied in the impl, then push it to the
-  // impl transform, otherwise the scale is handled by WebCore.
-  if (page_scale_pinch_zoom_enabled) {
+  if (page_scale_pinch_zoom_enabled)
     transform.Scale(page_scale_factor_, page_scale_factor_);
-    // The offset needs to be scaled by deviceScaleFactor as this transform
-    // needs to work with physical pixels.
-    gfx::Vector2dF zoomed_device_viewport_offset
-      = gfx::ScaleVector2d(zoomed_viewport_offset_, device_scale_factor_);
-    transform.Translate(-zoomed_device_viewport_offset.x(),
-                        -zoomed_device_viewport_offset.y());
-  }
 
   return transform;
 }