Index: include/core/SkMultiPictureDraw.h |
diff --git a/include/core/SkMultiPictureDraw.h b/include/core/SkMultiPictureDraw.h |
index d8d9cb7ecdcaa0492ed665e2edd1f240d0a5573b..461d38136b3e6b7055dbc3f54a89321bfb1c8ce8 100644 |
--- a/include/core/SkMultiPictureDraw.h |
+++ b/include/core/SkMultiPictureDraw.h |
@@ -56,13 +56,23 @@ public: |
private: |
struct DrawData { |
- SkCanvas* canvas; // reffed |
- const SkPicture* picture; // reffed |
- SkMatrix matrix; |
- SkPaint* paint; // owned |
+ SkCanvas* fCanvas; // reffed |
+ const SkPicture* fPicture; // reffed |
+ SkMatrix fMatrix; |
+ SkPaint* fPaint; // owned |
+ |
+ void init(SkCanvas*, const SkPicture*, const SkMatrix*, const SkPaint*); |
+ void draw(); |
+ |
+ static void Reset(SkTDArray<DrawData>&); |
+ |
+ static void Run(void* ctx) { |
+ static_cast<DrawData*>(ctx)->draw(); |
+ } |
}; |
- SkTDArray<DrawData> fDrawData; |
+ SkTDArray<DrawData> fThreadSafeDrawData; |
+ SkTDArray<DrawData> fGPUDrawData; |
}; |
#endif |