Merge 132856

Source/WebCore/rendering/svg/RenderSVGResourceFilter.h

Index: Source/WebCore/rendering/svg/RenderSVGResourceFilter.h
===================================================================
--- Source/WebCore/rendering/svg/RenderSVGResourceFilter.h	(revision 134257)
+++ Source/WebCore/rendering/svg/RenderSVGResourceFilter.h	(working copy)
@@ -42,11 +42,11 @@
 struct FilterData {
     WTF_MAKE_FAST_ALLOCATED;
 public:
+    enum FilterDataState { PaintingSource, Applying, Built, CycleDetected, MarkedForRemoval };
+
     FilterData()
         : savedContext(0)
-        , isBuilt(false)
-        , isApplying(false)
-        , markedForRemoval(false)
+        , state(PaintingSource)
     {
     }
 
@@ -57,9 +57,7 @@
     AffineTransform shearFreeAbsoluteTransform;
     FloatRect boundaries;
     FloatSize scale;
-    bool isBuilt : 1;
-    bool isApplying : 1;
-    bool markedForRemoval : 1;
+    FilterDataState state;
 };
 
 class GraphicsContext;