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

Source/core/rendering/style/RenderStyle.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 350 matching lines @@
             || (!a.right().isIntrinsicOrAuto() && a.right() != b.right())))
         return false;
 
     // One of the units is fixed or percent in both directions and stayed
     // that way in the new style.  Therefore all we are doing is moving.
     return true;
 }
 
 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)
             return svgChange;
     }
 
     if (m_box.get() != other.m_box.get()) {
         if (m_box->width() != other.m_box->width()
             || m_box->minWidth() != other.m_box->minWidth()
             || m_box->maxWidth() != other.m_box->maxWidth()
@@ skipping 198 matching lines @@
         if ((position() == AbsolutePosition || position() == FixedPosition)
             && positionedObjectMovedOnly(surround->offset, other.surround->offset, m_box->width())
             && repaintOnlyDiff(other, changedContextSensitiveProperties) == StyleDifferenceEqual)
             return StyleDifferenceLayoutPositionedMovementOnly;
         // FIXME: We would like to use SimplifiedLayout for relative positioning, but we can't quite do that yet.
         // We need to make sure SimplifiedLayout can operate correctly on RenderInlines (we will need
         // to add a selfNeedsSimplifiedLayout bit in order to not get confused and taint every line).
         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))
         return StyleDifferenceRepaintLayer;
 
     if (RuntimeEnabledFeatures::cssCompositingEnabled() && (rareNonInheritedData->m_effectiveBlendMode != other.rareNonInheritedData->m_effectiveBlendMode
         || rareNonInheritedData->m_isolation != other.rareNonInheritedData->m_isolation))
         return StyleDifferenceRepaintLayer;
 
     if (rareNonInheritedData->opacity != other.rareNonInheritedData->opacity) {
@@ skipping 1030 matching lines @@
     // right
     radiiSum = radii.topRight().height() + radii.bottomRight().height();
     if (radiiSum > rect.height())
         factor = std::min(rect.height() / radiiSum, factor);
 
     ASSERT(factor <= 1);
     return factor;
 }
 
 } // namespace WebCore