Change RenderSVGResourceClipper's ClipperContext class into an enum

Source/core/rendering/svg/RenderSVGResourceClipper.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Dirk Schulze <krit@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 55 matching lines @@
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 bool RenderSVGResourceClipper::applyResource(RenderObject*, RenderStyle*, GraphicsContext*&, unsigned short)
 {
     // Clippers are always applied using stateful methods.
     ASSERT_NOT_REACHED();
     return false;
 }
 
-bool RenderSVGResourceClipper::applyStatefulResource(RenderObject* object, GraphicsContext*& context, ClipperContext& clipperContext)
+bool RenderSVGResourceClipper::applyStatefulResource(RenderObject* object, GraphicsContext*& context, ClipperState& clipperState)
 {
     ASSERT(object);
     ASSERT(context);
 
     clearInvalidationMask();
 
-    return applyClippingToContext(object, object->objectBoundingBox(), object->paintInvalidationRectInLocalCoordinates(), context, clipperContext);
+    return applyClippingToContext(object, object->objectBoundingBox(), object->paintInvalidationRectInLocalCoordinates(), context, clipperState);
 }
 
 bool RenderSVGResourceClipper::tryPathOnlyClipping(GraphicsContext* context,
     const AffineTransform& animatedLocalTransform, const FloatRect& objectBoundingBox) {
     // If the current clip-path gets clipped itself, we have to fallback to masking.
     if (!style()->svgStyle().clipperResource().isEmpty())
         return false;
     WindRule clipRule = RULE_NONZERO;
     Path clipPath = Path();
 
@@ skipping 46 matching lines @@
     clipPath.transform(animatedLocalTransform);
 
     // The SVG specification wants us to clip everything, if clip-path doesn't have a child.
     if (clipPath.isEmpty())
         clipPath.addRect(FloatRect());
     context->clipPath(clipPath, clipRule);
     return true;
 }
 
 bool RenderSVGResourceClipper::applyClippingToContext(RenderObject* target, const FloatRect& targetBoundingBox,
-    const FloatRect& paintInvalidationRect, GraphicsContext* context, ClipperContext& clipperContext)
+    const FloatRect& paintInvalidationRect, GraphicsContext* context, ClipperState& clipperState)
 {
     ASSERT(target);
     ASSERT(context);
-    ASSERT(clipperContext.state == ClipperContext::NotAppliedState);
+    ASSERT(clipperState == ClipperNotApplied);
     ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
 
     if (paintInvalidationRect.isEmpty() || m_inClipExpansion)
         return false;
     TemporaryChange<bool> inClipExpansionChange(m_inClipExpansion, true);
 
     AffineTransform animatedLocalTransform = toSVGClipPathElement(element())->animatedLocalTransform();
     // When drawing a clip for non-SVG elements, the CTM does not include the zoom factor.
     // In this case, we need to apply the zoom scale explicitly - but only for clips with
     // userSpaceOnUse units (the zoom is accounted for objectBoundingBox-resolved lengths).
     if (!target->isSVG()
         && toSVGClipPathElement(element())->clipPathUnits()->currentValue()->enumValue() == SVGUnitTypes::SVG_UNIT_TYPE_USERSPACEONUSE) {
         ASSERT(style());
         animatedLocalTransform.scale(style()->effectiveZoom());
     }
 
     // First, try to apply the clip as a clipPath.
     if (tryPathOnlyClipping(context, animatedLocalTransform, targetBoundingBox)) {
-        clipperContext.state = ClipperContext::AppliedPathState;
+        clipperState = ClipperAppliedPath;
         return true;
     }
 
     // Fall back to masking.
-    clipperContext.state = ClipperContext::AppliedMaskState;
+    clipperState = ClipperAppliedMask;
 
     // Mask layer start
     context->beginTransparencyLayer(1, &paintInvalidationRect);
     {
         GraphicsContextStateSaver maskContentSaver(*context);
         context->concatCTM(animatedLocalTransform);
 
         // clipPath can also be clipped by another clipPath.
         SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(this);
         RenderSVGResourceClipper* clipPathClipper = resources ? resources->clipper() : 0;
-        ClipperContext clipPathClipperContext;
-        if (clipPathClipper && !clipPathClipper->applyClippingToContext(this, targetBoundingBox, paintInvalidationRect, context, clipPathClipperContext)) {
+        ClipperState clipPathClipperState = ClipperNotApplied;
+        if (clipPathClipper && !clipPathClipper->applyClippingToContext(this, targetBoundingBox, paintInvalidationRect, context, clipPathClipperState)) {
             // FIXME: Awkward state micro-management. Ideally, GraphicsContextStateSaver should
             //   a) pop saveLayers also
             //   b) pop multiple states if needed (similarly to SkCanvas::restoreToCount())
             // Then we should be able to replace this mess with a single, top-level GCSS.
             maskContentSaver.restore();
             context->restoreLayer();
             return false;
         }
 
         drawClipMaskContent(context, targetBoundingBox);
 
         if (clipPathClipper)
-            clipPathClipper->postApplyStatefulResource(this, context, clipPathClipperContext);
+            clipPathClipper->postApplyStatefulResource(this, context, clipPathClipperState);
     }
 
     // Masked content layer start.
     context->beginLayer(1, CompositeSourceIn, &paintInvalidationRect);
 
     return true;
 }
 
 void RenderSVGResourceClipper::postApplyResource(RenderObject*, GraphicsContext*&, unsigned short,
     const Path*, const RenderSVGShape*) {
     // Clippers are always applied using stateful methods.
     ASSERT_NOT_REACHED();
 }
 
-void RenderSVGResourceClipper::postApplyStatefulResource(RenderObject*, GraphicsContext*& context, ClipperContext& clipperContext)
+void RenderSVGResourceClipper::postApplyStatefulResource(RenderObject*, GraphicsContext*& context, ClipperState& clipperState)
 {
-    switch (clipperContext.state) {
-    case ClipperContext::AppliedPathState:
+    switch (clipperState) {
+    case ClipperAppliedPath:
         // Path-only clipping, no layers to restore.
         break;
-    case ClipperContext::AppliedMaskState:
+    case ClipperAppliedMask:
         // Transfer content layer -> mask layer (SrcIn)
         context->endLayer();
         // Transfer mask layer -> bg layer (SrcOver)
         context->endLayer();
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 }
 
@@ skipping 139 matching lines @@
         AffineTransform transform;
         transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
         transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
         return transform.mapRect(m_clipBoundaries);
     }
 
     return m_clipBoundaries;
 }
 
 }