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

Commit fc999950 authored by sergeyv's avatar sergeyv
Browse files

Pass Bitmap instead of SkBitmap for bitmap rect operation 

Test: refactoring cl.
bug:32216791

Change-Id: I66d19194c57b3aa2c400aa87acffc774a533776a
parent aed7f58f

core/jni/android/graphics/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public: 
    }



    bool valid() {

        return !!mBitmap;

        return mBitmap;

    }



    Bitmap& bitmap() {

core/jni/android_graphics_Canvas.cpp

+2 −4
Original line number Diff line number Diff line
@@ -407,8 +407,7 @@ static void drawBitmapMatrix(JNIEnv* env, jobject, jlong canvasHandle, jobject j 
                             jlong matrixHandle, jlong paintHandle) {

    const SkMatrix* matrix = reinterpret_cast<SkMatrix*>(matrixHandle);

    const Paint* paint = reinterpret_cast<Paint*>(paintHandle);

    SkBitmap bitmap;

    GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap);

    Bitmap& bitmap = android::bitmap::toBitmap(env, jbitmap);

    get_canvas(canvasHandle)->drawBitmap(bitmap, *matrix, paint);

}
@@ -419,8 +418,7 @@ static void drawBitmapRect(JNIEnv* env, jobject, jlong canvasHandle, jobject jbi 
    Canvas* canvas = get_canvas(canvasHandle);

    const Paint* paint = reinterpret_cast<Paint*>(paintHandle);



    SkBitmap bitmap;

    GraphicsJNI::getSkBitmap(env, jbitmap, &bitmap);

    Bitmap& bitmap = android::bitmap::toBitmap(env, jbitmap);

    if (screenDensity != 0 && screenDensity != bitmapDensity) {

        Paint filteredPaint;

        if (paint) {

libs/hwui/FrameBuilder.cpp

+4 −2
Original line number Diff line number Diff line
@@ -631,13 +631,15 @@ void FrameBuilder::deferBitmapRectOp(const BitmapRectOp& op) { 
}



void FrameBuilder::deferVectorDrawableOp(const VectorDrawableOp& op) {

    const SkBitmap& bitmap = op.vectorDrawable->getBitmapUpdateIfDirty();

    SkBitmap bitmap;

    op.vectorDrawable->getBitmapUpdateIfDirty().getSkBitmap(&bitmap);

    SkBitmap* localBitmap = mAllocator.create<SkBitmap>(bitmap);

    SkPaint* paint = op.vectorDrawable->getPaint();

    const BitmapRectOp* resolvedOp = mAllocator.create_trivial<BitmapRectOp>(op.unmappedBounds,

            op.localMatrix,

            op.localClip,

            paint,

            &bitmap,

            localBitmap,

            Rect(bitmap.width(), bitmap.height()));

    deferBitmapRectOp(*resolvedOp);

}

libs/hwui/RecordingCanvas.cpp

+7 −3
Original line number Diff line number Diff line
@@ -478,8 +478,10 @@ void RecordingCanvas::drawBitmap(Bitmap& bitmap, float left, float top, const Sk 
    restore();

}



void RecordingCanvas::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix,

void RecordingCanvas::drawBitmap(Bitmap& hwuiBitmap, const SkMatrix& matrix,

                            const SkPaint* paint) {

    SkBitmap bitmap;

    hwuiBitmap.getSkBitmap(&bitmap);

    if (matrix.isIdentity()) {

        drawBitmap(&bitmap, paint);

    } else if (!(matrix.getType() & ~(SkMatrix::kScale_Mask | SkMatrix::kTranslate_Mask))
@@ -490,7 +492,7 @@ void RecordingCanvas::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, 
        SkRect dst;

        bitmap.getBounds(&src);

        matrix.mapRect(&dst, src);

        drawBitmap(bitmap, src.fLeft, src.fTop, src.fRight, src.fBottom,

        drawBitmap(hwuiBitmap, src.fLeft, src.fTop, src.fRight, src.fBottom,

                   dst.fLeft, dst.fTop, dst.fRight, dst.fBottom, paint);

    } else {

        save(SaveFlags::Matrix);
@@ -500,9 +502,11 @@ void RecordingCanvas::drawBitmap(const SkBitmap& bitmap, const SkMatrix& matrix, 
    }

}



void RecordingCanvas::drawBitmap(const SkBitmap& bitmap, float srcLeft, float srcTop,

void RecordingCanvas::drawBitmap(Bitmap& hwuiBitmap, float srcLeft, float srcTop,

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

            float dstRight, float dstBottom, const SkPaint* paint) {

    SkBitmap bitmap;

    hwuiBitmap.getSkBitmap(&bitmap);

    if (srcLeft == 0 && srcTop == 0

            && srcRight == bitmap.width()

            && srcBottom == bitmap.height()

libs/hwui/RecordingCanvas.h

+2 −3
Original line number Diff line number Diff line
@@ -177,9 +177,8 @@ public: 


    // Bitmap-based

    virtual void drawBitmap(Bitmap& bitmap, float left, float top, const SkPaint* paint) override;

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

                            const SkPaint* paint) override;

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

    virtual void drawBitmap(Bitmap& bitmap, const SkMatrix& matrix, const SkPaint* paint) override;

    virtual void drawBitmap(Bitmap& bitmap, float srcLeft, float srcTop,

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

            float dstRight, float dstBottom, const SkPaint* paint) override;

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