ImageBuffer-less SVG masking and clipping.

Source/core/platform/graphics/GraphicsContextState.h

 // Copyright (C) 2013 Google 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:
 //
 //    * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //    * Redistributions in binary form must reproduce the above
 // copyright notice, this list of conditions and the following disclaimer
@@ skipping 16 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #ifndef GraphicsContextState_h
 #define GraphicsContextState_h
 
 #include "core/platform/graphics/Gradient.h"
 #include "core/platform/graphics/GraphicsTypes.h"
 #include "core/platform/graphics/Path.h"
 #include "core/platform/graphics/Pattern.h"
 #include "core/platform/graphics/StrokeData.h"
+#include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 // Encapsulates the state information we store for each pushed graphics state.
 // Only GraphicsContext can use this class.
 class GraphicsContextState {
 private:
     friend class GraphicsContext;
 
     GraphicsContextState()
         : m_fillColor(Color::black)
         , m_fillRule(RULE_NONZERO)
         , m_textDrawingMode(TextModeFill)
         , m_alpha(1)
         , m_xferMode(SkXfermode::kSrcOver_Mode)
         , m_compositeOperator(CompositeSourceOver)
         , m_blendMode(BlendModeNormal)
-        , m_clip(SkRect::MakeEmpty())
 #if USE(LOW_QUALITY_IMAGE_INTERPOLATION)
         , m_interpolationQuality(InterpolationLow)
 #else
         , m_interpolationQuality(InterpolationHigh)
 #endif
         , m_shouldAntialias(true)
         , m_shouldSmoothFonts(true)
     {
     }
 
     GraphicsContextState(const GraphicsContextState& other)
         : m_strokeData(other.m_strokeData)
         , m_fillColor(other.m_fillColor)
         , m_fillRule(other.m_fillRule)
         , m_fillGradient(other.m_fillGradient)
         , m_fillPattern(other.m_fillPattern)
         , m_looper(other.m_looper)
         , m_textDrawingMode(other.m_textDrawingMode)
         , m_alpha(other.m_alpha)
         , m_xferMode(other.m_xferMode)
+        , m_colorFilter(other.m_colorFilter)
         , m_compositeOperator(other.m_compositeOperator)
         , m_blendMode(other.m_blendMode)
-        , m_clip(other.m_clip)
         , m_interpolationQuality(other.m_interpolationQuality)
         , m_shouldAntialias(other.m_shouldAntialias)
         , m_shouldSmoothFonts(other.m_shouldSmoothFonts)
     {
     }
 
     // Helper function for applying the state's alpha value to the given input
     // color to produce a new output color.
     SkColor applyAlpha(SkColor c) const
     {
@@ skipping 24 matching lines @@
 
     // Shadow. (This will need tweaking if we use draw loopers for other things.)
     RefPtr<SkDrawLooper> m_looper;
 
     // Text. (See TextModeFill & friends.)
     TextDrawingModeFlags m_textDrawingMode;
 
     // Common shader state.
     float m_alpha;
     SkXfermode::Mode m_xferMode;
+    RefPtr<SkColorFilter> m_colorFilter;
 
     // Compositing control, for the CSS and Canvas compositing spec.
     CompositeOperator m_compositeOperator;
     BlendMode m_blendMode;
 
-    // If non-empty, the current State is clipped to this image.
-    SkBitmap m_imageBufferClip;
-
-    // If m_imageBufferClip is non-empty, this is the region the image is clipped to.
-    SkRect m_clip;
-
     // Image interpolation control.
     InterpolationQuality m_interpolationQuality;
 
     bool m_shouldAntialias : 1;
     bool m_shouldSmoothFonts : 1;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContextState_h