Initial error handling code

src/pipe/SkGPipeRead.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkBitmapHeap.h"
@@ skipping 10 matching lines @@
 #include "SkImageFilter.h"
 #include "SkMaskFilter.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkPathEffect.h"
 #include "SkRasterizer.h"
 #include "SkRRect.h"
 #include "SkShader.h"
 #include "SkTypeface.h"
 #include "SkXfermode.h"
 
-static SkEffectType paintflat_to_effecttype(PaintFlats pf) {
-    static const uint8_t gEffectTypesInPaintFlatsOrder[] = {
-        kColorFilter_SkEffectType,
-        kDrawLooper_SkEffectType,
-        kImageFilter_SkEffectType,
-        kMaskFilter_SkEffectType,
-        kPathEffect_SkEffectType,
-        kRasterizer_SkEffectType,
-        kShader_SkEffectType,
-        kXfermode_SkEffectType,
-    };
-    
-    SkASSERT((size_t)pf < SK_ARRAY_COUNT(gEffectTypesInPaintFlatsOrder));
-    return (SkEffectType)gEffectTypesInPaintFlatsOrder[pf];
-}
-
 static void set_paintflat(SkPaint* paint, SkFlattenable* obj, unsigned paintFlat) {
     SkASSERT(paintFlat < kCount_PaintFlats);
     switch (paintFlat) {
         case kColorFilter_PaintFlat:
             paint->setColorFilter((SkColorFilter*)obj);
             break;
         case kDrawLooper_PaintFlat:
             paint->setLooper((SkDrawLooper*)obj);
             break;
+        case kImageFilter_PaintFlat:
+            paint->setImageFilter((SkImageFilter*)obj);
+            break;
         case kMaskFilter_PaintFlat:
             paint->setMaskFilter((SkMaskFilter*)obj);
             break;
         case kPathEffect_PaintFlat:
             paint->setPathEffect((SkPathEffect*)obj);
             break;
         case kRasterizer_PaintFlat:
             paint->setRasterizer((SkRasterizer*)obj);
             break;
         case kShader_PaintFlat:
             paint->setShader((SkShader*)obj);
             break;
-        case kImageFilter_PaintFlat:
-            paint->setImageFilter((SkImageFilter*)obj);
-            break;
         case kXfermode_PaintFlat:
             paint->setXfermode((SkXfermode*)obj);
             break;
         default:
             SkDEBUGFAIL("never gets here");
     }
 }
 
+static SkFlattenable* read_paintflat(SkFlattenableReadBuffer* reader, unsigned paintFlat) {
+    SkASSERT(paintFlat < kCount_PaintFlats);
+    switch (paintFlat) {
+        case kColorFilter_PaintFlat:
+            return reader->readColorFilter();
+        case kDrawLooper_PaintFlat:
+            return reader->readDrawLooper();
+        case kImageFilter_PaintFlat:
+            return reader->readImageFilter();
+        case kMaskFilter_PaintFlat:
+            return reader->readMaskFilter();
+        case kPathEffect_PaintFlat:
+            return reader->readPathEffect();
+        case kRasterizer_PaintFlat:
+            return reader->readRasterizer();
+        case kShader_PaintFlat:
+            return reader->readShader();
+        case kXfermode_PaintFlat:
+            return reader->readXfermode();
+        default:
+            SkDEBUGFAIL("never gets here");
+    }
+    return NULL;
+}
+
 template <typename T> class SkRefCntTDArray : public SkTDArray<T> {
 public:
     ~SkRefCntTDArray() { this->unrefAll(); }
 };
 
 class SkGPipeState : public SkBitmapHeapReader {
 public:
     SkGPipeState();
     ~SkGPipeState();
 
@@ skipping 26 matching lines @@
 
     SkFlattenable* getFlat(unsigned index) const {
         if (0 == index) {
             return NULL;
         }
         return fFlatArray[index - 1];
     }
 
     void defFlattenable(PaintFlats pf, int index) {
         index--;
-        SkFlattenable* obj = fReader->readFlattenable(paintflat_to_effecttype(pf));
+        SkFlattenable* obj = read_paintflat(fReader, pf);
         if (fFlatArray.count() == index) {
             *fFlatArray.append() = obj;
         } else {
             SkSafeUnref(fFlatArray[index]);
             fFlatArray[index] = obj;
         }
     }
 
     void defFactory(const char* name) {
         SkFlattenable::Factory factory = SkFlattenable::NameToFactory(name);
@@ skipping 750 matching lines @@
                 status = kReadAtom_Status;
                 break;
             }
     }
 
     if (bytesRead) {
         *bytesRead = reader.offset();
     }
     return status;
 }