Fixed clip resize for document.rootScroller with inertTopControls

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 505 matching lines @@
   // TODO(wjmaclean): find out why scrollbars fail to resize for complex
   // subframes after changing the zoom level. For now always calling
   // updateScrollbarsIfNeeded() here fixes the issue, but it would be good to
   // discover the deeper cause of this. http://crbug.com/607987.
   updateScrollbarsIfNeeded();
 
   frameRectsChanged();
 
   updateParentScrollableAreaSet();
 
-  if (LayoutViewItem layoutView = this->layoutViewItem()) {
-    // TODO(majidvp): It seems that this only needs to be called when size
-    // is updated ignoring any change in the location.
-    if (layoutView.usesCompositing())
-      layoutView.compositor()->frameViewDidChangeSize();
-  }
-
   if (frameSizeChanged) {
     viewportSizeChanged(newRect.width() != oldRect.width(),
                         newRect.height() != oldRect.height());
 
     if (m_frame->isMainFrame())
       m_frame->host()->visualViewport().mainFrameDidChangeSize();
 
     frame().loader().restoreScrollPositionAndViewState();
   }
 }
@@ skipping 973 matching lines @@
 
     if (ScrollingCoordinator* scrollingCoordinator =
             this->scrollingCoordinator())
       scrollingCoordinator->frameViewFixedObjectsDidChange(this);
   }
 }
 
 void FrameView::viewportSizeChanged(bool widthChanged, bool heightChanged) {
   DCHECK(widthChanged || heightChanged);
 
+  if (LayoutViewItem layoutView = this->layoutViewItem()) {
+    if (layoutView.usesCompositing())
+      layoutView.compositor()->frameViewDidChangeSize();
+  }
+
+  // Ensure the root scroller compositing layers update geometry in response to
+  // the URL bar resizing.
+  if (m_frame->isMainFrame()) {
+    m_frame->document()
+        ->frameHost()
+        ->globalRootScrollerController()
+        .mainFrameViewResized();
+  }
+
   showOverlayScrollbars();
   if (RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
     // The background must be repainted when the FrameView is resized, even if
     // the initial containing block does not change (so we can't rely on layout
     // to issue the invalidation).  This is because the background fills the
     // main GraphicsLayer, which takes the size of the layout viewport.
     // TODO(skobes): Paint non-fixed backgrounds into the scrolling contents
     // layer and avoid this invalidation (http://crbug.com/568847).
     LayoutViewItem lvi = layoutViewItem();
     if (!lvi.isNull())
@@ skipping 1980 matching lines @@
   if (!m_frame->settings() || !m_frame->settings()->viewportEnabled() ||
       !m_frame->document() || !m_frame->host())
     return false;
 
   const TopDocumentRootScrollerController& controller =
       m_frame->host()->globalRootScrollerController();
 
   if (!controller.globalRootScroller())
     return false;
 
-  return RootScrollerUtil::scrollableAreaFor(
+  return RootScrollerUtil::scrollableAreaForRootScroller(
              *controller.globalRootScroller()) ==
          layoutViewportScrollableArea();
 }
 
 AXObjectCache* FrameView::axObjectCache() const {
   if (frame().document())
     return frame().document()->existingAXObjectCache();
   return nullptr;
 }
 
@@ skipping 24 matching lines @@
 
 void FrameView::didAddScrollbar(Scrollbar& scrollbar,
                                 ScrollbarOrientation orientation) {
   ScrollableArea::didAddScrollbar(scrollbar, orientation);
 }
 
 void FrameView::setBrowserControlsViewportAdjustment(float adjustment) {
   m_browserControlsViewportAdjustment = adjustment;
 }
 
+PaintLayer* FrameView::layer() const {
+  LayoutViewItem layoutView = layoutViewItem();
+  if (layoutView.isNull() || !layoutView.compositor())
+    return nullptr;
+
+  return layoutView.compositor()->rootLayer();
+}
+
 IntSize FrameView::maximumScrollOffsetInt() const {
   // Make the same calculation as in CC's LayerImpl::MaxScrollOffset()
   // FIXME: We probably shouldn't be storing the bounds in a float.
   // crbug.com/422331.
   IntSize visibleSize =
       visibleContentSize(ExcludeScrollbars) + browserControlsSize();
   IntSize contentBounds = contentsSize();
   IntSize maximumOffset =
       toIntSize(-scrollOrigin() + (contentBounds - visibleSize));
   return maximumOffset.expandedTo(minimumScrollOffsetInt());
@@ skipping 1032 matching lines @@
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.width();
 }
 
 int FrameView::initialViewportHeight() const {
   DCHECK(m_frame->isMainFrame());
   return m_initialViewportSize.height();
 }
 
 }  // namespace blink