Upstream version 7.36.149.0

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

diff --git a/src/third_party/skia/src/effects/SkDisplacementMapEffect.cpp b/src/third_party/skia/src/effects/SkDisplacementMapEffect.cpp
index 0200cab..3922244 100644 (file)
--- a/src/third_party/skia/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/third_party/skia/src/effects/SkDisplacementMapEffect.cpp
@@ -205,8 +205,8 @@ bool SkDisplacementMapEffect::onFilterImage(Proxy* proxy,
         (displInput && !displInput->filterImage(proxy, src, ctx, &displ, &displOffset))) {
         return false;
     }
-    if ((displ.colorType() != kPMColor_SkColorType) ||
-        (color.colorType() != kPMColor_SkColorType)) {
+    if ((displ.colorType() != kN32_SkColorType) ||
+        (color.colorType() != kN32_SkColorType)) {
         return false;
     }
     SkIRect bounds;