Remove scroll_clip_layer dependency from viewport layer tracking

third_party/WebKit/Source/platform/testing/WebLayerTreeViewImplForTesting.cpp

 // Copyright 2013 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 "platform/testing/WebLayerTreeViewImplForTesting.h"
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/animation/animation_host.h"
 #include "cc/animation/animation_timeline.h"
 #include "cc/blink/web_layer_impl.h"
@@ skipping 131 matching lines @@
   // Intentionally do not create and set an CompositorFrameSink.
 }
 
 void WebLayerTreeViewImplForTesting::DidFailToInitializeCompositorFrameSink() {
   NOTREACHED();
 }
 
 void WebLayerTreeViewImplForTesting::RegisterViewportLayers(
     const blink::WebLayer* overscroll_elasticity_layer,
     const blink::WebLayer* page_scale_layer,
+    const blink::WebLayer* inner_viewport_container_layer,
+    const blink::WebLayer* outer_viewport_container_layer,
     const blink::WebLayer* inner_viewport_scroll_layer,
     const blink::WebLayer* outer_viewport_scroll_layer) {
   layer_tree_host_->RegisterViewportLayers(
       overscroll_elasticity_layer ? static_cast<const cc_blink::WebLayerImpl*>(
                                         overscroll_elasticity_layer)
                                         ->layer()
                                   : nullptr,
       static_cast<const cc_blink::WebLayerImpl*>(page_scale_layer)->layer(),
+      inner_viewport_container_layer
+          ? static_cast<const cc_blink::WebLayerImpl*>(
+                inner_viewport_container_layer)
+                ->layer()
+          : nullptr,
+      outer_viewport_container_layer
+          ? static_cast<const cc_blink::WebLayerImpl*>(
+                outer_viewport_container_layer)
+                ->layer()
+          : nullptr,
       static_cast<const cc_blink::WebLayerImpl*>(inner_viewport_scroll_layer)
           ->layer(),
       outer_viewport_scroll_layer ? static_cast<const cc_blink::WebLayerImpl*>(
                                         outer_viewport_scroll_layer)
                                         ->layer()
                                   : nullptr);
 }
 
 void WebLayerTreeViewImplForTesting::ClearViewportLayers() {
   layer_tree_host_->RegisterViewportLayers(
       scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>(),
+      scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>(),
       scoped_refptr<cc::Layer>(), scoped_refptr<cc::Layer>());
 }
 
 void WebLayerTreeViewImplForTesting::RegisterSelection(
     const blink::WebSelection& selection) {}
 
 void WebLayerTreeViewImplForTesting::ClearSelection() {}
 
 void WebLayerTreeViewImplForTesting::SetEventListenerProperties(
     blink::WebEventListenerClass event_class,
@@ skipping 20 matching lines @@
 
 bool WebLayerTreeViewImplForTesting::HaveScrollEventHandlers() const {
   return layer_tree_host_->have_scroll_event_handlers();
 }
 
 bool WebLayerTreeViewImplForTesting::IsForSubframe() {
   return false;
 }
 
 }  // namespace blink