stop using deprecated bitmap::config for gpu

src/gpu/effects/GrTextureStripAtlas.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 "GrTextureStripAtlas.h"
 #include "SkPixelRef.h"
@@ skipping 140 matching lines @@
         fKeyTable.insert(index, 1, &row);
         rowNumber = static_cast<int>(row - fRows);
 
         SkAutoLockPixels lock(data);
 
         // Pass in the kDontFlush flag, since we know we're writing to a part of this texture
         // that is not currently in use
         fDesc.fContext->writeTexturePixels(fTexture,
                                            0,  rowNumber * fDesc.fRowHeight,
                                            fDesc.fWidth, fDesc.fRowHeight,
-                                           SkBitmapConfig2GrPixelConfig(data.config()),
+                                           SkImageInfo2GrPixelConfig(data.info()),
                                            data.getPixels(),
                                            data.rowBytes(),
                                            GrContext::kDontFlush_PixelOpsFlag);
     }
 
     SkASSERT(rowNumber >= 0);
     VALIDATE;
     return rowNumber;
 }
 
@@ skipping 167 matching lines @@
 
     // If we have locked rows, we should have a locked texture, otherwise
     // it should be unlocked
     if (fLockedRows == 0) {
         SkASSERT(NULL == fTexture);
     } else {
         SkASSERT(NULL != fTexture);
     }
 }
 #endif