ImageBuffer-less SVG masking and clipping.

Source/core/platform/graphics/GraphicsContext.h

 /*
  * Copyright (C) 2003, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008-2009 Torch Mobile, Inc.
  * 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 177 matching lines @@
     // The text region is empty until tracking is turned on.
     // It is never clerared by the context.
     void setTrackTextRegion(bool track) { m_trackTextRegion = track; }
     const SkRect& textRegion() const { return m_textRegion; }
 
     bool updatingControlTints() const { return m_updatingControlTints; }
     void setUpdatingControlTints(bool updatingTints) { m_updatingControlTints = updatingTints; }
 
     AnnotationModeFlags annotationMode() const { return m_annotationMode; }
     void setAnnotationMode(const AnnotationModeFlags mode) { m_annotationMode = mode; }
+
+    void setColorSpaceConversion(ColorSpace srcColorSpace, ColorSpace dstColorSpace);
     // ---------- End state management methods -----------------
 
     // Get the contents of the image buffer
     bool readPixels(SkBitmap*, int, int, SkCanvas::Config8888 = SkCanvas::kNative_Premul_Config8888);
 
     // Sets up the paint for the current fill style.
     void setupPaintForFilling(SkPaint*) const;
 
     // Sets up the paint for stroking. Returns a float representing the
     // effective width of the pen. If a non-zero length is provided, the
@@ skipping 63 matching lines @@
     void drawPosTextH(const void* text, size_t byteLength, const SkScalar xpos[], SkScalar constY, const SkRect& textRect, const SkPaint&);
     void drawTextOnPath(const void* text, size_t byteLength, const SkPath&, const SkRect& textRect, const SkMatrix*, const SkPaint&);
 
     void clip(const IntRect& rect) { clip(FloatRect(rect)); }
     void clip(const FloatRect& rect) { clipRect(rect); }
     void clipRoundedRect(const RoundedRect&);
     void clipOut(const IntRect& rect) { clipRect(rect, NotAntiAliased, SkRegion::kDifference_Op); }
     void clipOutRoundedRect(const RoundedRect&);
     void clipPath(const Path&, WindRule = RULE_EVENODD);
     void clipConvexPolygon(size_t numPoints, const FloatPoint*, bool antialias = true);
-    void clipToImageBuffer(const ImageBuffer*, const FloatRect&);
     bool clipRect(const SkRect&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
 
     void drawText(const Font&, const TextRunPaintInfo&, const FloatPoint&);
     void drawEmphasisMarks(const Font&, const TextRunPaintInfo&, const AtomicString& mark, const FloatPoint&);
     void drawBidiText(const Font&, const TextRunPaintInfo&, const FloatPoint&, Font::CustomFontNotReadyAction = Font::DoNotPaintIfFontNotReady);
     void drawHighlightForText(const Font&, const TextRun&, const FloatPoint&, int h, const Color& backgroundColor, int from = 0, int to = -1);
 
     void drawLineForText(const FloatPoint&, float width, bool printing);
     enum DocumentMarkerLineStyle {
         DocumentMarkerSpellingLineStyle,
         DocumentMarkerGrammarLineStyle
     };
     void drawLineForDocumentMarker(const FloatPoint&, float width, DocumentMarkerLineStyle);
 
-    void beginTransparencyLayer(float opacity);
-    void endTransparencyLayer();
+    void beginTransparencyLayer(float opacity, const FloatRect* = 0);
+    void beginMaskedLayer(const FloatRect&, MaskType = AlphaMaskType);
+    void endLayer();
 
     bool hasShadow() const;
     void setShadow(const FloatSize& offset, float blur, const Color&,
         DrawLooper::ShadowTransformMode = DrawLooper::ShadowRespectsTransforms,
         DrawLooper::ShadowAlphaMode = DrawLooper::ShadowRespectsAlpha);
     void clearShadow() { clearDrawLooper(); }
 
     // It is assumed that this draw looper is used only for shadows
     // (i.e. a draw looper is set if and only if there is a shadow).
     void setDrawLooper(const DrawLooper&);
@@ skipping 93 matching lines @@
     void drawInnerPath(const SkPath&, SkPaint&, int);
 
     // SkCanvas wrappers.
     bool isDrawingToLayer() const { return m_canvas->isDrawingToLayer(); }
 
     bool clipPath(const SkPath&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
     bool clipRRect(const SkRRect&, AntiAliasingMode = NotAntiAliased, SkRegion::Op = SkRegion::kIntersect_Op);
 
     bool concat(const SkMatrix&);
 
-    // Used when restoring and the state has an image clip. Only shows the pixels in
-    // m_canvas that are also in imageBuffer.
-    // The clipping rectangle is given in absolute coordinates.
-    void applyClipFromImage(const SkRect&, const SkBitmap&);
-
     // common code between setupPaintFor[Filling,Stroking]
     void setupShader(SkPaint*, Gradient*, Pattern*, SkColor) const;
 
     // Apply deferred saves
     void realizeSave(SkCanvas::SaveFlags flags)
     {
         if (m_deferredSaveFlags & flags) {
             m_canvas->save((SkCanvas::SaveFlags)m_deferredSaveFlags);
             m_deferredSaveFlags = 0;
         }
@@ skipping 17 matching lines @@
     //        It will come in handy when adding granular save() support (clip vs. matrix vs. paint).
     // crbug.com/233713
     struct DeferredSaveState;
     unsigned m_deferredSaveFlags;
     Vector<DeferredSaveState> m_saveStateStack;
 
     AnnotationModeFlags m_annotationMode;
 
 #if !ASSERT_DISABLED
     unsigned m_annotationCount;
-    unsigned m_transparencyCount;
+    unsigned m_layerCount;
 #endif
     // Tracks the region painted opaque via the GraphicsContext.
     OpaqueRegionSkia m_opaqueRegion;
     bool m_trackOpaqueRegion : 1;
 
     // Tracks the region where text is painted via the GraphicsContext.
     bool m_trackTextRegion : 1;
     SkRect m_textRegion;
 
     // Are we on a high DPI display? If so, spelling and grammar markers are larger.
     bool m_useHighResMarker : 1;
     // FIXME: Make this go away: crbug.com/236892
     bool m_updatingControlTints : 1;
     bool m_accelerated : 1;
     bool m_isCertainlyOpaque : 1;
     bool m_printing : 1;
 };
 
 } // namespace WebCore
 
 #endif // GraphicsContext_h