Separate repaint and layout requirements of StyleDifference (Step 3)

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 106 matching lines @@
     misc = other->misc;
     resources = other->resources;
 }
 
 StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const
 {
     StyleDifference styleDifference;
 
     if (diffNeedsLayout(other))
         styleDifference.setNeedsFullLayout();
-    else if (diffNeedsRepaintOnly(other))
+    if (diffNeedsRepaint(other))
         styleDifference.setNeedsRepaintObject();
 
     return styleDifference;
 }
 
 bool SVGRenderStyle::diffNeedsLayout(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 true;
@@ skipping 36 matching lines @@
             || stroke->dashOffset != other->stroke->dashOffset
             || stroke->visitedLinkPaintColor != other->stroke->visitedLinkPaintColor
             || stroke->visitedLinkPaintUri != other->stroke->visitedLinkPaintUri
             || stroke->visitedLinkPaintType != other->stroke->visitedLinkPaintType)
             return true;
     }
 
     return false;
 }
 
-bool SVGRenderStyle::diffNeedsRepaintOnly(const SVGRenderStyle* other) const
+bool SVGRenderStyle::diffNeedsRepaint(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);
+    if (stroke->opacity != other->stroke->opacity)
         return true;
-    }
 
     // Painting related properties only need repaints.
     if (misc != other->misc) {
         if (misc->floodColor != other->misc->floodColor
             || misc->floodOpacity != other->misc->floodOpacity
             || misc->lightingColor != other->misc->lightingColor)
             return true;
     }
 
     // If fill changes, we just need to repaint. Fill boundaries are not influenced by this, only by the Path, that RenderSVGPath contains.
@@ skipping 25 matching lines @@
 }
 
 EPaintOrderType SVGRenderStyle::paintOrderType(unsigned index) const
 {
     ASSERT(index < ((1 << kPaintOrderBitwidth)-1));
     unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
     return (EPaintOrderType)pt;
 }
 
 }