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

Source/core/rendering/style/StyleDifference.h

Index: Source/core/rendering/style/StyleDifference.h
diff --git a/Source/core/rendering/style/StyleDifference.h b/Source/core/rendering/style/StyleDifference.h
deleted file mode 100644
index 2e61c111f5fc78e517001dce82f470828891bf43..0000000000000000000000000000000000000000
--- a/Source/core/rendering/style/StyleDifference.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef StyleDifference_h
-#define StyleDifference_h
-
-// FIXME: Remove this include after we finish migrating from StyleDifferenceLegacy.
-#include "core/rendering/style/RenderStyleConstants.h"
-
-namespace WebCore {
-
-// This class represents the difference between two computed styles (RenderStyle).
-// The difference can be of 3 types:
-// - Layout difference
-// - Repaint difference
-// - Recompositing difference
-class StyleDifference {
-public:
-    StyleDifference()
-        : m_needsRecompositeLayer(false)
-        , m_repaintType(NoRepaint)
-        , m_layoutType(NoLayout) { }
-
-    // Temporary constructor to convert StyleDifferenceLegacy to new StyleDifference.
-    // At this step, implicit requirements (e.g. StyleDifferenceLayout implies StyleDifferenceRepaint),
-    // is not handled by StyleDifference but need to be handled by the callers.
-    StyleDifference(StyleDifferenceLegacy legacyDiff)
-        : m_needsRecompositeLayer(false)
-        , m_repaintType(NoRepaint)
-        , m_layoutType(NoLayout)
-    {
-        switch (legacyDiff) {
-        case StyleDifferenceEqual:
-            break;
-        case StyleDifferenceRecompositeLayer:
-            m_needsRecompositeLayer = true;
-            break;
-        case StyleDifferenceRepaint:
-            m_repaintType = RepaintObjectOnly;
-            break;
-        case StyleDifferenceRepaintLayer:
-            m_repaintType = RepaintLayer;
-            break;
-        case StyleDifferenceLayoutPositionedMovementOnly:
-            m_layoutType = PositionedMovementOnly;
-            break;
-        case StyleDifferenceLayout:
-            m_layoutType = FullLayout;
-            break;
-        }
-    }
-
-    // The two styles are identical.
-    bool hasNoChange() const { return !m_needsRecompositeLayer && !m_repaintType && !m_layoutType; }
-
-    // The layer needs its position and transform updated. Implied by other repaint and layout flags.
-    bool needsRecompositeLayer() const { return m_needsRecompositeLayer || needsRepaint() || needsLayout(); }
-    void setNeedsRecompositeLayer() { m_needsRecompositeLayer = true; }
-
-    bool needsRepaint() const { return m_repaintType != NoRepaint; }
-    void clearNeedsRepaint() { m_repaintType = NoRepaint; }
-
-    // The object just needs to be repainted.
-    bool needsRepaintObjectOnly() const { return m_repaintType == RepaintObjectOnly; }
-    void setNeedsRepaintObject()
-    {
-        if (!needsRepaintLayer())
-            m_repaintType = RepaintObjectOnly;
-    }
-
-    // The layer and its descendant layers need to be repainted.
-    bool needsRepaintLayer() const { return m_repaintType == RepaintLayer; }
-    void setNeedsRepaintLayer() { m_repaintType = RepaintLayer; }
-
-    bool needsLayout() const { return m_layoutType != NoLayout; }
-    void clearNeedsLayout() { m_layoutType = NoLayout; }
-
-    // The offset of this positioned object has been updated.
-    bool needsPositionedMovementLayoutOnly() const { return m_layoutType == PositionedMovementOnly; }
-    void setNeedsPositionedMovementLayout()
-    {
-        if (!needsFullLayout())
-            m_layoutType = PositionedMovementOnly;
-        // FIXME: This is temporary to keep the StyleDifferenceLegacy behavior.
-        m_repaintType = NoRepaint;
-    }
-
-    bool needsFullLayout() const { return m_layoutType == FullLayout; }
-    void setNeedsFullLayout()
-    {
-        m_layoutType = FullLayout;
-        // FIXME: This is temporary to keep the StyleDifferenceLegacy behavior.
-        m_repaintType = NoRepaint;
-    }
-
-private:
-    unsigned m_needsRecompositeLayer : 1;
-
-    enum RepaintType {
-        NoRepaint = 0,
-        RepaintObjectOnly,
-        RepaintLayer
-    };
-    unsigned m_repaintType : 2;
-
-    enum LayoutType {
-        NoLayout = 0,
-        PositionedMovementOnly,
-        FullLayout
-    };
-    unsigned m_layoutType : 2;
-};
-
-} // namespace WebCore
-
-#endif // StyleDifference_h