MultiPictureDraw is taskgroup aware.

SampleApp is multipicturedraw aware.

BUG=skia:

Review URL: https://codereview.chromium.org/684923002

1 files changed, 15 insertions, 5 deletions

diff --git a/include/core/SkMultiPictureDraw.h b/include/core/SkMultiPictureDraw.h
index d8d9cb7ecd..461d38136b 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