commit 5df91f58d3dd82d40d6748640dd3560cdaf5edc5
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 d2f2bf3fe2c5ee1443258e3b26dfd26e18fdb4b2
parent 59f33d9ea4e1ef8f32fa9db1d898b4b10ea1e51b

Reverted due to Chromium compilation failures. Please see:

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



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

core/SkFlattenableBuffers.cpp

diff --git a/core/SkFlattenableBuffers.cpp b/core/SkFlattenableBuffers.cpp
index 5167c2e..50a47d5 100644
--- a/core/SkFlattenableBuffers.cpp
+++ b/core/SkFlattenableBuffers.cpp
@@ -51,7 +51,6 @@
     paint.flatten(*this);
 }
 
-void SkFlattenableWriteBuffer::flattenObject(const SkFlattenable* obj,
-                                             SkFlattenableWriteBuffer& buffer) {
+void SkFlattenableWriteBuffer::flattenObject(SkFlattenable* obj, SkFlattenableWriteBuffer& buffer) {
     obj->flatten(buffer);
 }

core/SkOrderedWriteBuffer.cpp

diff --git a/core/SkOrderedWriteBuffer.cpp b/core/SkOrderedWriteBuffer.cpp
index 9c31b4c..64f5219 100644
--- a/core/SkOrderedWriteBuffer.cpp
+++ b/core/SkOrderedWriteBuffer.cpp
@@ -253,7 +253,7 @@
     }
 }
 
-void SkOrderedWriteBuffer::writeFlattenable(const SkFlattenable* flattenable) {
+void SkOrderedWriteBuffer::writeFlattenable(SkFlattenable* flattenable) {
     /*
      *  If we have a factoryset, then the first 32bits tell us...
      *       0: failure to write the flattenable

core/SkOrderedWriteBuffer.h

diff --git a/core/SkOrderedWriteBuffer.h b/core/SkOrderedWriteBuffer.h
index f3b414e..277b7bf 100644
--- a/core/SkOrderedWriteBuffer.h
+++ b/core/SkOrderedWriteBuffer.h
@@ -59,7 +59,7 @@
     virtual void writeEncodedString(const void* value, size_t byteLength,
                                     SkPaint::TextEncoding encoding) SK_OVERRIDE;
 
-    virtual void writeFlattenable(const SkFlattenable* flattenable) SK_OVERRIDE;
+    virtual void writeFlattenable(SkFlattenable* flattenable) SK_OVERRIDE;
     virtual void writeColor(const SkColor& color) SK_OVERRIDE;
     virtual void writeColorArray(const SkColor* color, uint32_t count) SK_OVERRIDE;
     virtual void writePoint(const SkPoint& point) SK_OVERRIDE;

effects/SkColorFilters.cpp

diff --git a/effects/SkColorFilters.cpp b/effects/SkColorFilters.cpp
index a821129..41a201e 100644
--- a/effects/SkColorFilters.cpp
+++ b/effects/SkColorFilters.cpp
@@ -498,7 +498,7 @@
 
     virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {}
 
-    virtual Factory getFactory() const {
+    virtual Factory getFactory() {
         return CreateProc;
     }
 

effects/SkDashPathEffect.cpp

diff --git a/effects/SkDashPathEffect.cpp b/effects/SkDashPathEffect.cpp
index 4aa46ab..be06591 100644
--- a/effects/SkDashPathEffect.cpp
+++ b/effects/SkDashPathEffect.cpp
@@ -528,7 +528,7 @@
     return true;
 }
 
-SkFlattenable::Factory SkDashPathEffect::getFactory() const {
+SkFlattenable::Factory SkDashPathEffect::getFactory() {
     return fInitialDashLength < 0 ? NULL : CreateProc;
 }