From 54924243c1b65b3ee6d8fa064b50a9b1bb2a19a5 Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Thu, 29 Mar 2012 15:18:04 +0000 Subject: Cleanup code related to SkFlattenable::flatten() The following changes were made by this CL: 1. Make flatten() a protected method as callers should use SkFlattenableWriteBuffer to flatten an object 2. Make flatten a const method (including subclasses) 3. Mark subclass implementation of flatten with SK_OVERRIDE 4. Ensure overridden flatten impls call their parent 5. Remove no-op implementations of flatten from subclasses Additionally, if necessary the unflattening constructor was also moved to the protected section of the subclasses header if it was not already there. git-svn-id: http://skia.googlecode.com/svn/trunk@3540 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkColorMatrixFilter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/effects/SkColorMatrixFilter.cpp') diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 47ff8ad6ac..c6886250fa 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -310,7 +310,7 @@ void SkColorMatrixFilter::filterSpan16(const uint16_t src[], int count, /////////////////////////////////////////////////////////////////////////////// -void SkColorMatrixFilter::flatten(SkFlattenableWriteBuffer& buffer) { +void SkColorMatrixFilter::flatten(SkFlattenableWriteBuffer& buffer) const { this->INHERITED::flatten(buffer); buffer.writeFunctionPtr((void*)fProc); -- cgit v1.2.3