Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "use std factory for compose-shader" into nyc-dev

Browse Source
This commit is contained in:
Leon Scroggins
2016-02-16 14:51:35 +00:00
committed by Android (Google) Code Review
parent 209fd91dae c3703a258d
commit 8e552f2eae
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/android/graphics/Shader.cpp
View File

@@ -1,5 +1,4 @@
#include "GraphicsJNI.h" #include "GraphicsJNI.h"
#include "SkComposeShader.h"
#include "SkGradientShader.h" #include "SkGradientShader.h"
#include "SkShader.h" #include "SkShader.h"
#include "SkXfermode.h" #include "SkXfermode.h"
@@ -232,7 +231,7 @@ static jlong ComposeShader_create1(JNIEnv* env, jobject o,
SkShader* shaderA = reinterpret_cast<SkShader *>(shaderAHandle); SkShader* shaderA = reinterpret_cast<SkShader *>(shaderAHandle);
SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle); SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle);
SkXfermode* mode = reinterpret_cast<SkXfermode *>(modeHandle); SkXfermode* mode = reinterpret_cast<SkXfermode *>(modeHandle);
SkShader* shader = new SkComposeShader(shaderA, shaderB, mode); SkShader* shader = SkShader::CreateComposeShader(shaderA, shaderB, mode);
return reinterpret_cast<jlong>(shader); return reinterpret_cast<jlong>(shader);
} }
@@ -243,7 +242,7 @@ static jlong ComposeShader_create2(JNIEnv* env, jobject o,
SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle); SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle);
SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(xfermodeHandle); SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(xfermodeHandle);
SkAutoTUnref<SkXfermode> xfermode(SkXfermode::Create(mode)); SkAutoTUnref<SkXfermode> xfermode(SkXfermode::Create(mode));
SkShader* shader = new SkComposeShader(shaderA, shaderB, xfermode.get()); SkShader* shader = SkShader::CreateComposeShader(shaderA, shaderB, xfermode.get());
return reinterpret_cast<jlong>(shader); return reinterpret_cast<jlong>(shader);
} }