Removing the dependency on GraphicsContext for drawing images in 2D canvas

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 19 matching lines @@
 #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.
 class PLATFORM_EXPORT GraphicsContextState final {
 public:
@@ skipping 13 matching lines @@
     // path to be stroked is known, pass it in for correct dash or dot placement.
     const SkPaint& strokePaint(int strokedPathLength = 0) const;
     const SkPaint& fillPaint() const;
 
     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>, float);
 
     Pattern* strokePattern() const { return m_strokePattern.get(); }
     void setStrokePattern(const PassRefPtr<Pattern>, float);
 
     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>, float);
 
     Pattern* fillPattern() const { return m_fillPattern.get(); }
     void setFillPattern(const PassRefPtr<Pattern>, float);
 
     // 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();
 
-    SkImageFilter* dropShadowImageFilter() const { return m_dropShadowImageFilter.get(); }
-    void setDropShadowImageFilter(PassRefPtr<SkImageFilter>);
-    void clearDropShadowImageFilter();
-
     // Text. (See TextModeFill & friends.)
     TextDrawingModeFlags textDrawingMode() const { return m_textDrawingMode; }
     void setTextDrawingMode(TextDrawingModeFlags mode) { m_textDrawingMode = mode; }
 
-    // Common shader state.
-    int alpha() const { return m_alpha; }
-    void setAlphaAsFloat(float);
-
     SkColorFilter* colorFilter() const { return m_colorFilter.get(); }
     void setColorFilter(PassRefPtr<SkColorFilter>);
 
-    // Compositing control, for the CSS and Canvas compositing spec.
-    void setCompositeOperation(SkXfermode::Mode);
-    SkXfermode::Mode compositeOperation() const { return m_compositeOperation; }
-
     // Image interpolation control.
     InterpolationQuality interpolationQuality() const { return m_interpolationQuality; }
     void setInterpolationQuality(InterpolationQuality);
 
     bool shouldAntialias() const { return m_shouldAntialias; }
     void setShouldAntialias(bool);
 
-    bool shouldClampToSourceRect() const { return m_shouldClampToSourceRect; }
-    void setShouldClampToSourceRect(bool shouldClampToSourceRect) { m_shouldClampToSourceRect = shouldClampToSourceRect; }
-
 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 color) const
-    {
-        return scaleAlpha(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;
     RefPtr<Pattern> m_strokePattern;
 
     Color m_fillColor;
     WindRule m_fillRule;
     RefPtr<Gradient> m_fillGradient;
     RefPtr<Pattern> m_fillPattern;
 
     RefPtr<SkDrawLooper> m_looper;
-    RefPtr<SkImageFilter> m_dropShadowImageFilter;
 
     TextDrawingModeFlags m_textDrawingMode;
 
-    int m_alpha;
     RefPtr<SkColorFilter> m_colorFilter;
 
-    SkXfermode::Mode m_compositeOperation;
-
     InterpolationQuality m_interpolationQuality;
 
     uint16_t m_saveCount;
 
     bool m_shouldAntialias : 1;
-    bool m_shouldClampToSourceRect : 1;
 };
 
 } // namespace blink
 
 #endif // GraphicsContextState_h