Make SVG painting independent of GraphicsContext's alpha state

Source/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 17 matching lines @@
 
 #ifndef GraphicsContextState_h
 #define GraphicsContextState_h
 
 #include "platform/graphics/DrawLooperBuilder.h"
 #include "platform/graphics/Gradient.h"
 #include "platform/graphics/GraphicsTypes.h"
 #include "platform/graphics/Path.h"
 #include "platform/graphics/Pattern.h"
 #include "platform/graphics/StrokeData.h"
+#include "platform/graphics/skia/SkiaUtils.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 // Encapsulates the state information we store for each pushed graphics state.
 // Only GraphicsContext can use this class.
@@ skipping 19 matching lines @@
     uint16_t saveCount() const { return m_saveCount; }
     void incrementSaveCount() { ++m_saveCount; }
     void decrementSaveCount() { --m_saveCount; }
 
     // Stroke data
     Color strokeColor() const { return m_strokeColor; }
     SkColor effectiveStrokeColor() const { return applyAlpha(m_strokeColor.rgb()); }
     void setStrokeColor(const Color&);
 
     Gradient* strokeGradient() const { return m_strokeGradient.get(); }
-    void setStrokeGradient(const PassRefPtr<Gradient>);
+    void setStrokeGradient(const PassRefPtr<Gradient>, float);
     void clearStrokeGradient();
 
     Pattern* strokePattern() const { return m_strokePattern.get(); }
-    void setStrokePattern(const PassRefPtr<Pattern>);
+    void setStrokePattern(const PassRefPtr<Pattern>, float);
     void clearStrokePattern();
 
     const StrokeData& strokeData() const { return m_strokeData; }
     void setStrokeStyle(StrokeStyle);
     void setStrokeThickness(float);
     void setLineCap(LineCap);
     void setLineJoin(LineJoin);
     void setMiterLimit(float);
     void setLineDash(const DashArray&, float);
 
     // Fill data
     Color fillColor() const { return m_fillColor; }
     SkColor effectiveFillColor() const { return applyAlpha(m_fillColor.rgb()); }
     void setFillColor(const Color&);
 
     Gradient* fillGradient() const { return m_fillGradient.get(); }
-    void setFillGradient(const PassRefPtr<Gradient>);
+    void setFillGradient(const PassRefPtr<Gradient>, float);
     void clearFillGradient();
 
     Pattern* fillPattern() const { return m_fillPattern.get(); }
-    void setFillPattern(const PassRefPtr<Pattern>);
+    void setFillPattern(const PassRefPtr<Pattern>, float);
     void clearFillPattern();
 
     // Path fill rule
     WindRule fillRule() const { return m_fillRule; }
     void setFillRule(WindRule rule) { m_fillRule = rule; }
 
     // Shadow. (This will need tweaking if we use draw loopers for other things.)
     SkDrawLooper* drawLooper() const { return m_looper.get(); }
     void setDrawLooper(PassRefPtr<SkDrawLooper>);
     void clearDrawLooper();
@@ skipping 32 matching lines @@
     bool hasComplexClip() const;
     void setHasComplexClip();
 
 private:
     GraphicsContextState();
     explicit GraphicsContextState(const GraphicsContextState&);
     GraphicsContextState& operator=(const GraphicsContextState&);
 
     // 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
+    SkColor applyAlpha(SkColor color) const
     {
-        int a = SkAlphaMul(SkColorGetA(c), m_alpha);
-        return (c & 0x00FFFFFF) | (a << 24);
+        return multiplyAlpha(color, m_alpha);
     }
 
     // These are mutbale to enable gradient updates when the paints are fetched for use.
     mutable SkPaint m_strokePaint;
     mutable SkPaint m_fillPaint;
 
     StrokeData m_strokeData;
 
     Color m_strokeColor;
     RefPtr<Gradient> m_strokeGradient;
@@ skipping 19 matching lines @@
     uint16_t m_saveCount;
 
     bool m_shouldAntialias : 1;
     bool m_shouldClampToSourceRect : 1;
     bool m_hasComplexClip : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContextState_h