Delete unused fNamedFactorySet from SkWriteBuffer

src/core/SkWriteBuffer.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 "SkWriteBuffer.h"
 #include "SkBitmap.h"
 #include "SkBitmapHeap.h"
 #include "SkData.h"
 #include "SkPixelRef.h"
 #include "SkPtrRecorder.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 
 SkWriteBuffer::SkWriteBuffer(uint32_t flags)
     : fFlags(flags)
     , fFactorySet(nullptr)
-    , fNamedFactorySet(nullptr)
     , fBitmapHeap(nullptr)
     , fTFSet(nullptr) {
 }
 
 SkWriteBuffer::SkWriteBuffer(void* storage, size_t storageSize, uint32_t flags)
     : fFlags(flags)
     , fFactorySet(nullptr)
-    , fNamedFactorySet(nullptr)
     , fWriter(storage, storageSize)
     , fBitmapHeap(nullptr)
     , fTFSet(nullptr) {
 }
 
 SkWriteBuffer::~SkWriteBuffer() {
     SkSafeUnref(fFactorySet);
-    SkSafeUnref(fNamedFactorySet);
     SkSafeUnref(fBitmapHeap);
     SkSafeUnref(fTFSet);
 }
 
 void SkWriteBuffer::writeByteArray(const void* data, size_t size) {
     fWriter.write32(SkToU32(size));
     fWriter.writePad(data, size);
 }
 
 void SkWriteBuffer::writeBool(bool value) {
@@ skipping 179 matching lines @@
 void SkWriteBuffer::writeTypeface(SkTypeface* obj) {
     if (nullptr == obj || nullptr == fTFSet) {
         fWriter.write32(0);
     } else {
         fWriter.write32(fTFSet->add(obj));
     }
 }
 
 SkFactorySet* SkWriteBuffer::setFactoryRecorder(SkFactorySet* rec) {
     SkRefCnt_SafeAssign(fFactorySet, rec);
-    if (fNamedFactorySet != nullptr) {
-        fNamedFactorySet->unref();
-        fNamedFactorySet = nullptr;
-    }
     return rec;
 }
 
-SkNamedFactorySet* SkWriteBuffer::setNamedFactoryRecorder(SkNamedFactorySet* rec) {
-    SkRefCnt_SafeAssign(fNamedFactorySet, rec);
-    if (fFactorySet != nullptr) {
-        fFactorySet->unref();
-        fFactorySet = nullptr;
-    }
-    return rec;
-}
-
 SkRefCntSet* SkWriteBuffer::setTypefaceRecorder(SkRefCntSet* rec) {
     SkRefCnt_SafeAssign(fTFSet, rec);
     return rec;
 }
 
 void SkWriteBuffer::setBitmapHeap(SkBitmapHeap* bitmapHeap) {
     SkRefCnt_SafeAssign(fBitmapHeap, bitmapHeap);
     if (bitmapHeap != nullptr) {
         SkASSERT(nullptr == fPixelSerializer);
         fPixelSerializer.reset(nullptr);
@@ skipping 17 matching lines @@
      *      >0: (1-based) index into the SkFactorySet or SkNamedFactorySet
      *  If we don't have a factoryset, then the first "ptr" is either the
      *  factory, or null for failure.
      *
      *  The distinction is important, since 0-index is 32bits (always), but a
      *  0-functionptr might be 32 or 64 bits.
      */
     if (nullptr == flattenable) {
         if (this->isValidating()) {
             this->writeString("");
-        } else if (fFactorySet != nullptr || fNamedFactorySet != nullptr) {
+        } else if (fFactorySet != nullptr) {
             this->write32(0);
         } else {
             this->writeFunctionPtr(nullptr);
         }
         return;
     }
 
     SkFlattenable::Factory factory = flattenable->getFactory();
     SkASSERT(factory != nullptr);
 
     /*
      *  We can write 1 of 3 versions of the flattenable:
      *  1.  function-ptr : this is the fastest for the reader, but assumes that
      *      the writer and reader are in the same process.
      *  2.  index into fFactorySet : This is assumes the writer will later
      *      resolve the function-ptrs into strings for its reader. SkPicture
      *      does exactly this, by writing a table of names (matching the indices)
      *      up front in its serialized form.
      *  3.  index into fNamedFactorySet. fNamedFactorySet will also store the
      *      name. SkGPipe uses this technique so it can write the name to its
      *      stream before writing the flattenable.
      */
     if (this->isValidating()) {
         this->writeString(flattenable->getTypeName());
     } else if (fFactorySet) {
         this->write32(fFactorySet->add(factory));
-    } else if (fNamedFactorySet) {
-        int32_t index = fNamedFactorySet->find(factory);
-        this->write32(index);
-        if (0 == index) {
-            return;
-        }
     } else {
         this->writeFunctionPtr((void*)factory);
     }
 
     // make room for the size of the flattened object
     (void)fWriter.reserve(sizeof(uint32_t));
     // record the current size, so we can subtract after the object writes.
     size_t offset = fWriter.bytesWritten();
     // now flatten the object
     flattenable->flatten(*this);
     size_t objSize = fWriter.bytesWritten() - offset;
     // record the obj's size
     fWriter.overwriteTAt(offset - sizeof(uint32_t), SkToU32(objSize));
 }