Turn on threaded DMQuiltTask drawing for old-format SkPictures too.

src/core/SkPicturePlayback.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.
  */
 
 #include "SkCanvas.h"
 #include "SkPictureData.h"
 #include "SkPicturePlayback.h"
@@ skipping 97 matching lines @@
     const void* text() { return (const void*)fText; }
     size_t fByteLength;
     const char* fText;
 };
 
 void get_text(SkReader32* reader, TextContainer* text) {
     size_t length = text->fByteLength = reader->readInt();
     text->fText = (const char*)reader->skip(length);
 }
 
+// FIXME: SkBitmaps are stateful, so we need to copy them to play back in multiple threads.
+static SkBitmap shallow_copy(const SkBitmap& bitmap) {
+    return bitmap;
+}
+
 void SkPicturePlayback::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) {
     SkAutoResetOpID aroi(this);
     SkASSERT(0 == fCurOffset);
 
 #ifdef ENABLE_TIME_DRAW
     SkAutoTime  at("SkPicture::draw", 50);
 #endif
 
 #ifdef SPEW_CLIP_SKIPPING
     SkipClipRec skipRect, skipRRect, skipRegion, skipPath, skipCull;
@@ skipping 254 matching lines @@
             canvas->popCull();
             break;
         case CONCAT: {
             SkMatrix matrix;
             reader.readMatrix(&matrix);
             canvas->concat(matrix);
             break;
         }
         case DRAW_BITMAP: {
             const SkPaint* paint = fPictureData->getPaint(reader);
-            const SkBitmap& bitmap = fPictureData->getBitmap(reader);
+            const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             const SkPoint& loc = reader.skipT<SkPoint>();
             canvas->drawBitmap(bitmap, loc.fX, loc.fY, paint);
         } break;
         case DRAW_BITMAP_RECT_TO_RECT: {
             const SkPaint* paint = fPictureData->getPaint(reader);
-            const SkBitmap& bitmap = fPictureData->getBitmap(reader);
+            const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             const SkRect* src = get_rect_ptr(reader);   // may be null
             const SkRect& dst = reader.skipT<SkRect>();     // required
             SkCanvas::DrawBitmapRectFlags flags;
             flags = (SkCanvas::DrawBitmapRectFlags) reader.readInt();
             canvas->drawBitmapRectToRect(bitmap, src, dst, paint, flags);
         } break;
         case DRAW_BITMAP_MATRIX: {
             const SkPaint* paint = fPictureData->getPaint(reader);
-            const SkBitmap& bitmap = fPictureData->getBitmap(reader);
+            const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             SkMatrix matrix;
             reader.readMatrix(&matrix);
             canvas->drawBitmapMatrix(bitmap, matrix, paint);
         } break;
         case DRAW_BITMAP_NINE: {
             const SkPaint* paint = fPictureData->getPaint(reader);
-            const SkBitmap& bitmap = fPictureData->getBitmap(reader);
+            const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             const SkIRect& src = reader.skipT<SkIRect>();
             const SkRect& dst = reader.skipT<SkRect>();
             canvas->drawBitmapNine(bitmap, src, dst, paint);
         } break;
         case DRAW_CLEAR:
             canvas->clear(reader.readInt());
             break;
         case DRAW_DATA: {
             size_t length = reader.readInt();
             canvas->drawData(reader.skip(length), length);
@@ skipping 82 matching lines @@
             canvas->drawRect(reader.skipT<SkRect>(), paint);
         } break;
         case DRAW_RRECT: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
             SkRRect rrect;
             reader.readRRect(&rrect);
             canvas->drawRRect(rrect, paint);
         } break;
         case DRAW_SPRITE: {
             const SkPaint* paint = fPictureData->getPaint(reader);
-            const SkBitmap& bitmap = fPictureData->getBitmap(reader);
+            const SkBitmap bitmap = shallow_copy(fPictureData->getBitmap(reader));
             int left = reader.readInt();
             int top = reader.readInt();
             canvas->drawSprite(bitmap, left, top, paint);
         } break;
         case DRAW_TEXT: {
             const SkPaint& paint = *fPictureData->getPaint(reader);
             get_text(&reader, &text);
             SkScalar x = reader.readScalar();
             SkScalar y = reader.readScalar();
             canvas->drawText(text.text(), text.length(), x, y, paint);
@@ skipping 111 matching lines @@
             skipCull.fSize;
         SkDebugf("--- Clip skips %d%% rect:%d rrect:%d path:%d rgn:%d cull:%d\n",
             size * 100 / reader.offset(), skipRect.fCount, skipRRect.fCount,
             skipPath.fCount, skipRegion.fCount, skipCull.fCount);
         SkDebugf("--- Total ops: %d\n", opCount);
     }
 #endif
     //    this->dumpSize();
 }