Remode dead code from SkReadBuffer

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 13 matching lines @@
 
 SkReadBuffer::SkReadBuffer() {
     fFlags = default_flags();
     fVersion = 0;
     fMemoryPtr = nullptr;
 
     fBitmapStorage = nullptr;
     fTFArray = nullptr;
     fTFCount = 0;
 
-    fFactoryTDArray = nullptr;
     fFactoryArray = nullptr;
     fFactoryCount = 0;
     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;
 
-    fFactoryTDArray = nullptr;
     fFactoryArray = nullptr;
     fFactoryCount = 0;
     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;
 
-    fFactoryTDArray = nullptr;
     fFactoryArray = nullptr;
     fFactoryCount = 0;
     fBitmapDecoder = nullptr;
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     fDecodedBitmapIndex = -1;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 }
 
 SkReadBuffer::~SkReadBuffer() {
     sk_free(fMemoryPtr);
@@ skipping 258 matching lines @@
         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);
             return nullptr;
         }
         factory = fFactoryArray[index];
-    } else if (fFactoryTDArray) {
-        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) {

[msarett, 2016/03/31 15:05:35]

AFAICT, fFactoryCount is always zero when fFactoryTDArray is non-NULL.  So this
case never works...

-            this->validate(false);
-            return nullptr;
-        }
-        factory = (*fFactoryTDArray)[index];
     } else {
         factory = (SkFlattenable::Factory)readFunctionPtr();
         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.
     SkFlattenable* obj = nullptr;
@@ skipping 16 matching lines @@
 
 /**
  *  Needs to follow the same pattern as readFlattenable(), but explicitly skip whatever data
  *  has been written.
  */
 void SkReadBuffer::skipFlattenable() {
     if (fFactoryCount > 0) {
         if (0 == fReader.readU32()) {
             return;
         }
-    } else if (fFactoryTDArray) {
-        if (0 == fReader.readU32()) {
-            return;
-        }
     } else {
         if (nullptr == this->readFunctionPtr()) {
             return;
         }
     }
     uint32_t sizeRecorded = fReader.readU32();
     fReader.skip(sizeRecorded);
 }