Remove scroll_clip_layer dependency from viewport layer tracking

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <limits>
@@ skipping 761 matching lines @@
   layer_tree_host_->SetNeedsAnimate();
 }
 
 void RenderWidgetCompositor::DidStopFlinging() {
   layer_tree_host_->DidStopFlinging();
 }
 
 void RenderWidgetCompositor::RegisterViewportLayers(
     const blink::WebLayer* overscrollElasticityLayer,
     const blink::WebLayer* pageScaleLayer,
+    const blink::WebLayer* innerViewportContainerLayer,
+    const blink::WebLayer* outerViewportContainerLayer,
     const blink::WebLayer* innerViewportScrollLayer,
     const blink::WebLayer* outerViewportScrollLayer) {
   layer_tree_host_->RegisterViewportLayers(
       // TODO(bokan): This check can probably be removed now, but it looks
-      // like overscroll elasticity may still be NULL until VisualViewport
+      // like overscroll elasticity may still be nullptr until VisualViewport
       // registers its layers.
       overscrollElasticityLayer ? static_cast<const cc_blink::WebLayerImpl*>(
                                       overscrollElasticityLayer)
                                       ->layer()
-                                : NULL,
+                                : nullptr,
       static_cast<const cc_blink::WebLayerImpl*>(pageScaleLayer)->layer(),
+      innerViewportContainerLayer ? static_cast<const cc_blink::WebLayerImpl*>(
+                                        innerViewportContainerLayer)
+                                        ->layer()
+                                  : nullptr,
+      outerViewportContainerLayer ? static_cast<const cc_blink::WebLayerImpl*>(
+                                        outerViewportContainerLayer)
+                                        ->layer()
+                                  : nullptr,
       static_cast<const cc_blink::WebLayerImpl*>(innerViewportScrollLayer)
           ->layer(),
       // TODO(bokan): This check can probably be removed now, but it looks
-      // like overscroll elasticity may still be NULL until VisualViewport
+      // like overscroll elasticity may still be nullptr until VisualViewport
       // registers its layers.
       outerViewportScrollLayer
           ? static_cast<const cc_blink::WebLayerImpl*>(outerViewportScrollLayer)
                 ->layer()
-          : NULL);
+          : nullptr);
 }
 
 void RenderWidgetCompositor::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 RenderWidgetCompositor::RegisterSelection(
     const blink::WebSelection& selection) {
   layer_tree_host_->RegisterSelection(ConvertWebSelection(selection));
 }
 
 void RenderWidgetCompositor::ClearSelection() {
   cc::LayerSelection empty_selection;
@@ skipping 395 matching lines @@
     const cc::LocalSurfaceId& local_surface_id) {
   layer_tree_host_->SetLocalSurfaceId(local_surface_id);
 }
 
 void RenderWidgetCompositor::NotifySwapTime(ReportTimeCallback callback) {
   QueueSwapPromise(base::MakeUnique<ReportTimeSwapPromise>(
       std::move(callback), base::ThreadTaskRunnerHandle::Get()));
 }
 
 }  // namespace content