Initial error handling code

src/core/SkOrderedReadBuffer.cpp

 
 /*
  * 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 "SkBitmap.h"
 #include "SkErrorInternals.h"
@@ skipping 282 matching lines @@
         }
     }
 
     // if we get here, factory may still be null, but if that is the case, the
     // failure was ours, not the writer.
     SkFlattenable* obj = NULL;
     uint32_t sizeRecorded = fReader.readU32();
     if (factory) {
         uint32_t offset = fReader.offset();
         obj = (*factory)(*this);
+        if (fError != kNoError_SkError) {
+            delete obj;
+            obj = NULL;
+            fError = kNoError_SkError;

[reed1, 2013/08/21 15:49:24]

Hmmm, maybe this is correct (to reset fError to none) or maybe we shouldn't hide
the fact that we had a failure... ?

[sugoi1, 2013/08/21 16:52:36]

It's only reset here so that the next read operation (or factory function call)
will not fail on the previous read operation's error. I could also set it to
"NoError" just before calling the factory function.

[scroggo, 2013/08/21 23:56:00]

This seems to be basically the same, since SkOrderedReadBuffer is going to
continue calling readFlattenable.

+        }
         // check that we read the amount we expected
         uint32_t sizeRead = fReader.offset() - offset;
         if (sizeRecorded != sizeRead) {
             // we could try to fix up the offset...
             sk_throw();
         }
     } else {
         // we must skip the remaining data
         fReader.skip(sizeRecorded);
     }
     return obj;
 }