add readPixels to SkSurface (later try to remove it from SkCanvas)

src/image/SkSurface.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkSurface_Base.h"
 #include "SkImagePriv.h"
 #include "SkCanvas.h"
@@ skipping 152 matching lines @@
 
 void SkSurface::draw(SkCanvas* canvas, SkScalar x, SkScalar y,
                      const SkPaint* paint) {
     return asSB(this)->onDraw(canvas, x, y, paint);
 }
 
 const void* SkSurface::peekPixels(SkImageInfo* info, size_t* rowBytes) {
     return this->getCanvas()->peekPixels(info, rowBytes);
 }
 
+bool SkSurface::readPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRowBytes,
+                           int srcX, int srcY) {
+    return this->getCanvas()->readPixels(dstInfo, dstPixels, dstRowBytes, srcX, srcY);
+}
+
+bool SkSurface::readPixels(SkBitmap* dst, const SkIRect* srcRect) {
+    SkIRect storage;
+    if (NULL == srcRect) {
+        storage.set(0, 0, this->width(), this->height());
+        srcRect = &storage;
+    }
+    return this->getCanvas()->readPixels(*srcRect, dst);
+}
+
 //////////////////////////////////////////////////////////////////////////////////////
 #ifdef SK_SUPPORT_LEGACY_TEXTRENDERMODE
 
 static SkSurfaceProps make_props(SkSurface::TextRenderMode trm) {
     uint32_t propsFlags = 0;
     if (SkSurface::kDistanceField_TextRenderMode == trm) {
         propsFlags |= SkSurfaceProps::kUseDistanceFieldFonts_Flag;
     }
     return SkSurfaceProps(propsFlags, SkSurfaceProps::kLegacyFontHost_InitType);
 }
@@ skipping 26 matching lines @@
 SkSurface* SkSurface::NewRenderTarget(GrContext*, const SkImageInfo&, int, const SkSurfaceProps*) {
     return NULL;
 }
 
 SkSurface* SkSurface::NewScratchRenderTarget(GrContext*, const SkImageInfo&, int sampleCount,
                                              const SkSurfaceProps*) {
     return NULL;
 }
 
 #endif