[repaint-after-layout] Skip invalidations if our RenderView did a full invalidation.

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 981 matching lines @@
 
     scheduleOrPerformPostLayoutTasks();
 
     InspectorInstrumentation::didLayout(cookie, rootForThisLayout);
 
     m_nestedLayoutCount--;
     if (m_nestedLayoutCount)
         return;
 
     if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled()) {
-        if (m_doFullRepaint)
-            renderView()->setShouldDoFullRepaintAfterLayout(true);
-
         repaintTree(rootForThisLayout);
 
     } else if (m_doFullRepaint) {
         // FIXME: This isn't really right, since the RenderView doesn't fully encompass
         // the visibleContentRect(). It just happens to work out most of the time,
         // since first layouts and printing don't have you scrolled anywhere.
         renderView()->repaint();
     }
 
     m_doFullRepaint = false;
@@ skipping 22 matching lines @@
     ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled());
     ASSERT(!root->needsLayout());
     // We should only repaint for the outer most layout. This works as
     // we continue to track repaint rects until this function is called.
     ASSERT(!m_nestedLayoutCount);
 
     // FIXME: really, we're in the repaint phase here, and the compositing queries are legal.
     // Until those states are fully fledged, I'll just disable the ASSERTS.
     DisableCompositingQueryAsserts disabler;
 
+    // If we are set to do a full repaint that means the RenderView will be
+    // invalidated. We can then skip issuing of invalidations for the child
+    // renderers as they'll be covered by the RenderView.
+    if (m_doFullRepaint) {
+        RenderObject* view = renderView();

[Julien - ping for review, 2014/03/31 20:28:35]

RenderView* view = renderView()!!!

[dsinclair, 2014/03/31 20:53:52]

Done.

+        view->repaintAfterLayoutIfNeeded(view->containerForRepaint(), true, view->oldRepaintRect(), &(view->newRepaintRect()));
+
+        // Clear the invalidation flags for the render view and child renderers.
+        for (RenderObject* renderer = view; renderer; renderer = renderer->nextInPreOrder()) {

[Julien - ping for review, 2014/03/31 20:28:35]

Shouldn't this be done on the |root|-rooted subtree and not the whole render
tree? (which would eliminate the need for |view|)

[dsinclair, 2014/03/31 20:53:52]

Done. Keeping view as it's used 4 times on the repaintAfterLayoutIfNeeded call.

+            renderer->clearRepaintState();
+        }
+        return;
+    }
+

[Julien - ping for review, 2014/03/31 20:28:35]

How about adding an ASSERT here that we don't need m_doFullRepaint as it would
mean unneeded invalidations?

[dsinclair, 2014/03/31 20:53:52]

Done.

     for (RenderObject* renderer = root; renderer; renderer = renderer->nextInPreOrder()) {
-        const LayoutRect& oldRepaintRect = renderer->oldRepaintRect();
-        const LayoutRect& newRepaintRect = renderer->newRepaintRect();
-
         if ((renderer->onlyNeededPositionedMovementLayout() && renderer->compositingState() != PaintsIntoOwnBacking)
             || (renderer->shouldDoFullRepaintIfSelfPaintingLayer()
                 && renderer->hasLayer()
                 && toRenderLayerModelObject(renderer)->layer()->isSelfPaintingLayer())) {
             renderer->setShouldDoFullRepaintAfterLayout(true);
         }
 
         // FIXME: Currently renderers with layers will get repainted when we call updateLayerPositionsAfterLayout.
         // That call should be broken apart to position the layers be done before
         // the repaintTree call so this will repaint everything.
         bool didFullRepaint = false;
         if (!renderer->layoutDidGetCalled()) {
             if (renderer->shouldDoFullRepaintAfterLayout()) {
                 renderer->repaint();
                 didFullRepaint = true;
             }
 
         } else {
             didFullRepaint = renderer->repaintAfterLayoutIfNeeded(renderer->containerForRepaint(),
-                renderer->shouldDoFullRepaintAfterLayout(), oldRepaintRect, &newRepaintRect);
+                renderer->shouldDoFullRepaintAfterLayout(), renderer->oldRepaintRect(), &(renderer->newRepaintRect()));
         }
 
         if (!didFullRepaint)
             renderer->repaintOverflowIfNeeded();
 
         // Repaint any scrollbars if there is a scrollable area for this renderer.
         if (RenderLayerScrollableArea* area = renderer->enclosingLayer()->scrollableArea()) {
             if (area->hasVerticalBarDamage())
                 renderer->repaintRectangle(area->verticalBarDamage());
             if (area->hasHorizontalBarDamage())
@@ skipping 2172 matching lines @@
 void FrameView::willRemoveScrollbar(Scrollbar* scrollbar, ScrollbarOrientation orientation)
 {
     ScrollableArea::willRemoveScrollbar(scrollbar, orientation);
     if (AXObjectCache* cache = axObjectCache()) {
         cache->remove(scrollbar);
         cache->handleScrollbarUpdate(this);
     }
 }
 
 } // namespace WebCore