Remove scroll_clip_layer dependency from viewport layer tracking

cc/trees/layer_tree_host.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_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 155 matching lines @@
 LayerTreeHost::~LayerTreeHost() {
   // Track when we're inside a main frame to see if compositor is being
   // destroyed midway which causes a crash. crbug.com/654672
   DCHECK(!inside_main_frame_);
   TRACE_EVENT0("cc", "LayerTreeHostInProcess::~LayerTreeHostInProcess");
 
   // Clear any references into the LayerTreeHost.
   mutator_host_->SetMutatorHostClient(nullptr);
 
   // We must clear any pointers into the layer tree prior to destroying it.
-  RegisterViewportLayers(nullptr, nullptr, nullptr, nullptr);
+  RegisterViewportLayers(nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
 
   if (root_layer_) {
     root_layer_->SetLayerTreeHost(nullptr);
 
     // The root layer must be destroyed before the layer tree. We've made a
     // contract with our animation controllers that the animation_host will
     // outlive them, and we must make good.
     root_layer_ = nullptr;
   }
 
@@ skipping 712 matching lines @@
   // Reset gpu rasterization tracking.
   // This flag is sticky until a new tree comes along.
   ResetGpuRasterizationTracking();
 
   SetNeedsFullTreeSync();
 }
 
 void LayerTreeHost::RegisterViewportLayers(
     scoped_refptr<Layer> overscroll_elasticity_layer,
     scoped_refptr<Layer> page_scale_layer,
+    scoped_refptr<Layer> inner_viewport_container_layer,
+    scoped_refptr<Layer> outer_viewport_container_layer,
     scoped_refptr<Layer> inner_viewport_scroll_layer,
     scoped_refptr<Layer> outer_viewport_scroll_layer) {
   DCHECK(!inner_viewport_scroll_layer ||
          inner_viewport_scroll_layer != outer_viewport_scroll_layer);
   overscroll_elasticity_layer_ = overscroll_elasticity_layer;
   page_scale_layer_ = page_scale_layer;
+  inner_viewport_container_layer_ = inner_viewport_container_layer;
+  outer_viewport_container_layer_ = outer_viewport_container_layer;
   inner_viewport_scroll_layer_ = inner_viewport_scroll_layer;
   outer_viewport_scroll_layer_ = outer_viewport_scroll_layer;
 }
 
 void LayerTreeHost::RegisterSelection(const LayerSelection& selection) {
   if (selection_ == selection)
     return;
 
   selection_ = selection;
   SetNeedsCommit();
@@ skipping 241 matching lines @@
       EventListenerClass::kMouseWheel,
       event_listener_properties(EventListenerClass::kMouseWheel));
   tree_impl->set_event_listener_properties(
       EventListenerClass::kTouchEndOrCancel,
       event_listener_properties(EventListenerClass::kTouchEndOrCancel));
 
   if (page_scale_layer_ && inner_viewport_scroll_layer_) {
     tree_impl->SetViewportLayersFromIds(
         overscroll_elasticity_layer_ ? overscroll_elasticity_layer_->id()
                                      : Layer::INVALID_ID,
-        page_scale_layer_->id(), inner_viewport_scroll_layer_->id(),
+        page_scale_layer_->id(),
+        inner_viewport_container_layer_ ? inner_viewport_container_layer_->id()
+                                        : Layer::INVALID_ID,
+        outer_viewport_container_layer_ ? outer_viewport_container_layer_->id()
+                                        : Layer::INVALID_ID,
+        inner_viewport_scroll_layer_->id(),
         outer_viewport_scroll_layer_ ? outer_viewport_scroll_layer_->id()
                                      : Layer::INVALID_ID);
     DCHECK(inner_viewport_scroll_layer_->IsContainerForFixedPositionLayers());
   } else {
     tree_impl->ClearViewportLayers();
   }
 
   tree_impl->RegisterSelection(selection_);
 
   tree_impl->PushPageScaleFromMainThread(
@@ skipping 288 matching lines @@
 void LayerTreeHost::SetNeedsDisplayOnAllLayers() {
   for (auto* layer : *this)
     layer->SetNeedsDisplay();
 }
 
 void LayerTreeHost::SetHasCopyRequest(bool has_copy_request) {
   has_copy_request_ = has_copy_request;
 }
 
 }  // namespace cc