Override repaintTreeAfterLayout for RenderSVGModelObject

Source/core/rendering/svg/RenderSVGModelObject.cpp

 /*
  * Copyright (c) 2009, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "core/rendering/svg/RenderSVGModelObject.h"
 
 #include "SVGNames.h"
+#include "core/rendering/RenderLayer.h"
+#include "core/rendering/RenderView.h"
 #include "core/rendering/svg/RenderSVGRoot.h"
 #include "core/rendering/svg/SVGResourcesCache.h"
 #include "core/svg/SVGGraphicsElement.h"
 
 namespace WebCore {
 
 RenderSVGModelObject::RenderSVGModelObject(SVGElement* node)
     : RenderObject(node)
 {
 }
@@ skipping 70 matching lines @@
     return false;
 }
 
 // The SVG addFocusRingRects() method adds rects in local coordinates so the default absoluteFocusRingQuads
 // returns incorrect values for SVG objects. Overriding this method provides access to the absolute bounds.
 void RenderSVGModelObject::absoluteFocusRingQuads(Vector<FloatQuad>& quads)
 {
     quads.append(localToAbsoluteQuad(FloatQuad(repaintRectInLocalCoordinates())));
 }
 
+void RenderSVGModelObject::repaintTreeAfterLayout()
+{
+    // Note: This is a reduced version of RenderBox::repaintTreeAfterLayout().

[leviw_travelin_and_unemployed, 2014/05/02 18:30:15]

This makes me sad, but I don't have a better idea off hand.

+
+    ASSERT(RuntimeEnabledFeatures::repaintAfterLayoutEnabled());
+    ASSERT(!needsLayout());
+
+    const LayoutRect oldRepaintRect = previousRepaintRect();
+    const LayoutPoint oldPositionFromRepaintContainer = previousPositionFromRepaintContainer();
+    RenderLayerModelObject* repaintContainer = containerForRepaint();
+    setPreviousRepaintRect(clippedOverflowRectForRepaint(repaintContainer));
+    setPreviousPositionFromRepaintContainer(positionFromRepaintContainer(repaintContainer));
+
+    // 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 (view()->doingFullRepaint()) {
+        LayoutStateDisabler layoutStateDisabler(*this);
+        RenderObject::repaintTreeAfterLayout();
+        return;
+    }
+
+    if (onlyNeededPositionedMovementLayout() && compositingState() != PaintsIntoOwnBacking) {

[leviw_travelin_and_unemployed, 2014/05/02 18:30:15]

nit: don't need braces

[fs, 2014/05/05 08:27:12]

Dropped.

+        setShouldDoFullRepaintAfterLayout(true);
+    }
+
+    const LayoutRect& newRepaintRect = previousRepaintRect();
+    const LayoutPoint& newPositionFromRepaintContainer = previousPositionFromRepaintContainer();
+    bool didFullRepaint = repaintAfterLayoutIfNeeded(containerForRepaint(),
+        shouldDoFullRepaintAfterLayout(), oldRepaintRect, oldPositionFromRepaintContainer, &newRepaintRect, &newPositionFromRepaintContainer);
+
+    if (!didFullRepaint)
+        repaintOverflowIfNeeded();
+
+    // Repaint any scrollbars if there is a scrollable area for this renderer.
+    if (enclosingLayer()) {

[leviw_travelin_and_unemployed, 2014/05/02 18:30:15]

This block of code should be moved into a shared function.

[fs, 2014/05/05 08:27:12]

Relocated to RenderObject::repaintScrollbarsIfNeeded.

+        if (RenderLayerScrollableArea* area = enclosingLayer()->scrollableArea()) {
+            if (area->hasVerticalBarDamage())
+                repaintRectangle(area->verticalBarDamage());
+            if (area->hasHorizontalBarDamage())
+                repaintRectangle(area->horizontalBarDamage());
+            area->resetScrollbarDamage();
+        }
+    }
+
+    LayoutStateDisabler layoutStateDisabler(*this);

[leviw_travelin_and_unemployed, 2014/05/02 18:30:15]

Should we just have one of these at the top of the function instead of 2?

[fs, 2014/05/05 08:27:12]

Makes sense. Hoisted and combined.

+    RenderObject::repaintTreeAfterLayout();
+}
+
 } // namespace WebCore