use SkTaskGroup for multidraw

src/core/SkMultiPictureDraw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #if SK_SUPPORT_GPU
 #include "GrLayerHoister.h"
 #include "GrRecordReplaceDraw.h"
@@ skipping 40 matching lines @@
     if (paint) {
         data->paint = SkNEW_ARGS(SkPaint, (*paint));
     } else {
         data->paint = NULL;
     }
 }
 
 #undef SK_IGNORE_GPU_LAYER_HOISTING
 #define SK_IGNORE_GPU_LAYER_HOISTING 1
 
+#include "SkTaskGroup.h"
+

[robertphillips, 2014/10/27 12:34:05]

a struct?

+struct PictureDrawRunnable : public SkRunnable {
+    SkCanvas*        fCanvas;
+    const SkPicture* fPicture;
+    const SkMatrix*  fMatrix;
+    const SkPaint*   fPaint;
+    
+    void init(SkCanvas* canvas, const SkPicture* picture, const SkMatrix* matrix,
+              const SkPaint* paint) {
+        fCanvas = canvas;
+        fPicture = picture;
+        fMatrix = matrix;
+        fPaint = paint;
+    }
+
+    virtual void run() SK_OVERRIDE {
+        fCanvas->drawPicture(fPicture, fMatrix, fPaint);
+    }
+};
+
 void SkMultiPictureDraw::draw() {
+    
+    if (true) {
+        const int count = fDrawData.count();
+        SkAutoSTArray<32, PictureDrawRunnable> pdr(count);
+        SkTaskGroup group;
+        for (int i = 0; i < count; ++i) {

[robertphillips, 2014/10/27 12:34:05]

It seems like this portion should go with the drawPicture call below.

+            const DrawData& data = fDrawData[i];
+            pdr[i].init(data.canvas, data.picture, &data.matrix, data.paint);
+            group.add(&pdr[i]);
+        }
+        return;
+    }
 
 #ifndef SK_IGNORE_GPU_LAYER_HOISTING
     GrContext* context = NULL;
 
     SkTDArray<GrHoistedLayer> atlased, nonAtlased, recycled;
 
     for (int i = 0; i < fDrawData.count(); ++i) {
         if (fDrawData[i].canvas->getGrContext() &&
             !fDrawData[i].paint && fDrawData[i].matrix.isIdentity()) {
             SkASSERT(NULL == context || context == fDrawData[i].canvas->getGrContext());
@@ skipping 40 matching lines @@
 
 #ifndef SK_IGNORE_GPU_LAYER_HOISTING
     if (NULL != context) {
         GrLayerHoister::UnlockLayers(context, atlased, nonAtlased, recycled);
     }
 #endif
 
     this->reset();
 }