Made top controls work with virtual viewport pinch-to-zoom. (Chromium)

cc/layers/layer_impl.cc

 // Copyright 2012 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/layers/layer_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/debug/trace_event_argument.h"
 #include "base/json/json_reader.h"
 #include "base/strings/stringprintf.h"
@@ skipping 753 matching lines @@
 
   layer_tree_impl_->DidAnimateScrollOffset();
 }
 
 void LayerImpl::OnAnimationWaitingForDeletion() {}
 
 bool LayerImpl::IsActive() const {
   return layer_tree_impl_->IsActiveTree();
 }
 
 // TODO(aelias): Convert so that bounds returns SizeF.

[danakj, 2014/10/10 18:47:16]

remove

[bokan, 2014/10/10 19:25:54]

Done.

 gfx::Size LayerImpl::bounds() const {
   return gfx::ToCeiledSize(gfx::SizeF(bounds_.width() + bounds_delta_.x(),

[danakj, 2014/10/10 18:47:15]

can you snap the delta to an int here and add that to the bounds_ instead of
doing the addition with floats?

[bokan, 2014/10/10 19:25:54]

Done.

                                       bounds_.height() + bounds_delta_.y()));
 }
 
+gfx::SizeF LayerImpl::BoundsForScrolling() const {

[danakj, 2014/10/10 18:47:15]

This is much less scary than changing bounds(), thanks.

+  return gfx::SizeF(bounds_.width() + bounds_delta_.x(),
+                    bounds_.height() + bounds_delta_.y());
+}
+
 void LayerImpl::SetBounds(const gfx::Size& bounds) {
   if (bounds_ == bounds)
     return;
 
   bounds_ = bounds;
 
   ScrollbarParametersDidChange(true);
   if (masks_to_bounds())
     NoteLayerPropertyChangedForSubtree();
   else
@@ skipping 373 matching lines @@
 
 gfx::ScrollOffset LayerImpl::MaxScrollOffset() const {
   if (!scroll_clip_layer_ || bounds().IsEmpty())
     return gfx::ScrollOffset();
 
   LayerImpl const* page_scale_layer = layer_tree_impl()->page_scale_layer();
   DCHECK(this != page_scale_layer);
   DCHECK(this != layer_tree_impl()->InnerViewportScrollLayer() ||
          IsContainerForFixedPositionLayers());
 
-  gfx::SizeF scaled_scroll_bounds(bounds());
+  gfx::SizeF scaled_scroll_bounds(BoundsForScrolling());
 
   float scale_factor = 1.f;
   for (LayerImpl const* current_layer = this;
        current_layer != scroll_clip_layer_;
        current_layer = current_layer->parent()) {
     DCHECK(current_layer);
     float current_layer_scale = 1.f;
 
     const gfx::Transform& layer_transform = current_layer->transform();
     if (current_layer == page_scale_layer) {
@@ skipping 372 matching lines @@
 }
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
     Animation::TargetProperty target_property) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
 }  // namespace cc