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

Commit 0dd99025 authored by Sergei Vasilinetc's avatar Sergei Vasilinetc Committed by Android (Google) Code Review
Browse files

Merge changes I1d8a9a6e,I5adcd59d 

* changes:
  Use Bitmap in DisplayList & RecordedOps instead of SkBitmap Test: refactoring cl. bug:32216791
  Pass Bitmap instead of SkBitmap in drawNinePatch & drawBitmapMesh Test: refactoring cl. bug:32216791
parents 586bfe54 ec4a4b13

core/jni/android/graphics/Bitmap.cpp

+7 −3
Original line number Diff line number Diff line
@@ -212,6 +212,12 @@ Bitmap& toBitmap(JNIEnv* env, jobject bitmap) { 
    return localBitmap->bitmap();

}



Bitmap& toBitmap(JNIEnv* env, jlong bitmapHandle) {

    SkASSERT(env);

    LocalScopedBitmap localBitmap(bitmapHandle);

    return localBitmap->bitmap();

}



} // namespace bitmap



} // namespace android
@@ -1199,9 +1205,7 @@ static jlong Bitmap_refPixelRef(JNIEnv* env, jobject, jlong bitmapHandle) { 
static void Bitmap_prepareToDraw(JNIEnv* env, jobject, jlong bitmapPtr) {

    LocalScopedBitmap bitmapHandle(bitmapPtr);

    if (!bitmapHandle.valid()) return;

    SkBitmap bitmap;

    bitmapHandle->getSkBitmap(&bitmap);

    android::uirenderer::renderthread::RenderProxy::prepareToDraw(bitmap);

    android::uirenderer::renderthread::RenderProxy::prepareToDraw(bitmapHandle->bitmap());

}



static jint Bitmap_getAllocationByteCount(JNIEnv* env, jobject, jlong bitmapPtr) {

core/jni/android/graphics/Bitmap.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ jobject createBitmap(JNIEnv* env, Bitmap* bitmap, 
void toSkBitmap(jlong bitmapHandle, SkBitmap* outBitmap);



Bitmap& toBitmap(JNIEnv* env, jobject bitmap);

Bitmap& toBitmap(JNIEnv* env, jlong bitmapHandle);



/** Reinitialize a bitmap. bitmap must already have its SkAlphaType set in

    sync with isPremultiplied

core/jni/android_graphics_Canvas.cpp

+4 −6
Original line number Diff line number Diff line
@@ -341,13 +341,12 @@ static void drawNinePatch(JNIEnv* env, jobject, jlong canvasHandle, jlong bitmap 
        jlong paintHandle, jint dstDensity, jint srcDensity) {



    Canvas* canvas = get_canvas(canvasHandle);

    SkBitmap skiaBitmap;

    bitmap::toSkBitmap(bitmapHandle, &skiaBitmap);

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

    const android::Res_png_9patch* chunk = reinterpret_cast<android::Res_png_9patch*>(chunkHandle);

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



    if (CC_LIKELY(dstDensity == srcDensity || dstDensity == 0 || srcDensity == 0)) {

        canvas->drawNinePatch(skiaBitmap, *chunk, left, top, right, bottom, paint);

        canvas->drawNinePatch(bitmap, *chunk, left, top, right, bottom, paint);

    } else {

        canvas->save(SaveFlags::MatrixClip);
@@ -361,7 +360,7 @@ static void drawNinePatch(JNIEnv* env, jobject, jlong canvasHandle, jlong bitmap 
        }

        filteredPaint.setFilterQuality(kLow_SkFilterQuality);



        canvas->drawNinePatch(skiaBitmap, *chunk, 0, 0, (right-left)/scale, (bottom-top)/scale,

        canvas->drawNinePatch(bitmap, *chunk, 0, 0, (right-left)/scale, (bottom-top)/scale,

                &filteredPaint);



        canvas->restore();
@@ -464,8 +463,7 @@ static void drawBitmapMesh(JNIEnv* env, jobject, jlong canvasHandle, jobject jbi 
    AutoJavaIntArray colorA(env, jcolors, colorIndex + ptCount);



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

    SkBitmap bitmap;

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

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

    get_canvas(canvasHandle)->drawBitmapMesh(bitmap, meshWidth, meshHeight,

                                             vertA.ptr(), colorA.ptr(), paint);

}

libs/hwui/BakedOpDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void BakedOpDispatcher::onMergedBitmapOps(BakedOpRenderer& renderer, 
        const MergedBakedOpList& opList) {



    const BakedOpState& firstState = *(opList.states[0]);

    const SkBitmap* bitmap = (static_cast<const BitmapOp*>(opList.states[0]->op))->bitmap;

    Bitmap* bitmap = (static_cast<const BitmapOp*>(opList.states[0]->op))->bitmap;



    Texture* texture = renderer.caches().textureCache.get(bitmap);

    if (!texture) return;

libs/hwui/BakedOpRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void BakedOpRenderer::clearColorBuffer(const Rect& rect) { 
    if (!mRenderTarget.frameBufferId) mHasDrawn = true;

}



Texture* BakedOpRenderer::getTexture(const SkBitmap* bitmap) {

Texture* BakedOpRenderer::getTexture(Bitmap* bitmap) {

    return mCaches.textureCache.get(bitmap);

}