Propagate validation errors

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 "SkPatchUtils.h"
 #include "SkPictureData.h"
@@ skipping 64 matching lines @@
     const char* fText;
 };
 
 void get_text(SkReadBuffer* reader, TextContainer* text) {
     size_t length = text->fByteLength = reader->readInt();
     text->fText = (const char*)reader->skip(length);
 }
 
 void SkPicturePlayback::draw(SkCanvas* canvas,
                              SkPicture::AbortCallback* callback,
-                             const SkReadBuffer* buffer) {
+                             SkReadBuffer* buffer) {
     AutoResetOpID aroi(this);
     SkASSERT(0 == fCurOffset);
 
     SkAutoTDelete<SkReadBuffer> reader;
     if (buffer) {
         reader.reset(buffer->clone(fPictureData->opData()->bytes(),
                                    fPictureData->opData()->size()));
     } else {
         reader.reset(new SkReadBuffer(fPictureData->opData()->bytes(),
                                       fPictureData->opData()->size()));
@@ skipping 11 matching lines @@
 
         fCurOffset = reader->offset();
         uint32_t size;
         DrawType op = ReadOpAndSize(reader, &size);
         if (!reader->validate(op > UNUSED && op <= LAST_DRAWTYPE_ENUM)) {
             return;
         }
 
         this->handleOp(reader, op, size, canvas, initialMatrix);
     }
+
+    // need to propagate invalid state to the parent reader
+    if (buffer) {
+        buffer->validate(reader->isValid());
+    }
 }
 
 void SkPicturePlayback::handleOp(SkReadBuffer* reader,
                                  DrawType op,
                                  uint32_t size,
                                  SkCanvas* canvas,
                                  const SkMatrix& initialMatrix) {
     switch (op) {
         case NOOP: {
             SkASSERT(size >= 4);
@@ skipping 538 matching lines @@
         case TRANSLATE_Z: {
 #ifdef SK_EXPERIMENTAL_SHADOWING
             SkScalar dz = reader->readScalar();
             canvas->translateZ(dz);
 #endif
         } break;
         default:
             SkASSERTF(false, "Unknown draw type: %d", op);
     }
 }