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 250 matching lines @@
         if (index) {
             SkDebugf("====== typeface index %d\n", index);
         }
         return NULL;
     } else {
         SkASSERT(fTFArray);
         return fTFArray[index - 1];
     }
 }
 
-SkFlattenable* SkOrderedReadBuffer::readFlattenable() {
+SkFlattenable* SkOrderedReadBuffer::readFlattenable(SkFlattenable::Type) {

[mtklein, 2013/09/24 22:52:18]

A little // We ignore this Type parameter here because we're assuming the data
in the SkOrderedReadBuffer is trusted and we don't need to do type checking ?

Now that I'm thinking about it, I'll have to remember to come back through here
and _do_ use the Type for type checking in Debug builds, at least where
possible.

[sugoi1, 2013/09/25 21:15:27]

Done.

     SkFlattenable::Factory factory = NULL;
 
     if (fFactoryCount > 0) {
         int32_t index = fReader.readU32();
         if (0 == index) {
             return NULL; // writer failed to give us the flattenable
         }
         index -= 1;     // we stored the index-base-1
         SkASSERT(index < fFactoryCount);
         factory = fFactoryArray[index];
@@ skipping 23 matching lines @@
         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;
 }