Replace overdraw_bottom_height with top_controls_layout_height.

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 591 matching lines @@
   num_dependents_need_push_properties_ = 0;
 }
 
 gfx::Vector2dF LayerImpl::FixedContainerSizeDelta() const {
   if (!scroll_clip_layer_)
     return gfx::Vector2dF();
 
   float scale_delta = layer_tree_impl()->page_scale_delta();
   float scale = layer_tree_impl()->page_scale_factor();
 
-  gfx::Vector2dF delta_from_scroll = scroll_clip_layer_->BoundsDelta();
+  gfx::Vector2dF delta_from_scroll = scroll_clip_layer_->bounds_delta();
   delta_from_scroll.Scale(1.f / scale);
 
   // The delta-from-pinch component requires some explanation: A viewport of
   // size (w,h) will appear to be size (w/s,h/s) under scale s in the content
   // space. If s -> s' on the impl thread, where s' = s * ds, then the apparent
   // viewport size change in the content space due to ds is:
   //
   // (w/s',h/s') - (w/s,h/s) = (w,h)(1/s' - 1/s) = (w,h)(1 - ds)/(s ds)
   //
   gfx::Vector2dF delta_from_pinch =
@@ skipping 141 matching lines @@
 }
 
 void LayerImpl::OnAnimationWaitingForDeletion() {}
 
 bool LayerImpl::IsActive() const {
   return layer_tree_impl_->IsActiveTree();
 }
 
 // TODO(wjmaclean) Convert so that bounds returns SizeF.
 gfx::Size LayerImpl::bounds() const {
-  return ToFlooredSize(temporary_impl_bounds_);
+  return gfx::ToFlooredSize(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;
-  temporary_impl_bounds_ = bounds;
 
   ScrollbarParametersDidChange();
   if (masks_to_bounds())
     NoteLayerPropertyChangedForSubtree();
   else
     NoteLayerPropertyChanged();
 }
 
-void LayerImpl::SetTemporaryImplBounds(const gfx::SizeF& bounds) {
-  if (temporary_impl_bounds_ == bounds)
+void LayerImpl::SetBoundsDelta(const gfx::Vector2dF& bounds_delta) {
+  if (bounds_delta_ == bounds_delta)
     return;
 
-  temporary_impl_bounds_ = bounds;
+  bounds_delta_ = bounds_delta;
 
   ScrollbarParametersDidChange();
   if (masks_to_bounds())
     NoteLayerPropertyChangedForSubtree();
   else
     NoteLayerPropertyChanged();
 }
 
 void LayerImpl::SetMaskLayer(scoped_ptr<LayerImpl> mask_layer) {
   int new_layer_id = mask_layer ? mask_layer->id() : -1;
@@ skipping 461 matching lines @@
   }
   // TODO(wjmaclean) Once we move to a model where the two-viewport model is
   // turned on in all builds, remove the next two lines. For now however, the
   // page scale layer may coincide with the clip layer, and so this is
   // necessary.
   if (page_scale_layer == scrollbar_clip_layer) {
     scroll_rect.Scale(layer_tree_impl()->total_page_scale_factor());
     current_offset.Scale(layer_tree_impl()->total_page_scale_factor());
   }
 
-  scrollbar_layer->SetVerticalAdjust(
-      layer_tree_impl()->VerticalAdjust(scrollbar_clip_layer->id()));
+  scrollbar_layer->SetVerticalAdjust(scrollbar_clip_layer->bounds_delta().y());
   if (scrollbar_layer->orientation() == HORIZONTAL) {
     float visible_ratio = clip_rect.width() / scroll_rect.width();
     scrollbar_layer->SetCurrentPos(current_offset.x());
     scrollbar_layer->SetMaximum(scroll_rect.width() - clip_rect.width());
     scrollbar_layer->SetVisibleToTotalLengthRatio(visible_ratio);
   } else {
     float visible_ratio = clip_rect.height() / scroll_rect.height();
     scrollbar_layer->SetCurrentPos(current_offset.y());
     scrollbar_layer->SetMaximum(scroll_rect.height() - clip_rect.height());
     scrollbar_layer->SetVisibleToTotalLengthRatio(visible_ratio);
@@ skipping 246 matching lines @@
 }
 
 void LayerImpl::NotifyAnimationFinished(
     base::TimeTicks monotonic_time,
     Animation::TargetProperty target_property) {
   if (target_property == Animation::ScrollOffset)
     layer_tree_impl_->InputScrollAnimationFinished();
 }
 
 }  // namespace cc