Reverting r12665 & r12666 (Remove duplicate impl for SkImageInfo flattening) due to Chromium/Blink …

src/image/SkDataPixelRef.h

Index: src/image/SkDataPixelRef.h
===================================================================
--- src/image/SkDataPixelRef.h	(revision 12666)
+++ src/image/SkDataPixelRef.h	(working copy)
@@ -14,13 +14,13 @@
 
 class SkDataPixelRef : public SkPixelRef {
 public:
-            SkDataPixelRef(const SkImageInfo&, SkData* data, size_t rowBytes);
+            SkDataPixelRef(SkData* data);
     virtual ~SkDataPixelRef();
 
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkDataPixelRef)
 
 protected:
-    virtual bool onNewLockPixels(LockRec*) SK_OVERRIDE;
+    virtual void* onLockPixels(SkColorTable**) SK_OVERRIDE;
     virtual void onUnlockPixels() SK_OVERRIDE;
     virtual size_t getAllocatedSizeInBytes() const SK_OVERRIDE;
 
@@ -28,8 +28,7 @@
     virtual void flatten(SkFlattenableWriteBuffer&) const SK_OVERRIDE;
 
 private:
-    SkData*     fData;
-    size_t      fRB;
+    SkData* fData;
 
     typedef SkPixelRef INHERITED;
 };