Revert of Delete SkFlattenable::Type

src/core/SkValidatingReadBuffer.cpp

 /*
  * Copyright 2013 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 "SkValidatingReadBuffer.h"
@@ skipping 204 matching lines @@
 SkTypeface* SkValidatingReadBuffer::readTypeface() {
     SkASSERT(false);
     // TODO: Implement this (securely) when needed
     return nullptr;
 }
 
 bool SkValidatingReadBuffer::validateAvailable(size_t size) {
     return this->validate((size <= SK_MaxU32) && fReader.isAvailable(static_cast<uint32_t>(size)));
 }
 
-SkFlattenable* SkValidatingReadBuffer::readFlattenable() {
+SkFlattenable* SkValidatingReadBuffer::readFlattenable(SkFlattenable::Type type) {
     SkString name;
     this->readString(&name);
     if (fError) {
         return nullptr;
     }
 
+    // Is this the type we wanted ?
     const char* cname = name.c_str();
+    SkFlattenable::Type baseType;
+    if (!SkFlattenable::NameToType(cname, &baseType) || (baseType != type)) {
+        return nullptr;
+    }
+
     SkFlattenable::Factory factory = SkFlattenable::NameToFactory(cname);
     if (nullptr == factory) {
         return nullptr; // writer failed to give us the flattenable
     }
 
     // if we get here, factory may still be null, but if that is the case, the
     // failure was ours, not the writer.
     sk_sp<SkFlattenable> obj;
     uint32_t sizeRecorded = this->readUInt();
     if (factory) {
@@ skipping 15 matching lines @@
 
 void SkValidatingReadBuffer::skipFlattenable() {
     SkString name;
     this->readString(&name);
     if (fError) {
         return;
     }
     uint32_t sizeRecorded = this->readUInt();
     this->skip(sizeRecorded);
 }