First draft of non-scale/translate filters plus blit optimization.

include/core/SkCanvas.h

Index: include/core/SkCanvas.h
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 836f7b1115797ee20e29cfe23702c986b09aa97b..6ca201a945c175f84ad76741ff35e255956cceb3 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -1242,7 +1242,8 @@ protected:
     // and offscreen bounds for any margin required by the filter DAG.
     bool clipRectBounds(const SkRect* bounds, SaveFlags flags,
                         SkIRect* intersection,
-                        const SkImageFilter* imageFilter = NULL);
+                        const SkImageFilter* imageFilter = NULL,
+                        const SkMatrix* extraMatrix = NULL);
 
     // notify our surface (if we have one) that we are about to draw, so it
     // can perform copy-on-write or invalidate any cached images
@@ -1322,7 +1323,7 @@ private:
                                 const SkRect& dst, const SkPaint* paint);
     void internalDrawPaint(const SkPaint& paint);
     void internalSaveLayer(const SkRect* bounds, const SkPaint*, SaveFlags, SaveLayerStrategy);
-    void internalDrawDevice(SkBaseDevice*, int x, int y, const SkPaint*);
+    void internalDrawDevice(SkBaseDevice*, int x, int y, const SkPaint*, const SkMatrix& extraMatrix);
 
     // shared by save() and saveLayer()
     void internalSave();