Revert of add peekPixels to SkCanvas and SkSurface

include/core/SkDevice.h

Index: include/core/SkDevice.h
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index e3a23be6cab1c648fe98e0ca96db7457da6081a7..016e2babc88d9048255a9f90174e4a159f0bee9c 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -75,12 +75,6 @@
         //Currently, all the properties are leaky.
         return fLeakyProperties;
     }
-
-    /**
-     *  Return ImageInfo for this device. If the canvas is not backed by pixels
-     *  (cpu or gpu), then the info's ColorType will be kUnknown_SkColorType.
-     */
-    virtual SkImageInfo imageInfo() const;
 
     /**
      *  Return the bounds of the device in the coordinate space of the root
@@ -375,10 +369,7 @@
 protected:
     // default impl returns NULL
     virtual SkSurface* newSurface(const SkImageInfo&);
-    
-    // default impl returns NULL
-    virtual const void* peekPixels(SkImageInfo*, size_t* rowBytes);
-    
+
     /**
      *  Leaky properties are those which the device should be applying but it isn't.
      *  These properties will be applied by the draw, when and as it can.