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

Source/core/rendering/style/RenderStyleConstants.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 26 matching lines @@
     Reattach,
     ReattachNoRenderer
 };
 
 static const size_t PrintColorAdjustBits = 1;
 enum PrintColorAdjust {
     PrintColorAdjustEconomy,
     PrintColorAdjustExact
 };
 
-// FIXME: To be replaced by StyleDifference defined in StyleDifference.h.
 // The difference between two styles.  The following values are used:
 // - StyleDifferenceEqual - The two styles are identical.
 //   FIXME: When style difference is context sensitive, RenderStyle::visualInvalidationDiff() may return
 //   StyleDifferenceEqual even there is difference. Will resolve the issue when fixing crbug.com/358460.
 // - StyleDifferenceRecompositeLayer - The layer needs its position and transform updated, but no repaint.
 // - StyleDifferenceRepaint - The object just needs to be repainted.
 // - StyleDifferenceRepaintLayer - The layer and its descendant layers need to be repainted.
 // - StyleDifferenceLayoutPositionedMovementOnly - Only the position of this positioned object has been updated.
 // - StyleDifferenceLayout - A full layout is required.
-enum StyleDifferenceLegacy {
+enum StyleDifference {
     StyleDifferenceEqual,
     StyleDifferenceRecompositeLayer,
     StyleDifferenceRepaint,
     StyleDifferenceRepaintLayer,
     StyleDifferenceLayoutPositionedMovementOnly,
     StyleDifferenceLayout
 };
 
 // When some style properties change, different amounts of work have to be done depending on
 // context (e.g. whether the property is changing on an element which has a compositing layer).
@@ skipping 481 matching lines @@
 static const float maximumAllowedFontSize = 1000000.0f;
 
 enum TextIndentLine { TextIndentFirstLine, TextIndentEachLine };
 enum TextIndentType { TextIndentNormal, TextIndentHanging };
 
 enum CSSBoxType { BoxMissing = 0, MarginBox, BorderBox, PaddingBox, ContentBox };
 
 } // namespace WebCore
 
 #endif // RenderStyleConstants_h