Remove unneccessary #isHardwareAccelerated (85308531) · Commits · e / os / android_frameworks_base

core/jni/android/graphics/Camera.cpp

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -96,10 +96,12 @@ static void Camera_getMatrix(JNIEnv* env, jobject obj, jlong matrixHandle) {
	}		}

	static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {		static void Camera_applyToCanvas(JNIEnv* env, jobject obj, jlong canvasHandle) {
	SkCanvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle)->asSkCanvas();		android::Canvas* canvas = reinterpret_cast<android::Canvas*>(canvasHandle);
	jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);		jlong viewHandle = env->GetLongField(obj, gNativeInstanceFieldID);
	Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);		Sk3DView* v = reinterpret_cast<Sk3DView*>(viewHandle);
	v->applyToCanvas(canvas);		SkMatrix matrix;
			v->getMatrix(&matrix);
			canvas->concat(matrix);
	}		}

	static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj,		static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj,

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,6 @@ package android.graphics;
	* {@link Canvas}.		* {@link Canvas}.
	*/		*/
	public class Camera {		public class Camera {
	private Matrix mMatrix;

	/**		/**
	* Creates a new camera, with empty transformations.		* Creates a new camera, with empty transformations.
	*/		*/
	@@ -149,14 +147,8 @@ public class Camera {
	* @param canvas The Canvas to set the transform matrix onto		* @param canvas The Canvas to set the transform matrix onto
	*/		*/
	public void applyToCanvas(Canvas canvas) {		public void applyToCanvas(Canvas canvas) {
	if (canvas.isHardwareAccelerated()) {
	if (mMatrix == null) mMatrix = new Matrix();
	getMatrix(mMatrix);
	canvas.concat(mMatrix);
	} else {
	nativeApplyToCanvas(canvas.getNativeCanvasWrapper());		nativeApplyToCanvas(canvas.getNativeCanvasWrapper());
	}		}
	}

	public native float dotWithNormal(float dx, float dy, float dz);		public native float dotWithNormal(float dx, float dy, float dz);