Invalidate FrameView paint properties on frame rect change only when necessary

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 524 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 (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() &&
+      !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+    // The overflow clip property depends on the frame size and the pre
+    // translation property depends on the frame location.
+    setNeedsPaintPropertyUpdate();
+  }
+
   if (frameSizeChanged) {
     viewportSizeChanged(newRect.width() != oldRect.width(),
                         newRect.height() != oldRect.height());
 
     if (m_frame->isMainFrame())
       m_frame->host()->visualViewport().mainFrameDidChangeSize();
 
     frame().loader().restoreScrollPositionAndViewState();
   }
 }
@@ skipping 3214 matching lines @@
   if (!page || m_frame->eventHandler().isMousePositionUnknown())
     return;
   page->chromeClient().setCursor(cursor, m_frame);
 }
 
 void FrameView::frameRectsChanged() {
   TRACE_EVENT0("blink", "FrameView::frameRectsChanged");
   if (layoutSizeFixedToFrameSize())
     setLayoutSizeInternal(frameRect().size());
 
-  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
-    // The overflow clip property depends on the frame rect.
-    setNeedsPaintPropertyUpdate();
-  }
-
   for (const auto& child : m_children)
     child->frameRectsChanged();
 }
 
 void FrameView::setLayoutSizeInternal(const IntSize& size) {
   if (m_layoutSize == size)
     return;
 
   m_layoutSize = size;
   contentsResized();
@@ skipping 480 matching lines @@
 void FrameView::scrollContents(const IntSize& scrollDelta) {
   HostWindow* window = getHostWindow();
   if (!window)
     return;
 
   TRACE_EVENT0("blink", "FrameView::scrollContents");
 
   if (!scrollContentsFastPath(-scrollDelta))
     scrollContentsSlowPath();
 
+  if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() &&
+      !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
+    // Need to update scroll translation property.
+    setNeedsPaintPropertyUpdate();
+  }
+
   // This call will move children with native widgets (plugins) and invalidate
   // them as well.
   frameRectsChanged();
 }
 
 IntPoint FrameView::contentsToFrame(const IntPoint& pointInContentSpace) const {
   return pointInContentSpace - scrollOffsetInt();
 }
 
 IntRect FrameView::contentsToFrame(const IntRect& rectInContentSpace) const {
@@ skipping 332 matching lines @@
 }
 
 void FrameView::show() {
   if (!isSelfVisible()) {
     setSelfVisible(true);
     if (ScrollingCoordinator* scrollingCoordinator =
             this->scrollingCoordinator())
       scrollingCoordinator->frameViewVisibilityDidChange();
     setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
     updateParentScrollableAreaSet();
-    if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
+    if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() &&
+        !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       // The existance of scrolling properties depends on visibility through
       // isScrollable() so ensure properties are updated if visibility changes.
       setNeedsPaintPropertyUpdate();
     }
     if (isParentVisible()) {
       for (const auto& child : m_children)
         child->setParentVisible(true);
     }
   }
 
   Widget::show();
 }
 
 void FrameView::hide() {
   if (isSelfVisible()) {
     if (isParentVisible()) {
       for (const auto& child : m_children)
         child->setParentVisible(false);
     }
     setSelfVisible(false);
     if (ScrollingCoordinator* scrollingCoordinator =
             this->scrollingCoordinator())
       scrollingCoordinator->frameViewVisibilityDidChange();
     setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
     updateParentScrollableAreaSet();
-    if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) {
+    if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled() &&
+        !RuntimeEnabledFeatures::rootLayerScrollingEnabled()) {
       // The existance of scrolling properties depends on visibility through
       // isScrollable() so ensure properties are updated if visibility changes.
       setNeedsPaintPropertyUpdate();
     }
   }
 
   Widget::hide();
 }
 
 int FrameView::viewportWidth() const {
@@ skipping 500 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink