Use skia::RefPtr to avoid having to manually refcount GraphicsContextState::m_looper.

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 19 matching lines @@
 #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/SkColorPriv.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
+#include "third_party/skia/include/core/SkRefCnt.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:
-    ~GraphicsContextState()
-    {
-        SkSafeUnref(m_looper);
-    }
+    ~GraphicsContextState() { }
 
 private:
     friend class GraphicsContext;
 
     GraphicsContextState()
         : m_fillColor(Color::black)
         , m_fillRule(RULE_NONZERO)
-        , m_looper(0)
         , 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)
@@ skipping 16 matching lines @@
         , m_xferMode(other.m_xferMode)
         , 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_shadowsIgnoreTransforms(other.m_shadowsIgnoreTransforms)
     {
-        // Up the ref count of these. SkSafeRef does nothing if its argument is 0.
-        SkSafeRef(m_looper);
-
         // The clip image only needs to be applied once. Reset the image so that we
         // don't attempt to clip multiple times.
         m_imageBufferClip.reset();
     }
 
     // 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
     {
         int s = roundf(m_alpha * 256);
@@ skipping 15 matching lines @@
     // Stroke.
     StrokeData m_strokeData;
 
     // Fill.
     Color m_fillColor;
     WindRule m_fillRule;
     RefPtr<Gradient> m_fillGradient;
     RefPtr<Pattern> m_fillPattern;
 
     // Shadow. (This will need tweaking if we use draw loopers for other things.)
-    SkDrawLooper* m_looper;
+    SkRefPtr<SkDrawLooper> m_looper;

[danakj, 2013/06/19 15:47:13]

I believe you want to use SKAutoTUnref instead. SkRefPtr is the less loved of
the two and I think will go away.

 
     // Text. (See TextModeFill & friends.)
     TextDrawingModeFlags m_textDrawingMode;
 
     // Common shader state.
     float m_alpha;
     SkXfermode::Mode m_xferMode;
 
     // Compositing control, for the CSS and Canvas compositing spec.
     CompositeOperator m_compositeOperator;
@@ skipping 10 matching lines @@
 
     bool m_shouldAntialias : 1;
     bool m_shouldSmoothFonts : 1;
     bool m_shadowsIgnoreTransforms : 1;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContextState_h