Delete zoomed_viewport_offset_ and its users.

cc/layer_tree_impl.cc

 // Copyright 2011 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/layer_tree_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/layer_tree_host_common.h"
 #include "cc/layer_tree_host_impl.h"
 #include "ui/gfx/vector2d_conversions.h"
@@ skipping 76 matching lines @@
 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() {
   DCHECK(IsActiveTree());
   return currently_scrolling_layer_;
 }
 
 void LayerTreeImpl::ClearCurrentlyScrollingLayer() {
   currently_scrolling_layer_ = NULL;
   scrolling_layer_id_from_previous_tree_ = 0;
 }
 
+gfx::SizeF LayerTreeImpl::ScrollableViewportSize() const {
+  gfx::SizeF view_bounds;
+  // The clip layer should be used for scrolling bounds if available since it
+  // adjusts for non-overlay scrollbars. Otherwise, fall back to our knowledge
+  // of the physical viewport size.
+  LayerImpl* clip_layer = NULL;
+  if (root_scroll_layer_)
+    clip_layer = root_scroll_layer_->parent();
+  if (clip_layer && clip_layer->masksToBounds()) {
+    view_bounds = clip_layer->bounds();
+  } else {
+    view_bounds = gfx::ScaleSize(device_viewport_size(),
+        1 / device_scale_factor());
+  }
+  view_bounds.Scale(1 / pinch_zoom_viewport().total_page_scale_factor());
+
+  return view_bounds;
+}
+
 void LayerTreeImpl::UpdateMaxScrollOffset() {
   if (!root_scroll_layer_ || !root_scroll_layer_->children().size())
     return;
 
-  gfx::SizeF view_bounds;
-  if (!settings().pageScalePinchZoomEnabled) {
-    view_bounds = device_viewport_size();
-    if (LayerImpl* clip_layer = root_scroll_layer_->parent()) {
-      // Compensate for non-overlay scrollbars.
-      if (clip_layer->masksToBounds())
-        view_bounds = gfx::ScaleSize(clip_layer->bounds(), device_scale_factor());
-    }
-    view_bounds.Scale(1 / pinch_zoom_viewport().page_scale_delta());
-  } else {
-    view_bounds = layout_viewport_size();
-  }
-
   gfx::Vector2dF max_scroll = gfx::Rect(ScrollableSize()).bottom_right() -
-      gfx::RectF(view_bounds).bottom_right();
+      gfx::RectF(ScrollableViewportSize()).bottom_right();
 
   // The viewport may be larger than the contents in some cases, such as
   // having a vertical scrollbar but no horizontal overflow.
   max_scroll.ClampToMin(gfx::Vector2dF());
 
   root_scroll_layer_->setMaxScrollOffset(gfx::ToFlooredVector2d(max_scroll));
 }
 
 struct UpdateTilePrioritiesForLayer {
   void operator()(LayerImpl *layer) {
@@ skipping 233 matching lines @@
 
 AnimationRegistrar* LayerTreeImpl::animationRegistrar() const {
   return layer_tree_host_impl_->animationRegistrar();
 }
 
 const PinchZoomViewport& LayerTreeImpl::pinch_zoom_viewport() const {
   return layer_tree_host_impl_->pinchZoomViewport();
 }
 
 } // namespace cc