Revert of 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 100 matching lines @@
 }
 
 void SVGRenderStyle::copyNonInheritedFrom(const SVGRenderStyle* other)
 {
     svg_noninherited_flags = other->svg_noninherited_flags;
     stops = other->stops;
     misc = other->misc;
     resources = other->resources;
 }
 
-StyleDifferenceLegacy SVGRenderStyle::diff(const SVGRenderStyle* other) const
+StyleDifference SVGRenderStyle::diff(const SVGRenderStyle* other) const
 {
     // NOTE: All comparisions that may return StyleDifferenceLayout have to go before those who return StyleDifferenceRepaint
 
     // If resources change, we need a relayout, as the presence of resources influences the repaint rect.
     if (resources != other->resources)
         return StyleDifferenceLayout;
 
     // If markers change, we need a relayout, as marker boundaries are cached in RenderSVGPath.
     if (inheritedResources != other->inheritedResources)
         return StyleDifferenceLayout;
@@ skipping 80 matching lines @@
 }
 
 EPaintOrderType SVGRenderStyle::paintOrderType(unsigned index) const
 {
     ASSERT(index < ((1 << kPaintOrderBitwidth)-1));
     unsigned pt = (paintOrder() >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
     return (EPaintOrderType)pt;
 }
 
 }