Move RenderLayer repainting to repaint-after-layout framework.

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 73ffa854dab6d72fa68181f37a886b4eaa8ca77a..8b105fb0bb5684a0560b99a480043c40d21124cb 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -1050,26 +1050,35 @@ void FrameView::repaintTree(RenderObject* root)
         const LayoutRect& oldRepaintRect = renderer->oldRepaintRect();
         const LayoutRect& newRepaintRect = renderer->newRepaintRect();
 
-        LayoutRect oldOutlineRect = oldRepaintRect;
-
-        LayoutRect newOutlineRect = 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->hasLayer()) {
-            if (!renderer->layoutDidGetCalled()) {
-                if (renderer->shouldDoFullRepaintAfterLayout()) {
-                    renderer->repaint();
-                    didFullRepaint = true;
-                }
+        if (!renderer->layoutDidGetCalled()) {
+            if (renderer->shouldDoFullRepaintAfterLayout()) {
+                renderer->repaint();
+                didFullRepaint = true;
+            }
 
-            } else {
-                didFullRepaint = renderer->repaintAfterLayoutIfNeeded(renderer->containerForRepaint(),
-                    renderer->shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldOutlineRect,
-                    &newRepaintRect, &newOutlineRect);
+        } else {
+            LayoutRect oldOutlineRect;
+            LayoutRect newOutlineRect;
+
+            if (renderer->hasOutline()) {
+                newOutlineRect = renderer->newOutlineRect();
+                oldOutlineRect = renderer->oldOutlineRect();
             }
+
+            didFullRepaint = renderer->repaintAfterLayoutIfNeeded(renderer->containerForRepaint(),
+                renderer->shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldOutlineRect,
+                &newRepaintRect, &newOutlineRect);
         }
 
         if (!didFullRepaint)
@@ -1091,7 +1100,7 @@ void FrameView::repaintTree(RenderObject* root)
             listBox->repaintScrollbarIfNeeded();
         }
 
-        renderer->clearRepaintRects();
+        renderer->clearRepaintState();
     }
 
     // Repaint the frameviews scrollbars if needed