Index: include/core/SkShader.h |
diff --git a/include/core/SkShader.h b/include/core/SkShader.h |
index 4c4dba3e32692cf9ef9ca4b63b44146dde376abb..3739c9c73ca2e8270c0fa15eafb3ee1fb92f5b07 100644 |
--- a/include/core/SkShader.h |
+++ b/include/core/SkShader.h |
@@ -5,7 +5,6 @@ |
* found in the LICENSE file. |
*/ |
- |
#ifndef SkShader_DEFINED |
#define SkShader_DEFINED |
@@ -114,14 +113,11 @@ public: |
* ContextRec acts as a parameter bundle for creating Contexts. |
*/ |
struct ContextRec { |
- ContextRec() : fDevice(NULL), fPaint(NULL), fMatrix(NULL), fLocalMatrix(NULL) {} |
- ContextRec(const SkBitmap& device, const SkPaint& paint, const SkMatrix& matrix) |
- : fDevice(&device) |
- , fPaint(&paint) |
+ ContextRec(const SkPaint& paint, const SkMatrix& matrix, const SkMatrix* localM) |
+ : fPaint(&paint) |
, fMatrix(&matrix) |
- , fLocalMatrix(NULL) {} |
+ , fLocalMatrix(localM) {} |
- const SkBitmap* fDevice; // the bitmap we are drawing into |
const SkPaint* fPaint; // the current paint associated with the draw |
const SkMatrix* fMatrix; // the current matrix in the canvas |
const SkMatrix* fLocalMatrix; // optional local matrix |