Upstream version 10.38.222.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / gl / GrGLVertexEffect.h

diff --git a/src/third_party/skia/src/gpu/gl/GrGLVertexEffect.h b/src/third_party/skia/src/gpu/gl/GrGLVertexEffect.h
index 1b4c744..eba1fbe 100644 (file)
--- a/src/third_party/skia/src/gpu/gl/GrGLVertexEffect.h
+++ b/src/third_party/skia/src/gpu/gl/GrGLVertexEffect.h
@@ -26,7 +26,7 @@ public:
      */
     virtual void emitCode(GrGLFullShaderBuilder* builder,
                           const GrDrawEffect& drawEffect,
-                          EffectKey key,
+                          const GrEffectKey& key,
                           const char* outputColor,
                           const char* inputColor,
                           const TransformedCoordsArray& coords,
@@ -37,12 +37,12 @@ public:
      */
     virtual void emitCode(GrGLShaderBuilder* builder,
                           const GrDrawEffect& drawEffect,
-                          EffectKey key,
+                          const GrEffectKey& key,
                           const char* outputColor,
                           const char* inputColor,
                           const TransformedCoordsArray& coords,
                           const TextureSamplerArray& samplers) SK_OVERRIDE {
-        GrCrash("GrGLVertexEffect requires GrGLFullShaderBuilder* overload for emitCode().");
+        SkFAIL("GrGLVertexEffect requires GrGLFullShaderBuilder* overload for emitCode().");
     }
 
 private: