Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / effects / GrTextureStripAtlas.cpp

diff --git a/src/third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp b/src/third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp
index 877215e..0aa9dc3 100644 (file)
--- a/src/third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp
+++ b/src/third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp
@@ -158,7 +158,7 @@ int GrTextureStripAtlas::lockRow(const SkBitmap& data) {
         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);