Pass compressed blitters to our mask drawing algorithm

src/gpu/GrSWMaskHelper.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrSWMaskHelper_DEFINED
 #define GrSWMaskHelper_DEFINED
 
@@ skipping 24 matching lines @@
  *      draw one or more paths/rects specifying the required boolean ops
  *
  *   toTexture();   // to get it from the internal bitmap to the GPU
  *
  * The result of this process will be the final mask (on the GPU) in the
  * upper left hand corner of the texture.
  */
 class GrSWMaskHelper : SkNoncopyable {
 public:
     GrSWMaskHelper(GrContext* context)
-    : fContext(context), fCompressMask(false) {
-    }
+    : fContext(context)
+    , fCompressionMode(kNone_CompressionMode)
+    , fCompressedBuffer(NULL)
+    , fCompressedBlitter(NULL)

[robertphillips, 2014/08/06 20:54:49]

'{' goes on line above

[krajcevski, 2014/08/06 22:41:59]

Done.

+    { }
+
+    ~GrSWMaskHelper();
 
     // set up the internal state in preparation for draws. Since many masks
     // may be accumulated in the helper during creation, "resultBounds"
     // allows the caller to specify the region of interest - to limit the
     // amount of work.
     bool init(const SkIRect& resultBounds, const SkMatrix* matrix);
 
     // Draw a single rect into the accumulation bitmap using the specified op
     void draw(const SkRect& rect, SkRegion::Op op,
               bool antiAlias, uint8_t alpha);
@@ skipping 30 matching lines @@
     // geometry and the current drawState. The current drawState is altered to
     // accommodate the mask.
     // Note that this method assumes that the GrPaint::kTotalStages slot in
     // the draw state can be used to hold the mask texture stage.
     // This method is really only intended to be used with the
     // output of DrawPathMaskToTexture.
     static void DrawToTargetWithPathMask(GrTexture* texture,
                                          GrDrawTarget* target,
                                          const SkIRect& rect);
 
-protected:
 private:
     GrContext*      fContext;
     SkMatrix        fMatrix;
     SkBitmap        fBM;
     SkDraw          fDraw;
     SkRasterClip    fRasterClip;
 
-    // This flag says whether or not we should compress the mask. If
-    // it is true, then fCompressedFormat is always valid.
-    bool                        fCompressMask;
+    // This enum says whether or not we should compress the mask:
+    // kNone_CompressionMode: compression is not supported on this device.
+    // kCompress_CompressionMode: compress the bitmap before it gets sent to the gpu
+    // kBlitter_CompressionMode: write to the bitmap using a special compressed blitter.
+    enum CompressionMode {
+        kNone_CompressionMode,
+        kCompress_CompressionMode,
+        kBlitter_CompressionMode,
+    } fCompressionMode;
+

[robertphillips, 2014/08/06 20:54:49]

// These two are only non-NULL is fCompressionMode is not kNone ?

[krajcevski, 2014/08/06 22:41:59]

Done.

+    void*           fCompressedBuffer;
+    SkBlitter*      fCompressedBlitter;
 
     // This is the desired format within which to compress the
-    // texture. This value is only valid if fCompressMask is true.
+    // texture. This value is only valid if fCompressionMode is not kNone_CompressionMode.
     SkTextureCompressor::Format fCompressedFormat;
 
     // Actually sends the texture data to the GPU. This is called from
     // toTexture with the data filled in depending on the texture config.
     void sendTextureData(GrTexture *texture, const GrTextureDesc& desc,
                          const void *data, int rowbytes);
 
     // Compresses the bitmap stored in fBM and sends the compressed data
     // to the GPU to be stored in 'texture' using sendTextureData.
     void compressTextureData(GrTexture *texture, const GrTextureDesc& desc);
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif // GrSWMaskHelper_DEFINED