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

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index 8ec58d08914a74881c9cdea69332274fb6a15fda..964c34c03740429c6c1a8d8f8360a022f24187a2 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -1044,16 +1044,21 @@ void FrameView::repaintTree(RenderObject* root)
     // Until those states are fully fledged, I'll just disable the ASSERTS.
     DisableCompositingQueryAsserts disabler;
 
-    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);
+    // If the RenderView did a full invalidation, skip issuing invalidations for
+    // the child RenderObjects as they will be covered by the RenderView invalidation.
+    if (root->isRenderView() && root->shouldDoFullRepaintAfterLayout()) {

[Julien - ping for review, 2014/03/31 20:00:56]

I think we could simplify even further here as we do the following:
- if m_doFullRepaint == true, mark RenderView as needing full repaint.
- check shouldDoFullRepaintAfterLayout() here.

It seems we could just remove the first part of the logic and just check
m_doFullRepaint here.

Also it seems like if we are doing a full repaint, we don't care what the root
for layout is. We would just have to be careful to repaint the RenderView.

[dsinclair, 2014/03/31 20:10:24]

Done.

+        root->repaintAfterLayoutIfNeeded(root->containerForRepaint(),
+            root->shouldDoFullRepaintAfterLayout(), root->oldRepaintRect(), &(root->newRepaintRect()));
+
+        // Clear the invalidation flags for the root and child renderers.
+        for (RenderObject* renderer = root; renderer; renderer = renderer->nextInPreOrder()) {
+            renderer->clearRepaintState();
         }
+        return;
+    }
+
+    for (RenderObject* renderer = root; renderer; renderer = renderer->nextInPreOrder()) {
+        renderer->updateShouldDoFullRepaintAfterLayout();

[Julien - ping for review, 2014/03/31 20:00:56]

I find that this function obfuscate the code as 'update' is a generic term. I
would just leave the code inlined (as I couldn't think of a better name for it).

[dsinclair, 2014/03/31 20:10:24]

Done.

 
         // 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
@@ -1067,7 +1072,7 @@ void FrameView::repaintTree(RenderObject* root)
 
         } else {
             didFullRepaint = renderer->repaintAfterLayoutIfNeeded(renderer->containerForRepaint(),
-                renderer->shouldDoFullRepaintAfterLayout(), oldRepaintRect, &newRepaintRect);
+                renderer->shouldDoFullRepaintAfterLayout(), renderer->oldRepaintRect(), &(renderer->newRepaintRect()));
         }
 
         if (!didFullRepaint)