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

Source/core/rendering/RenderLayerModelObject.cpp

Index: Source/core/rendering/RenderLayerModelObject.cpp
diff --git a/Source/core/rendering/RenderLayerModelObject.cpp b/Source/core/rendering/RenderLayerModelObject.cpp
index 68fae90ce821862cb9c067829c8591983af19c4b..7b3a6f3faa50297cfe20a0f0c0449be518c7e312 100644
--- a/Source/core/rendering/RenderLayerModelObject.cpp
+++ b/Source/core/rendering/RenderLayerModelObject.cpp
@@ -98,14 +98,14 @@ void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderS
     if (oldStyle) {
         // Do a repaint with the old style first through RenderLayerRepainter.
         // RenderObject::styleWillChange takes care of repainting objects without RenderLayers.
-        if (parent() && diff.needsRepaintLayer()) {
+        if (parent() && diff == StyleDifferenceRepaintLayer) {
             layer()->repainter().repaintIncludingNonCompositingDescendants(containerForRepaint());
             if (oldStyle->hasClip() != newStyle.hasClip()
                 || oldStyle->clip() != newStyle.clip())
                 layer()->clipper().clearClipRectsIncludingDescendants();
         }
 
-        if (diff.needsFullLayout()) {
+        if (diff == StyleDifferenceLayout) {
             // When a layout hint happens, we go ahead and do a repaint of the layer, since the layer could
             // end up being destroyed.
             if (hasLayer()) {