force readbuffer clients to use specialized readFoo for flattenables

tests/ColorFilterTest.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 "Test.h"
 #include "SkColor.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
 #include "SkLumaColorFilter.h"
 #include "SkRandom.h"
 #include "SkXfermode.h"
 #include "SkOrderedReadBuffer.h"
 #include "SkOrderedWriteBuffer.h"
 
-static SkFlattenable* reincarnate_flattenable(SkFlattenable* obj) {
+static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) {
     SkOrderedWriteBuffer wb(1024);
     wb.writeFlattenable(obj);
 
     size_t size = wb.size();
     SkAutoSMalloc<1024> storage(size);
     // make a copy into storage
     wb.writeToMemory(storage.get());
 
     SkOrderedReadBuffer rb(storage.get(), size);
-    return rb.readFlattenable();
-}
-
-template <typename T> T* reincarnate(T* obj) {
-    return (T*)reincarnate_flattenable(obj);
+    return rb.readColorFilter();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #define ILLEGAL_MODE    ((SkXfermode::Mode)-1)
 
 static void test_asColorMode(skiatest::Reporter* reporter) {
     SkRandom rand;
 
     for (int mode = 0; mode <= SkXfermode::kLastMode; mode++) {
@@ skipping 32 matching lines @@
                 expectedMode = SkXfermode::kSrc_Mode;
             }
         }
 
 //        SkDebugf("--- got [%d %x] expected [%d %x]\n", m, c, expectedMode, expectedColor);
 
         REPORTER_ASSERT(reporter, c == expectedColor);
         REPORTER_ASSERT(reporter, m == expectedMode);
 
         {
-            SkColorFilter* cf2 = reincarnate(cf);
+            SkColorFilter* cf2 = reincarnate_colorfilter(cf);
             SkAutoUnref aur2(cf2);
             REPORTER_ASSERT(reporter, cf2);
 
             SkColor c2 = ~color;
             SkXfermode::Mode m2 = ILLEGAL_MODE;
             REPORTER_ASSERT(reporter, cf2->asColorMode(&c2, &m2));
             REPORTER_ASSERT(reporter, c2 == expectedColor);
             REPORTER_ASSERT(reporter, m2 == expectedMode);
         }
     }
@@ skipping 30 matching lines @@
         REPORTER_ASSERT(reporter, SkGetPackedA32(out) <= i);
         REPORTER_ASSERT(reporter, SkGetPackedR32(out) == 0);
         REPORTER_ASSERT(reporter, SkGetPackedG32(out) == 0);
         REPORTER_ASSERT(reporter, SkGetPackedB32(out) == 0);
     }
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("ColorFilter", ColorFilterTestClass, test_asColorMode)
 DEFINE_TESTCLASS("LumaColorFilter", LumaColorFilterTestClass, test_lumaColorFilter)