Remove scroll_clip_layer dependency from viewport layer tracking

third_party/WebKit/Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 3808 matching lines @@
 void WebViewImpl::RegisterViewportLayersWithCompositor() {
   DCHECK(layer_tree_view_);
 
   if (!GetPage()->MainFrame() || !GetPage()->MainFrame()->IsLocalFrame())
     return;
 
   Document* document = GetPage()->DeprecatedLocalMainFrame()->GetDocument();
 
   DCHECK(document);
 
-  // Get the outer viewport scroll layer.
+  // Get the outer viewport scroll layers.
+  GraphicsLayer* layout_viewport_container_layer =
+      GetPage()->GlobalRootScrollerController().RootContainerLayer();
+  WebLayer* layout_viewport_container_web_layer =
+      layout_viewport_container_layer
+          ? layout_viewport_container_layer->PlatformLayer()
+          : nullptr;
+
   GraphicsLayer* layout_viewport_scroll_layer =
       GetPage()->GlobalRootScrollerController().RootScrollerLayer();
-  WebLayer* layout_viewport_web_layer =
+  WebLayer* layout_viewport_scroll_web_layer =
       layout_viewport_scroll_layer
           ? layout_viewport_scroll_layer->PlatformLayer()
           : nullptr;
 
   VisualViewport& visual_viewport = GetPage()->GetVisualViewport();
 
   // TODO(bokan): This was moved here from when registerViewportLayers was a
   // part of VisualViewport and maybe doesn't belong here. See comment inside
   // the mehtod.
-  visual_viewport.SetScrollLayerOnScrollbars(layout_viewport_web_layer);
+  visual_viewport.SetScrollLayerOnScrollbars(layout_viewport_scroll_web_layer);
 
   layer_tree_view_->RegisterViewportLayers(
       visual_viewport.OverscrollElasticityLayer()->PlatformLayer(),
       visual_viewport.PageScaleLayer()->PlatformLayer(),
+      visual_viewport.ContainerLayer()->PlatformLayer(),
+      layout_viewport_container_web_layer,
       visual_viewport.ScrollLayer()->PlatformLayer(),
-      layout_viewport_web_layer);
+      layout_viewport_scroll_web_layer);
 }
 
 void WebViewImpl::SetRootGraphicsLayer(GraphicsLayer* graphics_layer) {
   if (!layer_tree_view_)
     return;
 
   // In SPv2, setRootLayer is used instead.
   DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled());
 
   VisualViewport& visual_viewport = GetPage()->GetVisualViewport();
@@ skipping 292 matching lines @@
   if (focused_frame->LocalFrameRoot() != MainFrameImpl()->GetFrame())
     return nullptr;
   return focused_frame;
 }
 
 LocalFrame* WebViewImpl::FocusedLocalFrameAvailableForIme() const {
   return ime_accept_events_ ? FocusedLocalFrameInWidget() : nullptr;
 }
 
 }  // namespace blink