Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c2ab689 authored by Leon Scroggins's avatar Leon Scroggins Committed by android-build-merger
Browse files

Merge "use std factory for compose-shader" into nyc-dev am: 8e552f2e 

am: 78c931f4

* commit '78c931f4':
  use std factory for compose-shader
parents 902338cb 78c931f4

core/jni/android/graphics/Shader.cpp

+2 −3
Original line number Diff line number Diff line 
#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<SkShader *>(shaderAHandle);

    SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle);

    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);

}
@@ -243,7 +242,7 @@ static jlong ComposeShader_create2(JNIEnv* env, jobject o, 
    SkShader* shaderB = reinterpret_cast<SkShader *>(shaderBHandle);

    SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(xfermodeHandle);

    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);

}