From 50b9307e96064637b10b6f070a807e320c45a005 Mon Sep 17 00:00:00 2001 From: halcanary Date: Mon, 5 Jan 2015 08:55:34 -0800 Subject: [PATCH] Correctly declare skiagm::DCShader to be not flattenable. Motivation: As part of my testing I serialize all of our GMs to SKP files. This was breaking my code. Review URL: https://codereview.chromium.org/832393002 --- gm/dcshader.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gm/dcshader.cpp b/gm/dcshader.cpp index 24d548d8d2..1871e4daab 100644 --- a/gm/dcshader.cpp +++ b/gm/dcshader.cpp @@ -25,7 +25,10 @@ class DCShader : public SkShader { public: DCShader(const SkMatrix& matrix) : fDeviceMatrix(matrix) {} - Factory getFactory() const SK_OVERRIDE { return NULL; } + // This is a custom shader, so we don't need to make it + // flattenable. Since this class is not part of the skia library, + // it wouldn't deserialize without linking this library anyway. + SK_DECLARE_NOT_FLATTENABLE_PROCS(DCShader) bool asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix& viewM, const SkMatrix* localMatrix, GrColor* color,