Revert of eliminate config param -- it was always self's config

src/gpu/SkGrPixelRef.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 33 matching lines @@
 void SkROLockPixelsPixelRef::onUnlockPixels() {
     fBitmap.unlockPixels();
 }
 
 bool SkROLockPixelsPixelRef::onLockPixelsAreWritable() const {
     return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-static SkGrPixelRef* copyToTexturePixelRef(GrTexture* texture, const SkIRect* subset) {
+static SkGrPixelRef* copyToTexturePixelRef(GrTexture* texture, SkBitmap::Config dstConfig,
+                                           const SkIRect* subset) {
     if (NULL == texture) {
         return NULL;
     }
     GrContext* context = texture->getContext();
     if (NULL == context) {
         return NULL;
     }
     GrTextureDesc desc;
 
     SkIPoint pointStorage;
     SkIPoint* topLeft;
     if (subset != NULL) {
         SkASSERT(SkIRect::MakeWH(texture->width(), texture->height()).contains(*subset));
         // Create a new texture that is the size of subset.
         desc.fWidth = subset->width();
         desc.fHeight = subset->height();
         pointStorage.set(subset->x(), subset->y());
         topLeft = &pointStorage;
     } else {
         desc.fWidth  = texture->width();
         desc.fHeight = texture->height();
         topLeft = NULL;
     }
     desc.fFlags = kRenderTarget_GrTextureFlagBit | kNoStencil_GrTextureFlagBit;
-    desc.fConfig = texture->config();
+    desc.fConfig = SkBitmapConfig2GrPixelConfig(dstConfig);
 
     SkImageInfo info;
     if (!GrPixelConfig2ColorType(desc.fConfig, &info.fColorType)) {
         return NULL;
     }
     info.fWidth = desc.fWidth;
     info.fHeight = desc.fHeight;
     info.fAlphaType = kPremul_SkAlphaType;
 
     GrTexture* dst = context->createUncachedTexture(desc, NULL, 0);
@@ skipping 54 matching lines @@
     SkSafeUnref(fSurface);
 }
 
 GrTexture* SkGrPixelRef::getTexture() {
     if (NULL != fSurface) {
         return fSurface->asTexture();
     }
     return NULL;
 }
 
-SkPixelRef* SkGrPixelRef::deepCopy(const SkIRect* subset) {
+SkPixelRef* SkGrPixelRef::deepCopy(SkBitmap::Config dstConfig, const SkIRect* subset) {
     if (NULL == fSurface) {
         return NULL;
     }
 
     // Note that when copying a render-target-backed pixel ref, we
     // return a texture-backed pixel ref instead.  This is because
     // render-target pixel refs are usually created in conjunction with
     // a GrTexture owned elsewhere (e.g., SkGpuDevice), and cannot live
     // independently of that texture.  Texture-backed pixel refs, on the other
     // hand, own their GrTextures, and are thus self-contained.
-    return copyToTexturePixelRef(fSurface->asTexture(), subset);
+    return copyToTexturePixelRef(fSurface->asTexture(), dstConfig, subset);
 }
 
 bool SkGrPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
     if (NULL == fSurface || !fSurface->isValid()) {
         return false;
     }
 
     int left, top, width, height;
     if (NULL != subset) {
         left = subset->fLeft;
         width = subset->width();
         top = subset->fTop;
         height = subset->height();
     } else {
         left = 0;
         width = this->info().fWidth;
         top = 0;
         height = this->info().fHeight;
     }
     if (!dst->allocPixels(SkImageInfo::MakeN32Premul(width, height))) {
         SkDebugf("SkGrPixelRef::onReadPixels failed to alloc bitmap for result!\n");
         return false;
     }
     SkAutoLockPixels al(*dst);
     void* buffer = dst->getPixels();
     return fSurface->readPixels(left, top, width, height,
                                 kSkia8888_GrPixelConfig,
                                 buffer, dst->rowBytes());
 }