Clean up naming in ComputedStyle

third_party/WebKit/Source/core/style/SVGComputedStyle.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 62 matching lines @@
     svg_inherited_flags = other.svg_inherited_flags;
     svg_noninherited_flags = other.svg_noninherited_flags;
 }
 
 SVGComputedStyle::~SVGComputedStyle()
 {
 }
 
 bool SVGComputedStyle::operator==(const SVGComputedStyle& other) const
 {
+    return inheritedEqual(other)

[sashab, 2016/07/01 06:59:51]

This is identical to the comparisons before, I just moved them around. :)

+        && nonInheritedEqual(other);
+}
+
+bool SVGComputedStyle::inheritedEqual(const SVGComputedStyle& other) const
+{
     return fill == other.fill
         && stroke == other.stroke
-        && stops == other.stops
+        && inheritedResources == other.inheritedResources
+        && svg_inherited_flags == other.svg_inherited_flags;
+}
+
+bool SVGComputedStyle::nonInheritedEqual(const SVGComputedStyle& other) const
+{
+    return stops == other.stops
         && misc == other.misc
-        && inheritedResources == other.inheritedResources
         && geometry == other.geometry
         && resources == other.resources
-        && svg_inherited_flags == other.svg_inherited_flags
         && svg_noninherited_flags == other.svg_noninherited_flags;
 }
 
-bool SVGComputedStyle::inheritedNotEqual(const SVGComputedStyle* other) const
-{
-    return fill != other->fill
-        || stroke != other->stroke
-        || inheritedResources != other->inheritedResources
-        || svg_inherited_flags != other->svg_inherited_flags;
-}
-
 void SVGComputedStyle::inheritFrom(const SVGComputedStyle* svgInheritParent)
 {
     if (!svgInheritParent)
         return;
 
     fill = svgInheritParent->fill;
     stroke = svgInheritParent->stroke;
     inheritedResources = svgInheritParent->inheritedResources;
 
     svg_inherited_flags = svgInheritParent->svg_inherited_flags;
@@ skipping 154 matching lines @@
     case PaintOrderMarkersStrokeFill:
         pt = paintOrderSequence(PT_MARKERS, PT_STROKE, PT_FILL);
         break;
     }
 
     pt = (pt >> (kPaintOrderBitwidth*index)) & ((1u << kPaintOrderBitwidth) - 1);
     return (EPaintOrderType)pt;
 }
 
 } // namespace blink