Revert of Revert[2] of "switch colorfilters to sk_sp (patchset #11 id:200001 of https://codereview.chromium.o…

src/core/SkReadBuffer.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkReadBuffer_DEFINED
 #define SkReadBuffer_DEFINED
 
@@ skipping 112 matching lines @@
     virtual void readRect(SkRect* rect);
     virtual void readRegion(SkRegion* region);
 
     virtual void readPath(SkPath* path);
     void readPaint(SkPaint* paint) { paint->unflatten(*this); }
 
     virtual SkFlattenable* readFlattenable(SkFlattenable::Type);
     template <typename T> T* readFlattenable() {
         return (T*) this->readFlattenable(T::GetFlattenableType());
     }
-    sk_sp<SkColorFilter> readColorFilter() {
-        return sk_sp<SkColorFilter>(this->readFlattenable<SkColorFilter>());
-    }
+    SkColorFilter* readColorFilter() { return this->readFlattenable<SkColorFilter>(); }
     sk_sp<SkDrawLooper> readDrawLooper() {
         return sk_sp<SkDrawLooper>(this->readFlattenable<SkDrawLooper>());
     }
     SkImageFilter* readImageFilter() { return this->readFlattenable<SkImageFilter>(); }
     SkMaskFilter*  readMaskFilter()  { return this->readFlattenable<SkMaskFilter>(); }
     sk_sp<SkPathEffect> readPathEffect()  {
         return sk_sp<SkPathEffect>(this->readFlattenable<SkPathEffect>());
     }
     sk_sp<SkRasterizer> readRasterizer() {
         return sk_sp<SkRasterizer>(this->readFlattenable<SkRasterizer>());
@@ skipping 103 matching lines @@
     SkPicture::InstallPixelRefProc fBitmapDecoder;
 
 #ifdef DEBUG_NON_DETERMINISTIC_ASSERT
     // Debugging counter to keep track of how many bitmaps we
     // have decoded.
     int fDecodedBitmapIndex;
 #endif // DEBUG_NON_DETERMINISTIC_ASSERT
 };
 
 #endif // SkReadBuffer_DEFINED