Move RenderLayer repainting to repaint-after-layout framework.

Source/core/rendering/RenderObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 728 matching lines @@
             // A positioned object has no effect on the min/max width of its containing block ever.
             // We can optimize this case and not go up any further.
             break;
         o = container;
     }
 }
 
 void RenderObject::setLayerNeedsFullRepaint()
 {
     ASSERT(hasLayer());
-    toRenderLayerModelObject(this)->layer()->repainter().setRepaintStatus(NeedsFullRepaint);
+    if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
+        setShouldDoFullRepaintAfterLayout(true);
+    else
+        toRenderLayerModelObject(this)->layer()->repainter().setRepaintStatus(NeedsFullRepaint);
 }
 
 void RenderObject::setLayerNeedsFullRepaintForPositionedMovementLayout()
 {
     ASSERT(hasLayer());
-    toRenderLayerModelObject(this)->layer()->repainter().setRepaintStatus(NeedsFullRepaintForPositionedMovementLayout);
+    if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
+        setShouldDoFullRepaintAfterLayout(true);

[Julien - ping for review, 2014/03/04 18:22:10]

This is wrong :-/

It's OK to put a FIXME but this is an important optimization as it removes the
need for repainting when the object is hardware accelerated and we just move it
around.

[dsinclair, 2014/03/04 19:21:52]

Done.

Had to store another flag in this case so we can check the composited state.

+    else
+        toRenderLayerModelObject(this)->layer()->repainter().setRepaintStatus(NeedsFullRepaintForPositionedMovementLayout);
 }
 
 RenderBlock* RenderObject::containerForFixedPosition(const RenderLayerModelObject* repaintContainer, bool* repaintContainerSkipped) const
 {
     ASSERT(!repaintContainerSkipped || !*repaintContainerSkipped);
     ASSERT(!isText());
     ASSERT(style()->position() == FixedPosition);
 
     RenderObject* ancestor = parent();
     for (; ancestor && !ancestor->canContainFixedPositionObjects(); ancestor = ancestor->parent()) {
@@ skipping 827 matching lines @@
     }
     return false;
 }
 
 void RenderObject::repaintOverflow()
 {
 }
 
 bool RenderObject::checkForRepaint() const
 {
+    if (RuntimeEnabledFeatures::repaintAfterLayoutEnabled())
+        return !document().view()->needsFullRepaint() && everHadLayout();

[Julien - ping for review, 2014/03/04 18:22:10]

FYI I think we shouldn't check everHadLayout() here but it's an orthogonal
change.

[dsinclair, 2014/03/04 19:21:52]

Ack.

+
     return !document().view()->needsFullRepaint() && !hasLayer() && everHadLayout();
 }
 
 bool RenderObject::checkForRepaintDuringLayout() const
 {
     return !RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && checkForRepaint();
 }
 
 LayoutRect RenderObject::rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const
 {
@@ skipping 1694 matching lines @@
 {
     ASSERT_NOT_REACHED();
     return false;
 }
 
 bool RenderObject::isRelayoutBoundaryForInspector() const
 {
     return objectIsRelayoutBoundary(this);
 }
 
+const LayoutRect RenderObject::newOutlineRect()
+{
+    ASSERT(hasOutline());

[Julien - ping for review, 2014/03/04 18:22:10]

The outline rectangle includes the box shadow too (see
RenderBox::outlineBoundsForRepaint in particular the call to
adjustRectForOutlineAndShadow).

[dsinclair, 2014/03/04 19:21:52]

So, then the shadow isn't included in the repaint rect? Do we have a way to know
if there is a shadow?

Do I check if the textShadow list is empty and the boxShadow list is empty along
with the hasOutline?

[Julien - ping for review, 2014/03/07 18:26:38]

It is actually included in the repaint rect (see addVisualEffectOverflow). A
reason why we would need to account for it here is if it needs to ignore some
overflow clip but that seems unlikely.
I would have kept the intended logic however wonky it is as this patch is
already pretty heavy without it. Alternatively, we can try to remove box-shadow
from the outlineBox and see if something breaks (but it should be done before
this change to help narrow regressions).

+
+    OutlineRects* outlineRects = view()->outlineRects();
+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it == outlineRects->end())
+        return outlineBoundsForRepaint(containerForRepaint());
+    return it->value.newOutlineRect;
+}
+
+void RenderObject::setNewOutlineRect(const LayoutRect& rect)
+{
+    ASSERT(hasOutline());
+
+    OutlineRects* outlineRects = view()->outlineRects();
+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it == outlineRects->end())
+        outlineRects->set(this, OutlineRectInfo());
+
+    outlineRects->get(this).newOutlineRect = rect;
+}
+
+const LayoutRect RenderObject::oldOutlineRect()

[Julien - ping for review, 2014/03/04 18:22:10]

I don't see the point in making a copy of LayoutRect const. If it was a
reference it would be OK but you can't (unless you have a static local for the
not-found case)

[dsinclair, 2014/03/04 19:21:52]

Done.

+{
+    ASSERT(hasOutline());
+
+    OutlineRects* outlineRects = view()->outlineRects();
+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it == outlineRects->end())
+        return LayoutRect();
+    return it->value.oldOutlineRect;
+}
+
+void RenderObject::setOldOutlineRect(const LayoutRect& rect)
+{
+    ASSERT(hasOutline());
+
+    OutlineRects* outlineRects = view()->outlineRects();
+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it == outlineRects->end())
+        outlineRects->set(this, OutlineRectInfo());
+    outlineRects->get(this).oldOutlineRect = rect;
+}
+
+void RenderObject::clearRepaintState()
+{
+    setShouldDoFullRepaintAfterLayout(false);
+    setShouldDoFullRepaintIfSelfPaintingLayer(false);
+    setShouldRepaintOverflowIfNeeded(false);
+    setLayoutDidGetCalled(false);
+
+    OutlineRects* outlineRects = view()->outlineRects();
+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it != outlineRects->end())
+        outlineRects->remove(it);
+}
+
 } // namespace WebCore
 
 #ifndef NDEBUG
 
 void showTree(const WebCore::RenderObject* object)
 {
     if (object)
         object->showTreeForThis();
 }
 
@@ skipping 12 matching lines @@
 {
     if (object1) {
         const WebCore::RenderObject* root = object1;
         while (root->parent())
             root = root->parent();
         root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
     }
 }
 
 #endif