Initial error handling code

src/core/SkSecureReadBuffer.h

-
 /*
- * Copyright 2011 Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#ifndef SkOrderedReadBuffer_DEFINED
-#define SkOrderedReadBuffer_DEFINED
+#ifndef SkSecureReadBuffer_DEFINED
+#define SkSecureReadBuffer_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkBitmapHeap.h"
 #include "SkFlattenableBuffers.h"
 #include "SkPath.h"
 #include "SkPicture.h"
 #include "SkReader32.h"
 
 class SkBitmap;
 
 #if defined(SK_DEBUG) && defined(SK_BUILD_FOR_MAC)
     #define DEBUG_NON_DETERMINISTIC_ASSERT
 #endif
 
-class SkOrderedReadBuffer : public SkFlattenableReadBuffer {
+class SkSecureReadBuffer : public SkFlattenableReadBuffer {
 public:
-    SkOrderedReadBuffer();
-    SkOrderedReadBuffer(const void* data, size_t size);
-    SkOrderedReadBuffer(SkStream* stream);
-    virtual ~SkOrderedReadBuffer();
-
-    virtual SkOrderedReadBuffer* getOrderedBinaryBuffer() SK_OVERRIDE { return this; }
+    SkSecureReadBuffer();
+    SkSecureReadBuffer(const void* data, size_t size);
+    SkSecureReadBuffer(SkStream* stream);
+    virtual ~SkSecureReadBuffer();
 
     SkReader32* getReader32() { return &fReader; }
 
     uint32_t size() { return fReader.size(); }
     uint32_t offset() { return fReader.offset(); }
     bool eof() { return fReader.eof(); }
-    const void* skip(size_t size) { return fReader.skip(size); }
+    const void* skip(size_t size);
 
     // primitives
     virtual bool readBool() SK_OVERRIDE;
     virtual SkColor readColor() SK_OVERRIDE;
     virtual SkFixed readFixed() SK_OVERRIDE;
     virtual int32_t readInt() SK_OVERRIDE;
     virtual SkScalar readScalar() SK_OVERRIDE;
     virtual uint32_t readUInt() SK_OVERRIDE;
     virtual int32_t read32() SK_OVERRIDE;
 
@@ skipping 56 matching lines @@
     /**
      *  Provide a function to decode an SkBitmap from encoded data. Only used if the writer
      *  encoded the SkBitmap. If the proper decoder cannot be used, a red bitmap with the
      *  appropriate size will be used.
      */
     void setBitmapDecoder(SkPicture::InstallPixelRefProc bitmapDecoder) {
         fBitmapDecoder = bitmapDecoder;
     }
 
 private:
+    void setMemory(const void* data, size_t size);
+
+    static bool ptr_align_4(const void* ptr) {
+        return (((const char*)ptr - (const char*)NULL) & 3) == 0;
+    }
+
     SkReader32 fReader;
     void* fMemoryPtr;
 
     SkBitmapHeapReader* fBitmapStorage;
     SkTypeface** fTFArray;
     int        fTFCount;
 
     SkTDArray<SkFlattenable::Factory>* fFactoryTDArray;
     SkFlattenable::Factory* fFactoryArray;
     int                     fFactoryCount;
 
     SkPicture::InstallPixelRefProc fBitmapDecoder;
 
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     // Debugging counter to keep track of how many bitmaps we
     // have decoded.
     int fDecodedBitmapIndex;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 
     typedef SkFlattenableReadBuffer INHERITED;
 };
 
-#endif // SkOrderedReadBuffer_DEFINED
+#endif // SkSecureReadBuffer_DEFINED