Simplify flattening to just write enough to call the factory

src/core/SkFilterShader.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 "SkFilterShader.h"
 
 #include "SkColorFilter.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkShader.h"
 #include "SkString.h"
 
 SkFilterShader::SkFilterShader(SkShader* shader, SkColorFilter* filter) {
     fShader = shader;
     shader->ref();
 
     fFilter = filter;
     filter->ref();
 }
 
-SkFilterShader::SkFilterShader(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
+#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
+SkFilterShader::SkFilterShader(SkReadBuffer& buffer) : INHERITED(buffer) {
     fShader = buffer.readShader();
     fFilter = buffer.readColorFilter();
 }
+#endif
 
 SkFilterShader::~SkFilterShader() {
     fFilter->unref();
     fShader->unref();

[sugoi1, 2014/08/19 18:46:16]

I'm surprised these never crashed on a read error in the constructor. Maybe
these aren't exercised by the fuzzer.

 }
 
+SkFlattenable* SkFilterShader::CreateProc(SkReadBuffer& buffer) {
+    SkAutoTUnref<SkShader> shader(buffer.readShader());
+    SkAutoTUnref<SkColorFilter> filter(buffer.readColorFilter());
+    if (!shader.get() || !filter.get()) {
+        return NULL;
+    }
+    return SkNEW_ARGS(SkFilterShader, (shader, filter));
+}
+
 void SkFilterShader::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
     buffer.writeFlattenable(fShader);
     buffer.writeFlattenable(fFilter);
 }
 
 uint32_t SkFilterShader::FilterShaderContext::getFlags() const {
     const SkFilterShader& filterShader = static_cast<const SkFilterShader&>(fShader);
 
     uint32_t shaderF = fShaderContext->getFlags();
     uint32_t filterF = filterShader.fFilter->getFlags();
 
@@ skipping 55 matching lines @@
     str->append("Shader: ");
     fShader->toString(str);
     str->append(" Filter: ");
     // TODO: add "fFilter->toString(str);" once SkColorFilter::toString is added
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif