Delete CC-impl-side clip layer adjustment.

cc/trees/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/trees/layer_tree_impl.h"
 
 #include "base/debug/trace_event.h"
 #include "cc/animation/keyframed_animation_curve.h"
 #include "cc/animation/scrollbar_animation_controller.h"
 #include "cc/debug/traced_value.h"
@@ skipping 122 matching lines @@
             target_tree->root_layer(), hud_layer()->id())));
   else
     target_tree->set_hud_layer(NULL);
 }
 
 LayerImpl* LayerTreeImpl::RootScrollLayer() const {
   DCHECK(IsActiveTree());
   return root_scroll_layer_;
 }
 
-LayerImpl* LayerTreeImpl::RootClipLayer() const {
+LayerImpl* LayerTreeImpl::RootContainerLayer() const {
   return root_scroll_layer_ ? root_scroll_layer_->parent() : NULL;
 }
 
 LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const {
   DCHECK(IsActiveTree());
   return currently_scrolling_layer_;
 }
 
 void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) {
   if (currently_scrolling_layer_ == layer)
@@ skipping 72 matching lines @@
   DCHECK(settings().solid_color_scrollbars);
 
   LayerImpl* root_scroll = RootScrollLayer();
   DCHECK(root_scroll);
   DCHECK(IsActiveTree());
 
   gfx::RectF scrollable_viewport(
       gfx::PointAtOffsetFromOrigin(root_scroll->TotalScrollOffset()),
       ScrollableViewportSize());
   float vertical_adjust = 0.0f;
-  if (RootClipLayer())
+  if (RootContainerLayer())
     vertical_adjust = layer_tree_host_impl_->VisibleViewportSize().height() -
-                      RootClipLayer()->bounds().height();
+                      RootContainerLayer()->bounds().height();
   if (ScrollbarLayerImpl* horiz = root_scroll->horizontal_scrollbar_layer()) {
     horiz->set_vertical_adjust(vertical_adjust);
     horiz->set_visible_to_total_length_ratio(
         scrollable_viewport.width() / ScrollableSize().width());
   }
   if (ScrollbarLayerImpl* vertical = root_scroll->vertical_scrollbar_layer()) {
     vertical->set_vertical_adjust(vertical_adjust);
     vertical->set_visible_to_total_length_ratio(
         scrollable_viewport.height() / ScrollableSize().height());
   }
 }
 
 void LayerTreeImpl::UpdateDrawProperties() {
-  if (IsActiveTree() && RootScrollLayer() && RootClipLayer())
+  if (IsActiveTree() && RootScrollLayer() && RootContainerLayer())
     UpdateRootScrollLayerSizeDelta();
 
   if (settings().solid_color_scrollbars &&
       IsActiveTree() &&
       RootScrollLayer()) {
     UpdateSolidColorScrollbars();
-
-    // The top controls manager is incompatible with the WebKit-created cliprect
-    // because it can bring into view a larger amount of content when it
-    // hides. It's safe to deactivate the clip rect if no non-overlay scrollbars
-    // are present.
-    if (RootClipLayer() && layer_tree_host_impl_->top_controls_manager())
-      RootClipLayer()->SetMasksToBounds(false);
   }
 
   needs_update_draw_properties_ = false;
   render_surface_layer_list_.clear();
 
   // For max_texture_size.
   if (!layer_tree_host_impl_->renderer())
       return;
 
   if (!root_layer())
@@ skipping 242 matching lines @@
       LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) {
   root_layer_scroll_offset_delegate_ = root_layer_scroll_offset_delegate;
   if (root_scroll_layer_) {
     root_scroll_layer_->SetScrollOffsetDelegate(
         root_layer_scroll_offset_delegate_);
   }
 }
 
 void LayerTreeImpl::UpdateRootScrollLayerSizeDelta() {
   LayerImpl* root_scroll = RootScrollLayer();
-  LayerImpl* root_clip = RootClipLayer();
+  LayerImpl* root_container = RootContainerLayer();
   DCHECK(root_scroll);
-  DCHECK(root_clip);
+  DCHECK(root_container);
   DCHECK(IsActiveTree());
 
   gfx::Vector2dF scrollable_viewport_size =
       gfx::RectF(ScrollableViewportSize()).bottom_right() - gfx::PointF();
 
   gfx::Vector2dF original_viewport_size =
-      gfx::RectF(root_clip->bounds()).bottom_right() -
+      gfx::RectF(root_container->bounds()).bottom_right() -
       gfx::PointF();
   original_viewport_size.Scale(1 / page_scale_factor());
 
   root_scroll->SetFixedContainerSizeDelta(
       scrollable_viewport_size - original_viewport_size);
 }
 
 void LayerTreeImpl::SetLatencyInfo(const ui::LatencyInfo& latency_info) {
   latency_info_.MergeWith(latency_info);
 }
@@ skipping 38 matching lines @@
 const std::vector<LayerImpl*> LayerTreeImpl::LayersWithCopyOutputRequest()
     const {
   // Only the active tree needs to know about layers with copy requests, as
   // they are aborted if not serviced during draw.
   DCHECK(IsActiveTree());
 
   return layers_with_copy_output_request_;
 }
 
 }  // namespace cc