Merge two update type fields in RenderLayerCompositor

Source/core/rendering/compositing/RenderLayerCompositor.h

Index: Source/core/rendering/compositing/RenderLayerCompositor.h
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.h b/Source/core/rendering/compositing/RenderLayerCompositor.h
index d8c92eac86341b2476f0c8379508a9de46434e17..9818bc89ca777227258bf18642034303040144e5 100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.h
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.h
@@ -46,6 +46,7 @@ class ScrollingCoordinator;
 class StickyPositionViewportConstraints;
 
 enum CompositingUpdateType {
+    CompositingUpdateNone,
     CompositingUpdateAfterStyleChange,
     CompositingUpdateAfterLayout,
     CompositingUpdateOnScroll,
@@ -321,17 +322,14 @@ private:
 
     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;