Revert of Delete SkFlattenable::Type

src/core/SkReadBuffer.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"
 #include "SkImage.h"
@@ skipping 311 matching lines @@
 
     uint32_t index = fReader.readU32();
     if (0 == index || index > (unsigned)fTFCount) {
         return nullptr;
     } else {
         SkASSERT(fTFArray);
         return fTFArray[index - 1];
     }
 }
 
-SkFlattenable* SkReadBuffer::readFlattenable() {
+SkFlattenable* SkReadBuffer::readFlattenable(SkFlattenable::Type ft) {
+    //
+    // TODO: confirm that ft matches the factory we decide to use
+    //
+
     SkFlattenable::Factory factory = nullptr;
 
     if (fFactoryCount > 0) {
         int32_t index = fReader.readU32();
         if (0 == index) {
             return nullptr; // writer failed to give us the flattenable
         }
         index -= 1;     // we stored the index-base-1
         if ((unsigned)index >= (unsigned)fFactoryCount) {
             this->validate(false);
@@ skipping 37 matching lines @@
             return;
         }
     } else {
         if (nullptr == this->readFunctionPtr()) {
             return;
         }
     }
     uint32_t sizeRecorded = fReader.readU32();
     fReader.skip(sizeRecorded);
 }