Allow creating a picture from skp to fail.

debugger/QT/SkDebuggerGUI.cpp

 /*

[scroggo, 2013/09/26 21:06:28]

Patchset 1 reverts r7844: "Remove bogus ability for creating an
SkPicturePlayback to fail." (shah 7b1af5ada71ec8ea0f13e731a6e401def48df18d) with
some slight changes to build today.

  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebuggerGUI.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
@@ skipping 128 matching lines @@
         item->setHidden(fDebugger.isCommandVisible(row)
                 && fDeletesActivated);
     }
 }
 
 // The timed picture playback uses the SkPicturePlayback's profiling stubs
 // to time individual commands. The offsets are needed to map SkPicture
 // offsets to individual commands.
 class SkTimedPicturePlayback : public SkPicturePlayback {
 public:
-    SkTimedPicturePlayback(SkStream* stream, const SkPictInfo& info,
+    SkTimedPicturePlayback(SkStream* stream, const SkPictInfo& info, bool* isValid,
                            SkPicture::InstallPixelRefProc proc,
                            const SkTDArray<bool>& deletedCommands)
-        : INHERITED(stream, info, proc)
+        : INHERITED(stream, info, isValid, proc)
         , fSkipCommands(deletedCommands)
         , fTot(0.0)
         , fCurCommand(0) {
         fTimes.setCount(deletedCommands.count());
         fTypeTimes.setCount(LAST_DRAWTYPE_ENUM+1);
         this->resetTimes();
     }
 
     void resetTimes() {
         for (int i = 0; i < fTimes.count(); ++i) {
@@ skipping 78 matching lines @@
                                               SkPicture::InstallPixelRefProc proc,
                                               const SkTDArray<bool>& deletedCommands) {
         SkPictInfo info;
         if (!StreamIsSKP(stream, &info)) {
             return NULL;
         }
 
         SkTimedPicturePlayback* playback;
         // Check to see if there is a playback to recreate.
         if (stream->readBool()) {
+            bool isValid = false;
             playback = SkNEW_ARGS(SkTimedPicturePlayback,
-                                  (stream, info, proc, deletedCommands));
+                                   (stream, info, &isValid, proc, deletedCommands));
+            if (!isValid) {
+                SkDELETE(playback);
+                return NULL;
+            }
         } else {
             playback = NULL;
         }
 
         return SkNEW_ARGS(SkTimedPicture, (playback, info.fWidth, info.fHeight));
     }
 
     void resetTimes() { ((SkTimedPicturePlayback*) fPlayback)->resetTimes(); }
 
     int count() const { return ((SkTimedPicturePlayback*) fPlayback)->count(); }
@@ skipping 743 matching lines @@
     }
 
     // NOTE(chudy): Makes first item unselectable.
     QStandardItemModel* model = qobject_cast<QStandardItemModel*>(
             fFilter.model());
     QModelIndex firstIndex = model->index(0, fFilter.modelColumn(),
             fFilter.rootModelIndex());
     QStandardItem* firstItem = model->itemFromIndex(firstIndex);
     firstItem->setSelectable(false);
 }