Merge two update type fields in RenderLayerCompositor

Source/core/rendering/compositing/RenderLayerCompositor.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 28 matching lines @@
 class FixedPositionViewportConstraints;
 class GraphicsLayer;
 class RenderEmbeddedObject;
 class RenderLayerStackingNode;
 class RenderPart;
 class RenderVideo;
 class ScrollingCoordinator;
 class StickyPositionViewportConstraints;
 
 enum CompositingUpdateType {
+    CompositingUpdateNone,
     CompositingUpdateAfterStyleChange,
     CompositingUpdateAfterLayout,
     CompositingUpdateOnScroll,
     CompositingUpdateOnCompositedScroll,
     CompositingUpdateAfterCanvasContextChange
 };
 
 // RenderLayerCompositor manages the hierarchy of
 // composited RenderLayers. It determines which RenderLayers
 // become compositing, and creates and maintains a hierarchy of
@@ skipping 255 matching lines @@
 
 private:
     DocumentLifecycle& lifecycle() const;
 
     RenderView& m_renderView;
     OwnPtr<GraphicsLayer> m_rootContentLayer;
     OwnPtr<GraphicsLayer> m_rootTransformLayer;
 
     CompositingReasonFinder m_compositingReasonFinder;
 
+    CompositingUpdateType m_pendingUpdateType;
+
     bool m_hasAcceleratedCompositing;
     bool m_showRepaintCounter;
 
-    // FIXME: This should absolutely not be mutable.
-    mutable bool m_needsToRecomputeCompositingRequirements;
+    bool m_needsToRecomputeCompositingRequirements;
     bool m_needsToUpdateLayerTreeGeometry;
 
-    // FIXME: We should remove m_pendingUpdateType and propagate the bits with CompositingPropertyUpdater instead.
-    GraphicsLayerUpdater::UpdateType m_pendingUpdateType;
-    CompositingPropertyUpdater::UpdateType m_pendingPropertyUpdateType;
-
     bool m_compositing;
     bool m_compositingLayersNeedRebuild;
     bool m_forceCompositingMode;
     bool m_needsUpdateCompositingRequirementsState;
 
     bool m_isTrackingRepaints; // Used for testing.
 
     RootLayerAttachment m_rootLayerAttachment;
 
     // Enclosing container layer, which clips for iframe content
@@ skipping 16 matching lines @@
     OwnPtr<GraphicsLayer> m_layerForScrollCorner;
 #if USE(RUBBER_BANDING)
     OwnPtr<GraphicsLayer> m_layerForOverhangShadow;
 #endif
 };
 
 
 } // namespace WebCore
 
 #endif // RenderLayerCompositor_h