Detect color masks, and divert to draw-sprite instead of maskblitters

include/core/SkMask.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMask_DEFINED
@@ skipping 80 matching lines @@
      *  this asserts that the mask's format is kLCD32_Format, and that (x,y)
      *  are contained in the mask's fBounds.
      */
     uint32_t* getAddrLCD32(int x, int y) const {
         SkASSERT(kLCD32_Format == fFormat);
         SkASSERT(fBounds.contains(x, y));
         SkASSERT(fImage != NULL);
         uint32_t* row = (uint32_t*)(fImage + (y - fBounds.fTop) * fRowBytes);
         return row + (x - fBounds.fLeft);
     }
-
+    
+    /**
+     *  Return the address of the specified 32bit mask. In the debug build,
+     *  this asserts that the mask's format is 32bits, and that (x,y)
+     *  are contained in the mask's fBounds.
+     */
+    uint32_t* getAddr32(int x, int y) const {
+        SkASSERT(kLCD32_Format == fFormat || kARGB32_Format == fFormat);
+        SkASSERT(fBounds.contains(x, y));
+        SkASSERT(fImage != NULL);
+        uint32_t* row = (uint32_t*)(fImage + (y - fBounds.fTop) * fRowBytes);
+        return row + (x - fBounds.fLeft);
+    }
+    
     /**
      *  Returns the address of the specified pixel, computing the pixel-size
      *  at runtime based on the mask format. This will be slightly slower than
      *  using one of the routines where the format is implied by the name
      *  e.g. getAddr8 or getAddrLCD32.
      *
      *  x,y must be contained by the mask's bounds (this is asserted in the
      *  debug build, but not checked in the release build.)
      *
      *  This should not be called with kBW_Format, as it will give unspecified
@@ skipping 27 matching lines @@
 
     ~SkAutoMaskFreeImage() {
         SkMask::FreeImage(fImage);
     }
 
 private:
     uint8_t* fImage;
 };
 
 #endif