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

Commit a8abd314 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix size calculation" into sc-dev am: 12307996 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14191409

Change-Id: Ia1ce0ac55da931d37a0f9b4c3fdc6ebc33df79c1
parents f146de70 12307996

libs/hwui/pipeline/skia/SkiaRecordingCanvas.cpp

+2 −3
Original line number Diff line number Diff line
@@ -60,12 +60,11 @@ void SkiaRecordingCanvas::punchHole(const SkRRect& rect) { 
    // Add the marker annotation to allow HWUI to determine where the current

    // clip/transformation should be applied

    SkVector vector = rect.getSimpleRadii();

    const int dataSize = 2;

    float data[dataSize];

    float data[2];

    data[0] = vector.x();

    data[1] = vector.y();

    mRecorder.drawAnnotation(rect.rect(), HOLE_PUNCH_ANNOTATION.c_str(),

                             SkData::MakeWithCopy(data, dataSize));

                             SkData::MakeWithCopy(data, 2 * sizeof(float)));



    // Clear the current rect within the layer itself

    SkPaint paint = SkPaint();

libs/hwui/pipeline/skia/TransformCanvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ using namespace android::uirenderer::skiapipeline; 


void TransformCanvas::onDrawAnnotation(const SkRect& rect, const char* key, SkData* value) {

    if (HOLE_PUNCH_ANNOTATION == key) {

        auto* rectParams = static_cast<const float*>(value->data());

        auto* rectParams = reinterpret_cast<const float*>(value->data());

        float radiusX = rectParams[0];

        float radiusY = rectParams[1];

        SkRRect roundRect = SkRRect::MakeRectXY(rect, radiusX, radiusY);