commit feeac8ed72091deb449d4844e1ad360ee1c24473
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Sun Oct 20 13:34:21 2013 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Sun Oct 20 13:34:21 2013 +0000
tree fb9946d3a549e0d7dff5e6056304da425a1de20a
parent 4a5fdae52b0d65d2e66b18bd6dff620352e13ca7

Reverted due to Chromium compilation failures. Please see:

https://codereview.chromium.org/30973002/



git-svn-id: http://skia.googlecode.com/svn/trunk/include@11871 2bbb7eff-a529-9590-31e7-b0007b416f81

core/SkFlattenable.h

diff --git a/core/SkFlattenable.h b/core/SkFlattenable.h
index 6cc76db..58e69fd 100644
--- a/core/SkFlattenable.h
+++ b/core/SkFlattenable.h
@@ -27,10 +27,10 @@
     }
 
 #define SK_DECLARE_UNFLATTENABLE_OBJECT() \
-    virtual Factory getFactory() const SK_OVERRIDE { return NULL; }
+    virtual Factory getFactory() SK_OVERRIDE { return NULL; }
 
 #define SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(flattenable) \
-    virtual Factory getFactory() const SK_OVERRIDE { return CreateProc; } \
+    virtual Factory getFactory() SK_OVERRIDE { return CreateProc; } \
     static SkFlattenable* CreateProc(SkFlattenableReadBuffer& buffer) { \
         return SkNEW_ARGS(flattenable, (buffer)); \
     }
@@ -53,7 +53,7 @@
      to recreate your class given a buffer (previously written to by your
      override of flatten().
      */
-    virtual Factory getFactory() const = 0;
+    virtual Factory getFactory() = 0;
 
     static Factory NameToFactory(const char name[]);
     static const char* FactoryToName(Factory);

core/SkFlattenableBuffers.h

diff --git a/core/SkFlattenableBuffers.h b/core/SkFlattenableBuffers.h
index d71f7c0..51016c7 100644
--- a/core/SkFlattenableBuffers.h
+++ b/core/SkFlattenableBuffers.h
@@ -182,7 +182,7 @@
                                     SkPaint::TextEncoding encoding) = 0;
 
     // common data structures
-    virtual void writeFlattenable(const SkFlattenable* flattenable) = 0;
+    virtual void writeFlattenable(SkFlattenable* flattenable) = 0;
     virtual void writeColor(const SkColor& color) = 0;
     virtual void writeColorArray(const SkColor* color, uint32_t count) = 0;
     virtual void writePoint(const SkPoint& point) = 0;
@@ -222,7 +222,7 @@
 
 protected:
     // A helper function so that each subclass does not have to be a friend of SkFlattenable
-    void flattenObject(const SkFlattenable* obj, SkFlattenableWriteBuffer& buffer);
+    void flattenObject(SkFlattenable* obj, SkFlattenableWriteBuffer& buffer);
 
     uint32_t fFlags;
 };

effects/SkDashPathEffect.h

diff --git a/effects/SkDashPathEffect.h b/effects/SkDashPathEffect.h
index 4e83f45..9c0775d 100644
--- a/effects/SkDashPathEffect.h
+++ b/effects/SkDashPathEffect.h
@@ -47,7 +47,7 @@
                           const SkStrokeRec&, const SkMatrix&,
                           const SkRect*) const SK_OVERRIDE;
 
-    virtual Factory getFactory() const SK_OVERRIDE;
+    virtual Factory getFactory() SK_OVERRIDE;
 
     static SkFlattenable* CreateProc(SkFlattenableReadBuffer&);