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

2 files changed, 2 insertions, 4 deletions

diff --git a/include/images/SkFlipPixelRef.h b/include/images/SkFlipPixelRef.h
index c9ba026878..3d5c097077 100644
--- a/include/images/SkFlipPixelRef.h
+++ b/include/images/SkFlipPixelRef.h
@@ -33,7 +33,6 @@ public:
     const SkRegion& beginUpdate(SkBitmap* device);
     void endUpdate();
 
-    virtual void flatten(SkFlattenableWriteBuffer&);
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkFlipPixelRef)
 
 protected:
@@ -41,6 +40,7 @@ protected:
     virtual void onUnlockPixels();
 
     SkFlipPixelRef(SkFlattenableReadBuffer&);
+    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
     
 private:
     void getFrontBack(const void** front, void** back) const {
diff --git a/include/images/SkImageRef.h b/include/images/SkImageRef.h
index 8fc4754e92..bec3527acc 100644
--- a/include/images/SkImageRef.h
+++ b/include/images/SkImageRef.h
@@ -60,9 +60,6 @@ public:
     // returns the factory parameter
     SkImageDecoderFactory* setDecoderFactory(SkImageDecoderFactory*);
 
-    // overrides
-    virtual void flatten(SkFlattenableWriteBuffer&);
-
 protected:
     /** Override if you want to install a custom allocator.
         When this is called we will have already acquired the mutex!
@@ -79,6 +76,7 @@ protected:
     virtual void onUnlockPixels();
     
     SkImageRef(SkFlattenableReadBuffer&);
+    virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
     SkBitmap fBitmap;