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

Commit cdf2564d authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Separate Canvas JNI code from the implementation. DO NOT MERGE" into lmp-dev

parents e3ec9da3 f5d6c555

core/jni/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -90,12 +90,12 @@ LOCAL_SRC_FILES:= \ 
	android_util_Process.cpp \

	android_util_StringBlock.cpp \

	android_util_XmlBlock.cpp \

	android_graphics_Canvas.cpp \

	android_graphics_Picture.cpp \

	android/graphics/AutoDecodeCancel.cpp \

	android/graphics/Bitmap.cpp \

	android/graphics/BitmapFactory.cpp \

	android/graphics/Camera.cpp \

	android/graphics/Canvas.cpp \

	android/graphics/CanvasProperty.cpp \

	android/graphics/ColorFilter.cpp \

	android/graphics/DrawFilter.cpp \
@@ -122,6 +122,7 @@ LOCAL_SRC_FILES:= \ 
	android/graphics/Rasterizer.cpp \

	android/graphics/Region.cpp \

	android/graphics/Shader.cpp \

	android/graphics/SkiaCanvas.cpp \

	android/graphics/SurfaceTexture.cpp \

	android/graphics/Typeface.cpp \

	android/graphics/TypefaceImpl.cpp \

core/jni/android/graphics/Camera.cpp

+3 −2
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 


#include "SkCamera.h"



#include "Canvas.h"

#include "GraphicsJNI.h"



static jfieldID gNativeInstanceFieldID;
@@ -95,10 +96,10 @@ static void Camera_getMatrix(JNIEnv* env, jobject obj, jlong matrixHandle) { 
}



static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {

    SkCanvas* native_canvas = GraphicsJNI::getNativeCanvas(canvasHandle);

    SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->getSkCanvas();

    jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);

    Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);

    v->applyToCanvas((SkCanvas*)native_canvas);

    v->applyToCanvas(canvas);

}



static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj,