Add support for serializing/deserializing of SkDrawable

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 15 matching lines @@
     fFlags = default_flags();
     fVersion = 0;
     fMemoryPtr = nullptr;
 
     fBitmapStorage = nullptr;
     fTFArray = nullptr;
     fTFCount = 0;
 
     fFactoryArray = nullptr;
     fFactoryCount = 0;
+    fCustomFactory.reset(new SkTHashMap<SkFlattenable::Factory, SkFlattenable::Factory>());
     fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 }
 
 SkReadBuffer::SkReadBuffer(const void* data, size_t size) {
     fFlags = default_flags();
     fVersion = 0;
     fReader.setMemory(data, size);
     fMemoryPtr = nullptr;
 
     fBitmapStorage = nullptr;
     fTFArray = nullptr;
     fTFCount = 0;
 
     fFactoryArray = nullptr;
     fFactoryCount = 0;
+    fCustomFactory.reset(new SkTHashMap<SkFlattenable::Factory, SkFlattenable::Factory>());
     fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 }
 
 SkReadBuffer::SkReadBuffer(SkStream* stream) {
     fFlags = default_flags();
     fVersion = 0;
     const size_t length = stream->getLength();
     fMemoryPtr = sk_malloc_throw(length);
     stream->read(fMemoryPtr, length);
     fReader.setMemory(fMemoryPtr, length);
 
     fBitmapStorage = nullptr;
     fTFArray = nullptr;
     fTFCount = 0;
 
     fFactoryArray = nullptr;
     fFactoryCount = 0;
+    fCustomFactory.reset(new SkTHashMap<SkFlattenable::Factory, SkFlattenable::Factory>());
     fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 }
 
 SkReadBuffer::~SkReadBuffer() {
     sk_free(fMemoryPtr);
     SkSafeUnref(fBitmapStorage);
 }
@@ skipping 261 matching lines @@
         if ((unsigned)index >= (unsigned)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
         }
+
+        // Check if a custom Factory has been specified for this flattenable.
+        SkFlattenable::Factory* customFactoryPtr = getCustomFactory(factory);
+        if (customFactoryPtr) {
+            factory = *customFactoryPtr;
+        }
     }
 
     // if we get here, factory may still be null, but if that is the case, the
     // failure was ours, not the writer.
     SkFlattenable* obj = nullptr;
     uint32_t sizeRecorded = fReader.readU32();
     if (factory) {
         size_t offset = fReader.offset();
         obj = (*factory)(*this);
         // check that we read the amount we expected
@@ skipping 19 matching lines @@
             return;
         }
     } else {
         if (nullptr == this->readFunctionPtr()) {
             return;
         }
     }
     uint32_t sizeRecorded = fReader.readU32();
     fReader.skip(sizeRecorded);
 }