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

Commit 580ff814 authored by John Reck's avatar John Reck
Browse files

Revert "Separate Canvas JNI code from the implementation." 

This reverts commit e28a5afee885cd69a5be5809f88116b601cb1a72.

 Appears to cause memory corruption and random appearances of
 chinese

 Bug: 16343240
 Bug: 16336642

Change-Id: Ife169181f40adff4b12948ed5f9d3a88dcec935b
parent 4fc90de5

core/jni/Android.mk

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

	android_util_Process.cpp \

	android_util_StringBlock.cpp \

	android_util_StringBlock.cpp \

	android_util_XmlBlock.cpp \

	android_util_XmlBlock.cpp \

	android_graphics_Canvas.cpp \

	android_graphics_Picture.cpp \

	android_graphics_Picture.cpp \

	android/graphics/AutoDecodeCancel.cpp \

	android/graphics/AutoDecodeCancel.cpp \

	android/graphics/Bitmap.cpp \

	android/graphics/Bitmap.cpp \

	android/graphics/BitmapFactory.cpp \

	android/graphics/BitmapFactory.cpp \

	android/graphics/Camera.cpp \

	android/graphics/Camera.cpp \

	android/graphics/Canvas.cpp \

	android/graphics/CanvasProperty.cpp \

	android/graphics/CanvasProperty.cpp \

	android/graphics/ColorFilter.cpp \

	android/graphics/ColorFilter.cpp \

	android/graphics/DrawFilter.cpp \

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

	android/graphics/Rasterizer.cpp \

	android/graphics/Region.cpp \

	android/graphics/Region.cpp \

	android/graphics/Shader.cpp \

	android/graphics/Shader.cpp \

	android/graphics/SkiaCanvas.cpp \

	android/graphics/SurfaceTexture.cpp \

	android/graphics/SurfaceTexture.cpp \

	android/graphics/Typeface.cpp \

	android/graphics/Typeface.cpp \

	android/graphics/TypefaceImpl.cpp \

	android/graphics/TypefaceImpl.cpp \

core/jni/android/graphics/Camera.cpp

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




#include "SkCamera.h"

#include "SkCamera.h"





#include "Canvas.h"

#include "GraphicsJNI.h"

#include "GraphicsJNI.h"





static jfieldID gNativeInstanceFieldID;

static jfieldID gNativeInstanceFieldID;
@@ -96,10 +95,10 @@ 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)->getSkCanvas();

    SkCanvas* native_canvas = GraphicsJNI::getNativeCanvas(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);

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

}

}





static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj,

static jfloat Camera_dotWithNormal(JNIEnv* env, jobject obj,

core/jni/android/graphics/Canvas.cpp

0 → 100644
+1330 −0

File added.

Preview size limit exceeded, changes collapsed.

core/jni/android/graphics/Canvas.h

deleted100644 → 0
+0 −137
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_GRAPHICS_CANVAS_H

#define ANDROID_GRAPHICS_CANVAS_H



#include "SkBitmap.h"

#include "SkCanvas.h"

#include "SkMatrix.h"



namespace android {



// TODO: move this further up the stack so that all interaction with minikin

//       happens prior to calling into this interface

class TypefaceImpl;



class Canvas {

public:

    virtual ~Canvas() {};



    static Canvas* create_canvas(SkBitmap* bitmap);

    static Canvas* create_canvas(SkCanvas* skiaCanvas);



    // TODO: enable HWUI to either create similar canvas wrapper or subclass

    //       directly from Canvas

    //static Canvas* create_canvas(uirenderer::Renderer* renderer);



    // TODO: this is a temporary affordance until all necessary logic can be

    //       moved within this interface! Further, the return value should

    //       NOT be unref'd and is valid until this canvas is destroyed or a

    //       new bitmap is set.

    virtual SkCanvas* getSkCanvas() = 0;



    virtual void setBitmap(SkBitmap* bitmap, bool copyState) = 0;



    virtual bool isOpaque() = 0;

    virtual int width() = 0;

    virtual int height() = 0;



// ----------------------------------------------------------------------------

// Canvas state operations

// ----------------------------------------------------------------------------

    // Save (layer)

    virtual int getSaveCount() const = 0;

    virtual int save(SkCanvas::SaveFlags flags) = 0;

    virtual void restore() = 0;

    virtual void restoreToCount(int saveCount) = 0;



    virtual int saveLayer(float left, float top, float right, float bottom,

                const SkPaint* paint, SkCanvas::SaveFlags flags) = 0;

    virtual int saveLayerAlpha(float left, float top, float right, float bottom,

            int alpha, SkCanvas::SaveFlags flags) = 0;



    // Matrix

    virtual void getMatrix(SkMatrix* outMatrix) const = 0;

    virtual void setMatrix(const SkMatrix& matrix) = 0;



    virtual void concat(const SkMatrix& matrix) = 0;

    virtual void rotate(float degrees) = 0;

    virtual void scale(float sx, float sy) = 0;

    virtual void skew(float sx, float sy) = 0;

    virtual void translate(float dx, float dy) = 0;



    // clip

    virtual bool getClipBounds(SkRect* outRect) const = 0;

    virtual bool quickRejectRect(float left, float top, float right, float bottom) const = 0;

    virtual bool quickRejectPath(const SkPath& path) const = 0;



    virtual bool clipRect(float left, float top, float right, float bottom, SkRegion::Op op) = 0;

    virtual bool clipPath(const SkPath* path, SkRegion::Op op) = 0;

    virtual bool clipRegion(const SkRegion* region, SkRegion::Op op) = 0;



    // filters

    virtual void setDrawFilter(SkDrawFilter* drawFilter) = 0;



// ----------------------------------------------------------------------------

// Canvas draw operations

// ----------------------------------------------------------------------------

    virtual void drawColor(int color, SkXfermode::Mode mode) = 0;

    virtual void drawPaint(const SkPaint& paint) = 0;



    // Geometry

    virtual void drawPoint(float x, float y, const SkPaint& paint) = 0;

    virtual void drawPoints(const float* points, int count, const SkPaint& paint) = 0;

    virtual void drawLine(float startX, float startY, float stopX, float stopY,

                const SkPaint& paint) = 0;

    virtual void drawLines(const float* points, int count, const SkPaint& paint) = 0;

    virtual void drawRect(float left, float top, float right, float bottom,

            const SkPaint& paint) = 0;

    virtual void drawRoundRect(float left, float top, float right, float bottom,

            float rx, float ry, const SkPaint& paint) = 0;

    virtual void drawCircle(float x, float y, float radius, const SkPaint& paint) = 0;

    virtual void drawOval(float left, float top, float right, float bottom,

            const SkPaint& paint) = 0;

    virtual void drawArc(float left, float top, float right, float bottom,

            float startAngle, float sweepAngle, bool useCenter, const SkPaint& paint) = 0;

    virtual void drawPath(const SkPath& path, const SkPaint& paint) = 0;

    virtual void drawVertices(SkCanvas::VertexMode vertexMode, int vertexCount,

                              const float* verts, const float* tex, const int* colors,

                              const uint16_t* indices, int indexCount, const SkPaint& paint) = 0;



    // Bitmap-based

    virtual void drawBitmap(const SkBitmap& bitmap, float left, float top,

            const SkPaint* paint) = 0;

    virtual void drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,

            const SkPaint* paint) = 0;

    virtual void drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,

            float srcRight, float srcBottom, float dstLeft, float dstTop,

            float dstRight, float dstBottom, const SkPaint* paint) = 0;

    virtual void drawBitmapMesh(const SkBitmap& bitmap, int meshWidth, int meshHeight,

            const float* vertices, const int* colors, const SkPaint* paint) = 0;



    // Text

    virtual void drawText(const char* text, int start, int count, int contextCount,

            float x, float y, int bidiFlags, const SkPaint& paint,

            TypefaceImpl* typeface) = 0;

    virtual void drawPosText(const char* text, const float* positions, int count, int posCount,

            const SkPaint& paint) = 0;

    virtual void drawTextOnPath(const char* text, int count, const SkPath& path,

            float hOffset, float vOffset, const SkPaint& paint) = 0;

};



}; // namespace android

#endif // ANDROID_GRAPHICS_CANVAS_H

core/jni/android/graphics/Graphics.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include "JNIHelp.h"

#include "JNIHelp.h"

#include "GraphicsJNI.h"

#include "GraphicsJNI.h"





#include "Canvas.h"

#include "SkCanvas.h"

#include "SkCanvas.h"

#include "SkDevice.h"

#include "SkDevice.h"

#include "SkMath.h"

#include "SkMath.h"
@@ -365,7 +364,7 @@ SkCanvas* GraphicsJNI::getNativeCanvas(JNIEnv* env, jobject canvas) { 
    SkASSERT(canvas);

    SkASSERT(canvas);

    SkASSERT(env->IsInstanceOf(canvas, gCanvas_class));

    SkASSERT(env->IsInstanceOf(canvas, gCanvas_class));

    jlong canvasHandle = env->GetLongField(canvas, gCanvas_nativeInstanceID);

    jlong canvasHandle = env->GetLongField(canvas, gCanvas_nativeInstanceID);

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

    SkCanvas* c = getNativeCanvas(canvasHandle);

    SkASSERT(c);

    SkASSERT(c);

    return c;

    return c;

}

}