Fixed clip resize for document.rootScroller with inertTopControls

third_party/WebKit/Source/core/page/scrolling/TopDocumentRootScrollerController.cpp

 // Copyright 2016 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 "core/page/scrolling/TopDocumentRootScrollerController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
@@ skipping 23 matching lines @@
 DEFINE_TRACE(TopDocumentRootScrollerController) {
   visitor->trace(m_viewportApplyScroll);
   visitor->trace(m_globalRootScroller);
   visitor->trace(m_frameHost);
 }
 
 void TopDocumentRootScrollerController::didChangeRootScroller() {
   recomputeGlobalRootScroller();
 }
 
+void TopDocumentRootScrollerController::mainFrameViewResized() {
+  Element* rootScroller = globalRootScroller();
+  if (!rootScroller)
+    return;
+
+  ScrollableArea* area =
+      RootScrollerUtil::scrollableAreaForRootScroller(*rootScroller);
+
+  if (!area)
+    return;
+
+  if (PaintLayer* layer = area->layer()) {
+    layer->setNeedsCompositingInputsUpdate();
+
+    // This is needed if the root scroller is an iframe, since the iframe
+    // doesn't have a scrolling/clip layer, its PLC has a container layer that
+    // needs to be resized instead.
+    layer->compositor()->frameViewDidChangeSize();
+  }
+}
+
 Element* TopDocumentRootScrollerController::findGlobalRootScrollerElement() {
   if (!topDocument())
     return nullptr;
 
   DCHECK(topDocument()->rootScrollerController());
   Element* element =
       topDocument()->rootScrollerController()->effectiveRootScroller();
 
   while (element && element->isFrameOwnerElement()) {
     HTMLFrameOwnerElement* frameOwner = toHTMLFrameOwnerElement(element);
@@ skipping 11 matching lines @@
 }
 
 void TopDocumentRootScrollerController::recomputeGlobalRootScroller() {
   if (!m_viewportApplyScroll)
     return;
 
   Element* target = findGlobalRootScrollerElement();
   if (!target || target == m_globalRootScroller)
     return;
 
-  ScrollableArea* targetScroller = RootScrollerUtil::scrollableAreaFor(*target);
+  ScrollableArea* targetScroller =
+      RootScrollerUtil::scrollableAreaForRootScroller(*target);
 
   if (!targetScroller)
     return;
 
   if (m_globalRootScroller)
     m_globalRootScroller->removeApplyScroll();
 
   // Use disable-native-scroll since the ViewportScrollCallback needs to
   // apply scroll actions both before (BrowserControls) and after (overscroll)
   // scrolling the element so it will apply scroll to the element itself.
   target->setApplyScroll(m_viewportApplyScroll, "disable-native-scroll");
 
   // A change in global root scroller requires a compositing inputs update to
   // the new and old global root scroller since it might change how the
   // ancestor layers are clipped. e.g. An iframe that's the global root
   // scroller clips its layers like the root frame.  Normally this is set
   // when the local effective root scroller changes but the global root
   // scroller can change because the parent's effective root scroller
   // changes.
   setNeedsCompositingInputsUpdateOnGlobalRootScroller();
 
   ScrollableArea* oldRootScrollerArea =
-      m_globalRootScroller
-          ? RootScrollerUtil::scrollableAreaFor(*m_globalRootScroller.get())
-          : nullptr;
+      m_globalRootScroller ? RootScrollerUtil::scrollableAreaForRootScroller(
+                                 *m_globalRootScroller.get())
+                           : nullptr;
 
   m_globalRootScroller = target;
 
   setNeedsCompositingInputsUpdateOnGlobalRootScroller();
 
   // Ideally, scroll customization would pass the current element to scroll to
   // the apply scroll callback but this doesn't happen today so we set it
   // through a back door here. This is also needed by the
   // ViewportScrollCallback to swap the target into the layout viewport
   // in RootFrameViewport.
@@ skipping 59 matching lines @@
     return false;
 
   return callback == m_viewportApplyScroll.get();
 }
 
 GraphicsLayer* TopDocumentRootScrollerController::rootScrollerLayer() const {
   if (!m_globalRootScroller)
     return nullptr;
 
   ScrollableArea* area =
-      RootScrollerUtil::scrollableAreaFor(*m_globalRootScroller);
+      RootScrollerUtil::scrollableAreaForRootScroller(*m_globalRootScroller);
 
   if (!area)
     return nullptr;
 
   GraphicsLayer* graphicsLayer = area->layerForScrolling();
 
   // TODO(bokan): We should assert graphicsLayer here and
   // RootScrollerController should do whatever needs to happen to ensure
   // the root scroller gets composited.
 
   return graphicsLayer;
 }
 
+PaintLayer* TopDocumentRootScrollerController::rootScrollerPaintLayer() const {
+  return RootScrollerUtil::paintLayerForRootScroller(m_globalRootScroller);
+}
+
 Element* TopDocumentRootScrollerController::globalRootScroller() const {
   return m_globalRootScroller.get();
 }
 
 }  // namespace blink