change readTypeface to return sk_sp

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 192 matching lines @@
 bool SkValidatingReadBuffer::readScalarArray(SkScalar* values, size_t size) {
     return readArray(values, size, sizeof(SkScalar));
 }
 
 uint32_t SkValidatingReadBuffer::getArrayCount() {
     const size_t inc = sizeof(uint32_t);
     fError = fError || !IsPtrAlign4(fReader.peek()) || !fReader.isAvailable(inc);
     return fError ? 0 : *(uint32_t*)fReader.peek();
 }
 
-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::Type type) {
     // The validating read buffer always uses strings and string-indices for unflattening.
     SkASSERT(0 == this->factoryCount());
 
     uint8_t firstByte = this->peekByte();
     if (fError) {
@@ skipping 47 matching lines @@
     size_t offset = fReader.offset();
     obj = (*factory)(*this);
     // check that we read the amount we expected
     size_t sizeRead = fReader.offset() - offset;
     this->validate(sizeRecorded == sizeRead);
     if (fError) {
         obj = nullptr;
     }
     return obj.release();
 }