Refactor shadow rendering logic.

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 18 matching lines @@
 #ifndef GraphicsContextState_h
 #define GraphicsContextState_h
 
 #include "core/platform/graphics/ColorSpace.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 "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"
 
 namespace WebCore {
 
 // Encapsulates the state information we store for each pushed graphics state.
 // Only GraphicsContext can use this class.
 class GraphicsContextState {
 public:
@@ skipping 14 matching lines @@
         , m_strokeColorSpace(ColorSpaceDeviceRGB)
         , m_dashRatio(3)
         , m_miterLimit(4)
         , m_lineCap(SkPaint::kDefault_Cap)
         , m_lineJoin(SkPaint::kDefault_Join)
         , m_dash(0)
         , m_fillColor(Color::black)
         , m_fillColorPacked(0xFF000000)
         , m_fillColorSpace(ColorSpaceDeviceRGB)
         , m_fillRule(RULE_NONZERO)
-        , m_shadowBlur(0)
-        , m_shadowColorSpace(ColorSpaceDeviceRGB)
+        , m_looper(0)
         , m_textDrawingMode(TextModeFill)
         , m_alpha(1)
         , m_xferMode(SkXfermode::kSrcOver_Mode)
-        , m_looper(0)
         , 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)
@@ skipping 14 matching lines @@
         , m_miterLimit(other.m_miterLimit)
         , m_lineCap(other.m_lineCap)
         , m_lineJoin(other.m_lineJoin)
         , m_dash(other.m_dash)
         , m_fillColor(other.m_fillColor)
         , m_fillColorPacked(other.m_fillColorPacked)
         , m_fillColorSpace(other.m_fillColorSpace)
         , m_fillRule(other.m_fillRule)
         , m_fillGradient(other.m_fillGradient)
         , m_fillPattern(other.m_fillPattern)
-        , m_shadowBlur(other.m_shadowBlur)
-        , m_shadowColor(other.m_shadowColor)
-        , m_shadowOffset(other.m_shadowOffset)
-        , m_shadowColorSpace(other.m_shadowColorSpace)
+        , m_looper(other.m_looper)
         , m_textDrawingMode(other.m_textDrawingMode)
         , m_alpha(other.m_alpha)
         , m_xferMode(other.m_xferMode)
-        , m_looper(other.m_looper)
         , m_compositeOperator(other.m_compositeOperator)
         , m_blendMode(other.m_blendMode)
         , m_imageBufferClip(other.m_imageBufferClip)
         , m_clip(other.m_clip)
         , m_interpolationQuality(other.m_interpolationQuality)
         , m_shouldAntialias(other.m_shouldAntialias)
         , m_shouldSmoothFonts(other.m_shouldSmoothFonts)
         , m_shouldSubpixelQuantizeFonts(other.m_shouldSubpixelQuantizeFonts)
         , m_shadowsIgnoreTransforms(other.m_shadowsIgnoreTransforms)
     {
@@ skipping 41 matching lines @@
     SkDashPathEffect* m_dash;
 
     // Fill.
     Color m_fillColor;
     SkColor m_fillColorPacked;
     ColorSpace m_fillColorSpace;
     WindRule m_fillRule;
     RefPtr<Gradient> m_fillGradient;
     RefPtr<Pattern> m_fillPattern;
 
-    // Shadow.
-    float m_shadowBlur;
-    Color m_shadowColor;
-    FloatSize m_shadowOffset;
-    ColorSpace m_shadowColorSpace;
+    // Shadow. (This will need tweaking if we use draw loopers for other things.)
+    SkDrawLooper* m_looper;
 
     // Text. (See TextModeFill & friends.)
     TextDrawingModeFlags m_textDrawingMode;
 
     // Common shader state.
     float m_alpha;
     SkXfermode::Mode m_xferMode;
-    SkDrawLooper* m_looper;
 
     // 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;
     bool m_shouldSubpixelQuantizeFonts : 1;
     bool m_shadowsIgnoreTransforms : 1;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContextState_h