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

Commit 39adc88f authored by Mike Reed's avatar Mike Reed
Browse files

use rect version of join, the other is deprecated 

Test: make

Change-Id: I29f4ff6cea209ac5c053a525ff06cd1bfea6c9c0
parent 6762470f

core/jni/android/graphics/Graphics.cpp

+12 −12
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ SkIRect* GraphicsJNI::jrect_to_irect(JNIEnv* env, jobject obj, SkIRect* ir) 
{

    ALOG_ASSERT(env->IsInstanceOf(obj, gRect_class));



    ir->set(env->GetIntField(obj, gRect_leftFieldID),

    ir->setLTRB(env->GetIntField(obj, gRect_leftFieldID),

                env->GetIntField(obj, gRect_topFieldID),

                env->GetIntField(obj, gRect_rightFieldID),

                env->GetIntField(obj, gRect_bottomFieldID));
@@ -241,7 +241,7 @@ SkRect* GraphicsJNI::jrectf_to_rect(JNIEnv* env, jobject obj, SkRect* r) 
{

    ALOG_ASSERT(env->IsInstanceOf(obj, gRectF_class));



    r->set(env->GetFloatField(obj, gRectF_leftFieldID),

    r->setLTRB(env->GetFloatField(obj, gRectF_leftFieldID),

               env->GetFloatField(obj, gRectF_topFieldID),

               env->GetFloatField(obj, gRectF_rightFieldID),

               env->GetFloatField(obj, gRectF_bottomFieldID));
@@ -252,7 +252,7 @@ SkRect* GraphicsJNI::jrect_to_rect(JNIEnv* env, jobject obj, SkRect* r) 
{

    ALOG_ASSERT(env->IsInstanceOf(obj, gRect_class));



    r->set(SkIntToScalar(env->GetIntField(obj, gRect_leftFieldID)),

    r->setLTRB(SkIntToScalar(env->GetIntField(obj, gRect_leftFieldID)),

               SkIntToScalar(env->GetIntField(obj, gRect_topFieldID)),

               SkIntToScalar(env->GetIntField(obj, gRect_rightFieldID)),

               SkIntToScalar(env->GetIntField(obj, gRect_bottomFieldID)));

core/jni/android/graphics/Region.cpp

+5 −8
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void Region_setRegion(JNIEnv* env, jobject, jlong dstHandle, jlong srcHan 


static jboolean Region_setRect(JNIEnv* env, jobject, jlong dstHandle, jint left, jint top, jint right, jint bottom) {

    SkRegion* dst = reinterpret_cast<SkRegion*>(dstHandle);

    bool result = dst->setRect(left, top, right, bottom);

    bool result = dst->setRect({left, top, right, bottom});

    return boolTojboolean(result);

}
@@ -92,10 +92,7 @@ static jboolean Region_getBoundaryPath(JNIEnv* env, jobject, jlong regionHandle, 


static jboolean Region_op0(JNIEnv* env, jobject, jlong dstHandle, jint left, jint top, jint right, jint bottom, jint op) {

    SkRegion* dst = reinterpret_cast<SkRegion*>(dstHandle);

    SkIRect ir;



    ir.set(left, top, right, bottom);

    bool result = dst->op(ir, (SkRegion::Op)op);

    bool result = dst->op({left, top, right, bottom}, (SkRegion::Op)op);

    return boolTojboolean(result);

}
@@ -139,13 +136,13 @@ static jboolean Region_contains(JNIEnv* env, jobject region, jint x, jint y) { 
}



static jboolean Region_quickContains(JNIEnv* env, jobject region, jint left, jint top, jint right, jint bottom) {

    bool result = GetSkRegion(env, region)->quickContains(left, top, right, bottom);

    bool result = GetSkRegion(env, region)->quickContains({left, top, right, bottom});

    return boolTojboolean(result);

}



static jboolean Region_quickRejectIIII(JNIEnv* env, jobject region, jint left, jint top, jint right, jint bottom) {

    SkIRect ir;

    ir.set(left, top, right, bottom);

    ir.setLTRB(left, top, right, bottom);

    bool result = GetSkRegion(env, region)->quickReject(ir);

    return boolTojboolean(result);

}
@@ -224,7 +221,7 @@ static jlong Region_createFromParcel(JNIEnv* env, jobject clazz, jobject parcel) 


    SkRegion* region = new SkRegion;

    for (size_t x = 0; x + 4 <= rects.size(); x += 4) {

        region->op(rects[x], rects[x+1], rects[x+2], rects[x+3], SkRegion::kUnion_Op);

        region->op({rects[x], rects[x+1], rects[x+2], rects[x+3]}, SkRegion::kUnion_Op);

    }



    return reinterpret_cast<jlong>(region);

libs/hwui/DamageAccumulator.cpp

+4 −4
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static inline void mapRect(const Matrix4* matrix, const SkRect& in, SkRect* out) 
        // calculations. Just give up and expand to DIRTY_MIN/DIRTY_MAX

        temp.set(DIRTY_MIN, DIRTY_MIN, DIRTY_MAX, DIRTY_MAX);

    }

    out->join(RECT_ARGS(temp));

    out->join({RECT_ARGS(temp)});

}



void DamageAccumulator::applyMatrix4Transform(DirtyStack* frame) {
@@ -145,7 +145,7 @@ static inline void applyMatrix(const SkMatrix* transform, SkRect* rect) { 
            // Don't attempt to calculate damage for a perspective transform

            // as the numbers this works with can break the perspective

            // calculations. Just give up and expand to DIRTY_MIN/DIRTY_MAX

            rect->set(DIRTY_MIN, DIRTY_MIN, DIRTY_MAX, DIRTY_MAX);

            rect->setLTRB(DIRTY_MIN, DIRTY_MIN, DIRTY_MAX, DIRTY_MAX);

        }

    }

}
@@ -209,7 +209,7 @@ void DamageAccumulator::applyRenderNodeTransform(DirtyStack* frame) { 


    // Perform clipping

    if (props.getClipDamageToBounds() && !frame->pendingDirty.isEmpty()) {

        if (!frame->pendingDirty.intersect(0, 0, props.getWidth(), props.getHeight())) {

        if (!frame->pendingDirty.intersect(SkRect::MakeIWH(props.getWidth(), props.getHeight()))) {

            frame->pendingDirty.setEmpty();

        }

    }
@@ -233,7 +233,7 @@ void DamageAccumulator::applyRenderNodeTransform(DirtyStack* frame) { 
}



void DamageAccumulator::dirty(float left, float top, float right, float bottom) {

    mHead->pendingDirty.join(left, top, right, bottom);

    mHead->pendingDirty.join({left, top, right, bottom});

}



void DamageAccumulator::peekAtDirty(SkRect* dest) const {

libs/hwui/hwui/Bitmap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ void Bitmap::getSkBitmap(SkBitmap* outBitmap) { 


void Bitmap::getBounds(SkRect* bounds) const {

    SkASSERT(bounds);

    bounds->set(0, 0, SkIntToScalar(width()), SkIntToScalar(height()));

    bounds->setIWH(width(), height());

}



#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration

libs/hwui/renderthread/CanvasContext.cpp

+3 −3
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ SkRect CanvasContext::computeDirtyRect(const Frame& frame, SkRect* dirty) { 
        // New surface needs a full draw

        dirty->setEmpty();

    } else {

        if (!dirty->isEmpty() && !dirty->intersect(0, 0, frame.width(), frame.height())) {

        if (!dirty->isEmpty() && !dirty->intersect(SkRect::MakeIWH(frame.width(), frame.height()))) {

            ALOGW("Dirty " RECT_STRING " doesn't intersect with 0 0 %d %d ?", SK_RECT_ARGS(*dirty),

                  frame.width(), frame.height());

            dirty->setEmpty();
@@ -735,7 +735,7 @@ SkRect CanvasContext::computeDirtyRect(const Frame& frame, SkRect* dirty) { 
    }



    if (dirty->isEmpty()) {

        dirty->set(0, 0, frame.width(), frame.height());

        dirty->setIWH(frame.width(), frame.height());

    }



    // At this point dirty is the area of the window to update. However,
@@ -751,7 +751,7 @@ SkRect CanvasContext::computeDirtyRect(const Frame& frame, SkRect* dirty) { 
        if (frame.bufferAge() > (int)mSwapHistory.size()) {

            // We don't have enough history to handle this old of a buffer

            // Just do a full-draw

            dirty->set(0, 0, frame.width(), frame.height());

            dirty->setIWH(frame.width(), frame.height());

        } else {

            // At this point we haven't yet added the latest frame

            // to the damage history (happens below)