Revert of Separate repaint and layout requirements of StyleDifference (Step 1)

Source/core/rendering/style/RenderStyle.cpp

Index: Source/core/rendering/style/RenderStyle.cpp
diff --git a/Source/core/rendering/style/RenderStyle.cpp b/Source/core/rendering/style/RenderStyle.cpp
index ef055cc18964eb27de23fcfc35cacc2efc0dc50e..499b96bd978143addd22974e740573285d19a6a1 100644
--- a/Source/core/rendering/style/RenderStyle.cpp
+++ b/Source/core/rendering/style/RenderStyle.cpp
@@ -368,18 +368,13 @@ static bool positionedObjectMovedOnly(const LengthBox& a, const LengthBox& b, co
 
 StyleDifference RenderStyle::visualInvalidationDiff(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
 {
-    return StyleDifference(visualInvalidationDiffLegacy(other, changedContextSensitiveProperties));
-}
-
-StyleDifferenceLegacy RenderStyle::visualInvalidationDiffLegacy(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
-{
     changedContextSensitiveProperties = ContextSensitivePropertyNone;
 
     // Note, we use .get() on each DataRef below because DataRef::operator== will do a deep
     // compare, which is duplicate work when we're going to compare each property inside
     // this function anyway.
 
-    StyleDifferenceLegacy svgChange = StyleDifferenceEqual;
+    StyleDifference svgChange = StyleDifferenceEqual;
     if (m_svgStyle.get() != other.m_svgStyle.get()) {
         svgChange = m_svgStyle->diff(other.m_svgStyle.get());
         if (svgChange == StyleDifferenceLayout)
@@ -598,12 +593,12 @@ StyleDifferenceLegacy RenderStyle::visualInvalidationDiffLegacy(const RenderStyl
         return StyleDifferenceLayout;
     }
 
-    StyleDifferenceLegacy repaintDifference = repaintOnlyDiff(other, changedContextSensitiveProperties);
+    StyleDifference repaintDifference = repaintOnlyDiff(other, changedContextSensitiveProperties);
     ASSERT(repaintDifference <= StyleDifferenceRepaintLayer);
     return repaintDifference;
 }
 
-StyleDifferenceLegacy RenderStyle::repaintOnlyDiff(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
+StyleDifference RenderStyle::repaintOnlyDiff(const RenderStyle& other, unsigned& changedContextSensitiveProperties) const
 {
     if (position() != StaticPosition && (m_box->zIndex() != other.m_box->zIndex() || m_box->hasAutoZIndex() != other.m_box->hasAutoZIndex()
         || visual->clip != other.visual->clip || visual->hasClip != other.visual->hasClip))