Separate repaint and layout requirements of StyleDifference (Step 1)

Source/core/rendering/style/SVGRenderStyle.cpp

 /*
     Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
                   2004, 2005, 2010 Rob Buis <buis@kde.org>
     Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     Based on khtml code by:
     Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
     Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
     Copyright (C) 2002-2003 Dirk Mueller (mueller@kde.org)
     Copyright (C) 2002 Apple Computer, Inc.
@@ skipping 102 matching lines @@
 void SVGRenderStyle::copyNonInheritedFrom(const SVGRenderStyle* other)
 {
     svg_noninherited_flags = other->svg_noninherited_flags;
     stops = other->stops;
     misc = other->misc;
     resources = other->resources;
 }
 
 StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const
 {
-    // NOTE: All comparisions that may return StyleDifferenceLayout have to go before those who return StyleDifferenceRepaint
+    StyleDifference styleDifference;
 
+    if (diffNeedsLayoutAndRepaint(other)) {
+        styleDifference.setNeedsFullLayout();
+        styleDifference.setNeedsRepaintSelf();
+    } else if (diffNeedsRepaintOnly(other)) {
+        styleDifference.setNeedsRepaintSelf();
+    }
+
+    return styleDifference;
+}
+
+bool SVGRenderStyle::diffNeedsLayoutAndRepaint(const SVGRenderStyle* other) const
+{
     // If resources change, we need a relayout, as the presence of resources influences the repaint rect.
     if (resources != other->resources)
-        return StyleDifferenceLayout;
+        return true;
 
     // If markers change, we need a relayout, as marker boundaries are cached in RenderSVGPath.
     if (inheritedResources != other->inheritedResources)
-        return StyleDifferenceLayout;
+        return true;
 
     // All text related properties influence layout.
     if (svg_inherited_flags._textAnchor != other->svg_inherited_flags._textAnchor
         || svg_inherited_flags._writingMode != other->svg_inherited_flags._writingMode
         || svg_inherited_flags._glyphOrientationHorizontal != other->svg_inherited_flags._glyphOrientationHorizontal
         || svg_inherited_flags._glyphOrientationVertical != other->svg_inherited_flags._glyphOrientationVertical
         || svg_noninherited_flags.f._alignmentBaseline != other->svg_noninherited_flags.f._alignmentBaseline
         || svg_noninherited_flags.f._dominantBaseline != other->svg_noninherited_flags.f._dominantBaseline
         || svg_noninherited_flags.f._baselineShift != other->svg_noninherited_flags.f._baselineShift)
-        return StyleDifferenceLayout;
+        return true;
 
     // Text related properties influence layout.
-    bool miscNotEqual = misc != other->misc;
-    if (miscNotEqual && misc->baselineShiftValue != other->misc->baselineShiftValue)
-        return StyleDifferenceLayout;
+    if (misc != other->misc && misc->baselineShiftValue != other->misc->baselineShiftValue)
+        return true;
 
     // These properties affect the cached stroke bounding box rects.
     if (svg_inherited_flags._capStyle != other->svg_inherited_flags._capStyle
         || svg_inherited_flags._joinStyle != other->svg_inherited_flags._joinStyle)
-        return StyleDifferenceLayout;
+        return true;
+
+    // vector-effect changes require a re-layout.
+    if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.f._vectorEffect)
+        return true;
 
     // Some stroke properties, requires relayouts, as the cached stroke boundaries need to be recalculated.
     if (stroke != other->stroke) {
         if (stroke->width != other->stroke->width
             || stroke->paintType != other->stroke->paintType
             || stroke->paintColor != other->stroke->paintColor
             || stroke->paintUri != other->stroke->paintUri
             || stroke->miterLimit != other->stroke->miterLimit
             || stroke->dashArray != other->stroke->dashArray
             || stroke->dashOffset != other->stroke->dashOffset
             || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintColor
             || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri
             || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintType)
-            return StyleDifferenceLayout;
+            return true;
+    }
 
+    return false;
+}
+
+bool SVGRenderStyle::diffNeedsRepaintOnly(const SVGRenderStyle* other) const
+{
+    if (stroke != other->stroke) {
         // Only the stroke-opacity case remains, where we only need a repaint.
         ASSERT(stroke->opacity != other->stroke->opacity);
-        return StyleDifferenceRepaint;
+        return true;
     }
 
-    // vector-effect changes require a re-layout.
-    if (svg_noninherited_flags.f._vectorEffect != other->svg_noninherited_flags.f._vectorEffect)
-        return StyleDifferenceLayout;
-
-    // NOTE: All comparisions below may only return StyleDifferenceRepaint
-
     // Painting related properties only need repaints.
-    if (miscNotEqual) {
+    if (misc != other->misc) {
         if (misc->floodColor != other->misc->floodColor
             || misc->floodOpacity != other->misc->floodOpacity
             || misc->lightingColor != other->misc->lightingColor)
-            return StyleDifferenceRepaint;
+            return true;
     }
 
     // If fill changes, we just need to repaint. Fill boundaries are not influenced by this, only by the Path, that RenderSVGPath contains.
     if (fill->paintType != other->fill->paintType || fill->paintColor != other->fill->paintColor
         || fill->paintUri != other->fill->paintUri || fill->opacity != other->fill->opacity)
-        return StyleDifferenceRepaint;
+        return true;
 
     // If gradient stops change, we just need to repaint. Style updates are already handled through RenderSVGGradientSTop.
     if (stops != other->stops)
-        return StyleDifferenceRepaint;
+        return true;
 
     // Changes of these flags only cause repaints.
     if (svg_inherited_flags._colorRendering != other->svg_inherited_flags._colorRendering
         || svg_inherited_flags._shapeRendering != other->svg_inherited_flags._shapeRendering
         || svg_inherited_flags._clipRule != other->svg_inherited_flags._clipRule
         || svg_inherited_flags._fillRule != other->svg_inherited_flags._fillRule
         || svg_inherited_flags._colorInterpolation != other->svg_inherited_flags._colorInterpolation
         || svg_inherited_flags._colorInterpolationFilters != other->svg_inherited_flags._colorInterpolationFilters
         || svg_inherited_flags._paintOrder != other->svg_inherited_flags._paintOrder)
-        return StyleDifferenceRepaint;
+        return true;
 
     if (svg_noninherited_flags.f.bufferedRendering != other->svg_noninherited_flags.f.bufferedRendering)
-        return StyleDifferenceRepaint;
+        return true;
 
     if (svg_noninherited_flags.f.maskType != other->svg_noninherited_flags.f.maskType)
-        return StyleDifferenceRepaint;
+        return true;
 
-    return StyleDifferenceEqual;
+    return false;
 }
 
 EPaintOrderType SVGRenderStyle::paintOrderType(unsigned index) const
 {
     ASSERT(index < ((1 << kPaintOrderBitwidth)-1));
     unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
     return (EPaintOrderType)pt;
 }
 
 }