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

Commit f3edb898 authored by Rob Carr's avatar Rob Carr Committed by Android (Google) Code Review
Browse files

Merge "SurfaceControl: Correct setMatrix parameter naming."

parents 3b14c2ac cb6e1e38

include/gui/SurfaceComposerClient.h

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ public: 
    status_t    setTransparentRegionHint(const sp<IBinder>& id, const Region& transparent);

    status_t    setLayer(const sp<IBinder>& id, int32_t layer);

    status_t    setAlpha(const sp<IBinder>& id, float alpha=1.0f);

    status_t    setMatrix(const sp<IBinder>& id, float dsdx, float dtdx, float dsdy, float dtdy);

    status_t    setMatrix(const sp<IBinder>& id, float dsdx, float dtdx, float dtdy, float dsdy);

    status_t    setPosition(const sp<IBinder>& id, float x, float y);

    status_t    setSize(const sp<IBinder>& id, uint32_t w, uint32_t h);

    status_t    setCrop(const sp<IBinder>& id, const Rect& crop);

include/gui/SurfaceControl.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public: 
    status_t    setFlags(uint32_t flags, uint32_t mask);

    status_t    setTransparentRegionHint(const Region& transparent);

    status_t    setAlpha(float alpha=1.0f);

    status_t    setMatrix(float dsdx, float dtdx, float dsdy, float dtdy);

    status_t    setMatrix(float dsdx, float dtdx, float dtdy, float dsdy);

    status_t    setCrop(const Rect& crop);

    status_t    setFinalCrop(const Rect& crop);

include/private/gui/LayerState.h

+1 −1
Original line number Diff line number Diff line
@@ -77,8 +77,8 @@ struct layer_state_t { 
            struct matrix22_t {

                float   dsdx{0};

                float   dtdx{0};

                float   dsdy{0};

                float   dtdy{0};

                float   dsdy{0};

            };

            sp<IBinder>     surface;

            uint32_t        what;

libs/gui/SurfaceComposerClient.cpp

+4 −4
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ public: 
    status_t setAlpha(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id,

            float alpha);

    status_t setMatrix(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id,

            float dsdx, float dtdx, float dsdy, float dtdy);

            float dsdx, float dtdx, float dtdy, float dsdy);

    status_t setOrientation(int orientation);

    status_t setCrop(const sp<SurfaceComposerClient>& client, const sp<IBinder>& id,

            const Rect& crop);
@@ -391,7 +391,7 @@ status_t Composer::setLayerStack(const sp<SurfaceComposerClient>& client, 


status_t Composer::setMatrix(const sp<SurfaceComposerClient>& client,

        const sp<IBinder>& id, float dsdx, float dtdx,

        float dsdy, float dtdy) {

        float dtdy, float dsdy) {

    Mutex::Autolock _l(mLock);

    layer_state_t* s = getLayerStateLocked(client, id);

    if (!s)
@@ -767,8 +767,8 @@ status_t SurfaceComposerClient::setLayerStack(const sp<IBinder>& id, uint32_t la 
}



status_t SurfaceComposerClient::setMatrix(const sp<IBinder>& id, float dsdx, float dtdx,

        float dsdy, float dtdy) {

    return getComposer().setMatrix(this, id, dsdx, dtdx, dsdy, dtdy);

        float dtdy, float dsdy) {

    return getComposer().setMatrix(this, id, dsdx, dtdx, dtdy, dsdy);

}



status_t SurfaceComposerClient::deferTransactionUntil(const sp<IBinder>& id,

libs/gui/SurfaceControl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -147,10 +147,10 @@ status_t SurfaceControl::setAlpha(float alpha) { 
    if (err < 0) return err;

    return mClient->setAlpha(mHandle, alpha);

}

status_t SurfaceControl::setMatrix(float dsdx, float dtdx, float dsdy, float dtdy) {

status_t SurfaceControl::setMatrix(float dsdx, float dtdx, float dtdy, float dsdy) {

    status_t err = validate();

    if (err < 0) return err;

    return mClient->setMatrix(mHandle, dsdx, dtdx, dsdy, dtdy);

    return mClient->setMatrix(mHandle, dsdx, dtdx, dtdy, dsdy);

}

status_t SurfaceControl::setCrop(const Rect& crop) {

    status_t err = validate();