commit c77392ed58ec78ab19fa0e3ff99fb8110854fba2
author reed <reed@google.com> Mon Jun 02 13:07:26 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 02 13:07:26 2014 -0700
tree 35917d403903038c3e266f20fd14886ac22d9c98
parent 80f709a0d7f2f1d0d35a292c0c3189d3a50b4993

use colortype instead of config

clone of https://codereview.chromium.org/305133006/

TBR=

BUG=skia:

Author: reed@google.com

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

src/effects/SkDisplacementMapEffect.cpp

diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index d0f134b..a5519d1 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -227,8 +227,7 @@
         return false;
     }
 
-    dst->setConfig(color.config(), bounds.width(), bounds.height());
-    if (!dst->allocPixels()) {
+    if (!dst->allocPixels(color.info().makeWH(bounds.width(), bounds.height()))) {
         return false;
     }