commit fa9e5fa42a555712fb7a29d08d2ae2bdef0ed68e
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 13 22:00:04 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 13 22:00:04 2014 +0000
tree 3b697b22d1fa371f6e1a0420cc19f5c093aa9fa0
parent a7692a9ac6cb8a0bbe6bbdfc83f86014a7dc265e

replace setConfig+allocPixels with alloc-or-install-pixels

BUG=skia:
R=scroggo@google.com, halcanary@google.com, reed@google.com

Author: reed@chromium.org

Review URL: https://codereview.chromium.org/164203003

git-svn-id: http://skia.googlecode.com/svn/trunk@13442 2bbb7eff-a529-9590-31e7-b0007b416f81

tests/AAClipTest.cpp

diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index 961d57a..cadd180 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -71,10 +71,12 @@
     mask->fImage = SkMask::AllocImage(mask->computeImageSize());
     sk_bzero(mask->fImage, mask->computeImageSize());
 
+    SkImageInfo info = SkImageInfo::Make(mask->fBounds.width(),
+                                         mask->fBounds.height(),
+                                         kAlpha_8_SkColorType,
+                                         kPremul_SkAlphaType);
     SkBitmap bitmap;
-    bitmap.setConfig(SkBitmap::kA8_Config, mask->fBounds.width(),
-                     mask->fBounds.height(), mask->fRowBytes);
-    bitmap.setPixels(mask->fImage);
+    bitmap.installPixels(info, mask->fImage, mask->fRowBytes, NULL, NULL);
 
     // canvas expects its coordinate system to always be 0,0 in the top/left
     // so we translate the rgn to match that before drawing into the mask.