commit bd5fa90dd12faf3aa5fe336907b71f9ad3bee7a6
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 15:19:56 2012 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Jul 31 15:19:56 2012 +0000
tree a1e5306cbe6e844ae1baf5f8f43b7dab2a91a8c3
parent 7b11289b4e4d117bbcee6d2460b057d0fcf6e437

add flattening



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

src/image/SkDataPixelRef.cpp

diff --git a/src/image/SkDataPixelRef.cpp b/src/image/SkDataPixelRef.cpp
index e02f0ec..0a69318 100644
--- a/src/image/SkDataPixelRef.cpp
+++ b/src/image/SkDataPixelRef.cpp
@@ -28,15 +28,13 @@
 
 void SkDataPixelRef::flatten(SkFlattenableWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
-
-//    fData->flatten(buffer);
+    buffer.writeFlattenable(fData);
 }
 
 SkDataPixelRef::SkDataPixelRef(SkFlattenableReadBuffer& buffer)
         : INHERITED(buffer, NULL) {
-
-//    fData = buffer.readData();
-            this->setPreLocked(const_cast<void*>(fData->data()), NULL);
+    fData = (SkData*)buffer.readFlattenable();
+    this->setPreLocked(const_cast<void*>(fData->data()), NULL);
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR(SkDataPixelRef)