Upstream version 7.36.149.0

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

diff --git a/src/third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp b/src/third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp
index daf5141..f33ad23 100644 (file)
--- a/src/third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -61,7 +61,7 @@ public:
                         outputColor, outputColor, outputColor, swiz, outputColor, outputColor);
                     break;
                 default:
-                    GrCrash("Unknown conversion op.");
+                    SkFAIL("Unknown conversion op.");
                     break;
             }
         }
@@ -154,9 +154,9 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
         for (int x = 0; x < 256; ++x) {
             uint8_t* color = reinterpret_cast<uint8_t*>(&srcData[256*y + x]);
             color[3] = y;
-            color[2] = GrMin(x, y);
-            color[1] = GrMin(x, y);
-            color[0] = GrMin(x, y);
+            color[2] = SkTMin(x, y);
+            color[1] = SkTMin(x, y);
+            color[0] = SkTMin(x, y);
         }
     }
 
@@ -190,7 +190,7 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
 
     bool failed = true;
 
-    for (size_t i = 0; i < GR_ARRAY_COUNT(kConversionRules) && failed; ++i) {
+    for (size_t i = 0; i < SK_ARRAY_COUNT(kConversionRules) && failed; ++i) {
         *pmToUPMRule = kConversionRules[i][0];
         *upmToPMRule = kConversionRules[i][1];