force readbuffer clients to use specialized readFoo for flattenables

src/core/SkData.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 "SkData.h"
 #include "SkFlattenableBuffers.h"
 #include "SkOSFile.h"
@@ skipping 302 matching lines @@
     if (fCount > 0) {
         fKeySize = buffer.getArrayCount();
         fPairs = allocatePairStorage(fCount, fKeySize);
         char* keyStorage = (char*)(fPairs + fCount);
 
         buffer.readByteArray(keyStorage);
 
         for (int i = 0; i < fCount; ++i) {
             fPairs[i].fKey = keyStorage;
             keyStorage += strlen(keyStorage) + 1;
-            fPairs[i].fValue = buffer.readFlattenableT<SkData>();
+            fPairs[i].fValue = buffer.readData();
         }
     } else {
         fKeySize = 0;
         fPairs = NULL;
     }
 }
 
 SkDataSet* SkDataSet::NewEmpty() {
     static SkDataSet* gEmptySet;
     if (NULL == gEmptySet) {
         gEmptySet = SkNEW_ARGS(SkDataSet, (NULL, 0));
     }
     gEmptySet->ref();
     return gEmptySet;
 }