From c3703a258d67f14c84194ab443b9a34d9107e792 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 12 Feb 2016 08:26:24 -0500 Subject: [PATCH] use std factory for compose-shader Change-Id: I4562d66cb8b9b8237e6aae7c205228731732cf17 --- core/jni/android/graphics/Shader.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/core/jni/android/graphics/Shader.cpp b/core/jni/android/graphics/Shader.cpp index 2507e4ddea7e3..de32dd92c6e45 100644 --- a/core/jni/android/graphics/Shader.cpp +++ b/core/jni/android/graphics/Shader.cpp @@ -1,5 +1,4 @@ #include "GraphicsJNI.h" -#include "SkComposeShader.h" #include "SkGradientShader.h" #include "SkShader.h" #include "SkXfermode.h" @@ -232,7 +231,7 @@ static jlong ComposeShader_create1(JNIEnv* env, jobject o, SkShader* shaderA = reinterpret_cast(shaderAHandle); SkShader* shaderB = reinterpret_cast(shaderBHandle); SkXfermode* mode = reinterpret_cast(modeHandle); - SkShader* shader = new SkComposeShader(shaderA, shaderB, mode); + SkShader* shader = SkShader::CreateComposeShader(shaderA, shaderB, mode); return reinterpret_cast(shader); } @@ -243,7 +242,7 @@ static jlong ComposeShader_create2(JNIEnv* env, jobject o, SkShader* shaderB = reinterpret_cast(shaderBHandle); SkXfermode::Mode mode = static_cast(xfermodeHandle); SkAutoTUnref xfermode(SkXfermode::Create(mode)); - SkShader* shader = new SkComposeShader(shaderA, shaderB, xfermode.get()); + SkShader* shader = SkShader::CreateComposeShader(shaderA, shaderB, xfermode.get()); return reinterpret_cast(shader); }