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 731 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);
+    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 818 matching lines @@
     }
     return false;
 }
 
 void RenderObject::repaintOverflow()
 {
 }
 
 bool RenderObject::checkForRepaint() const
 {
-    return !document().view()->needsFullRepaint() && !hasLayer() && everHadLayout();
+    return !document().view()->needsFullRepaint() && everHadLayout();
 }
 
 bool RenderObject::checkForRepaintDuringLayout() const
 {
     return !RuntimeEnabledFeatures::repaintAfterLayoutEnabled() && checkForRepaint();
 }
 
 LayoutRect RenderObject::rectWithOutlineForRepaint(const RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const
 {
     LayoutRect r(clippedOverflowRectForRepaint(repaintContainer));
@@ skipping 1693 matching lines @@
 {
     ASSERT_NOT_REACHED();
     return false;
 }
 
 bool RenderObject::isRelayoutBoundaryForInspector() const
 {
     return objectIsRelayoutBoundary(this);
 }
 
+const LayoutRect RenderObject::newOutlineRect()
+{
+    OutlineRects* outlineRects = view()->outlineRects();

[esprehn, 2014/02/28 02:54:33]

ditto, you need a "hasOutlineRects" bitfield to guard the hash table. Hitting it
for every renderer inside paint isn't going to work.

[dsinclair, 2014/02/28 18:58:24]

ack.

+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it == outlineRects->end())
+        return outlineBoundsForRepaint(containerForRepaint());
+    return it->value.newOutlineRect;
+}
+
+void RenderObject::setNewOutlineRect(const LayoutRect& rect)
+{
+    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()
+{
+    OutlineRects* outlineRects = view()->outlineRects();

[esprehn, 2014/02/28 02:54:33]

You need to use a bitfield so you don't hit the hash table all the time.

[dsinclair, 2014/02/28 18:58:24]

I did the check on the other side, I only query these if hasOutline(). I've
added an ASSERT(hasOutline()) into each of these methods to make it clear that
it's a precondition.

Although, I'm wondering now if we need a second bit anyway, is it possible that
the outline state could have changed during the layout? i.e. we had an old
outline but we don't have a new outline?

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

Outline is a style property so it won't change during layout. That said, we
compute the fudge factor during layout based on the maximal outline size and
that will change.

+    OutlineRects::iterator it = outlineRects->find(this);
+    if (it == outlineRects->end())
+        return LayoutRect();
+    return it->value.oldOutlineRect;
+}
+
+void RenderObject::setOldOutlineRect(const LayoutRect& rect)
+{
+    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);
+    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