Enable flattening/unflattening with custom unflatten procs

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 314 matching lines @@
     }
 }
 
 SkFlattenable* SkReadBuffer::readFlattenable(SkFlattenable::Type ft) {
     //
     // TODO: confirm that ft matches the factory we decide to use
     //
 
     SkFlattenable::Factory factory = nullptr;
 
+    uint32_t index = fReader.readU32();
+    if (0 == index) {
+        return nullptr; // writer failed to give us the flattenable
+    }
+
     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) {
+        if (index >= (uint32_t) fFactoryCount) {
             this->validate(false);
             return nullptr;
         }
         factory = fFactoryArray[index];
     } else {
-        factory = (SkFlattenable::Factory)readFunctionPtr();
-        if (nullptr == factory) {
-            return nullptr; // writer failed to give us the flattenable
+        SkString name;
+        SkString* namePtr = fFlattenableDict.find(index);
+        if (namePtr) {
+            // Assume we have already seen this name and saved it to the dict.
+            name = *namePtr;
+        } else {
+            // The string must be passed after the index.
+            this->readString(&name);
+
+            // Add the string to the dictionary.
+            fFlattenableDict.set(index, name);
+        }
+
+        // Check if a custom Factory has been specified for this flattenable.
+        factory = getCustomFactory(name);

[mtklein, 2016/04/19 18:14:55]

this->

[msarett, 2016/04/19 18:55:51]

Done.

+        if (!factory) {
+            // If there is no custom Factory, check for a default.
+            factory = SkFlattenable::NameToFactory(name.c_str());
+            if (!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 = fReader.readU32();
     if (factory) {
         size_t offset = fReader.offset();
         obj = (*factory)(*this);
@@ skipping 20 matching lines @@
             return;
         }
     } else {
         if (nullptr == this->readFunctionPtr()) {
             return;
         }
     }
     uint32_t sizeRecorded = fReader.readU32();
     fReader.skip(sizeRecorded);
 }