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

Commit 10d4a945 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Remove setFrame from surface_control setGeometry"" into sc-dev am: 397cb14b 

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

Change-Id: I68ed44ecaef8895c1a4b438f1114506e2eb29ff0
parents 89260871 397cb14b

native/android/surface_control.cpp

+7 −22
Original line number Diff line number Diff line
@@ -432,27 +432,14 @@ void ASurfaceTransaction_setGeometry(ASurfaceTransaction* aSurfaceTransaction, 
                                     const ARect& destination, int32_t transform) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);

    CHECK_VALID_RECT(source);

    CHECK_VALID_RECT(destination);



    Rect sourceRect = static_cast<const Rect&>(source);

    // Adjust the source so its top and left are not negative

    sourceRect.left = std::max(sourceRect.left, 0);

    sourceRect.top = std::max(sourceRect.top, 0);

    LOG_ALWAYS_FATAL_IF(sourceRect.isEmpty(), "invalid arg passed as source argument");



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    transaction->setCrop(surfaceControl, sourceRect);



    float dsdx = (destination.right - destination.left) /

            static_cast<float>(sourceRect.right - sourceRect.left);

    float dsdy = (destination.bottom - destination.top) /

            static_cast<float>(sourceRect.bottom - sourceRect.top);



    transaction->setPosition(surfaceControl, destination.left - (sourceRect.left * dsdx),

                             destination.top - (sourceRect.top * dsdy));

    transaction->setMatrix(surfaceControl, dsdx, 0, 0, dsdy);

    transaction->setCrop(surfaceControl, static_cast<const Rect&>(source));

    transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));

    transaction->setTransform(surfaceControl, transform);

    bool transformToInverseDisplay = (NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY & transform) ==

            NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY;
@@ -471,18 +458,16 @@ void ASurfaceTransaction_setSourceRect(ASurfaceTransaction* aSurfaceTransaction, 
    transaction->setCrop(surfaceControl, static_cast<const Rect&>(source));

}



void ASurfaceTransaction_setPosition(ASurfaceTransaction* /* aSurfaceTransaction */,

                                     ASurfaceControl* /* aSurfaceControl */,

                                     const ARect& /* destination */) {

    // TODO: Fix this function

    /* CHECK_NOT_NULL(aSurfaceTransaction);

void ASurfaceTransaction_setPosition(ASurfaceTransaction* aSurfaceTransaction,

                                     ASurfaceControl* aSurfaceControl, const ARect& destination) {

    CHECK_NOT_NULL(aSurfaceTransaction);

    CHECK_NOT_NULL(aSurfaceControl);

    CHECK_VALID_RECT(destination);



    sp<SurfaceControl> surfaceControl = ASurfaceControl_to_SurfaceControl(aSurfaceControl);

    Transaction* transaction = ASurfaceTransaction_to_Transaction(aSurfaceTransaction);



    transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));*/

    transaction->setFrame(surfaceControl, static_cast<const Rect&>(destination));

}



void ASurfaceTransaction_setTransform(ASurfaceTransaction* aSurfaceTransaction,