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

Commit 214c89db authored by chaviw's avatar chaviw
Browse files

Remove setGeometryAppliesWithResize 

This function is no longer used so removing the API and any logic
implemented for it.

Test: go/wm-smoke
Change-Id: I4ae2128cd38e818fcd16dafa4ce47c9411bd61c9
parent 1a69fc00

libs/gui/LayerState.cpp

+0 −3
Original line number Diff line number Diff line
@@ -291,9 +291,6 @@ void layer_state_t::merge(const layer_state_t& other) { 
        what |= eOverrideScalingModeChanged;

        overrideScalingMode = other.overrideScalingMode;

    }

    if (other.what & eGeometryAppliesWithResize) {

        what |= eGeometryAppliesWithResize;

    }

    if (other.what & eReparentChildren) {

        what |= eReparentChildren;

        reparentHandle = other.reparentHandle;

libs/gui/SurfaceComposerClient.cpp

+0 −13
Original line number Diff line number Diff line
@@ -1187,19 +1187,6 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setOverr 
    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setGeometryAppliesWithResize(

        const sp<SurfaceControl>& sc) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eGeometryAppliesWithResize;



    registerSurfaceControlForCallback(sc);

    return *this;

}



#ifndef NO_INPUT

SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setInputWindowInfo(

        const sp<SurfaceControl>& sc,

libs/gui/include/gui/LayerState.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct layer_state_t { 
        eCropChanged_legacy = 0x00000100,

        eDeferTransaction_legacy = 0x00000200,

        eOverrideScalingModeChanged = 0x00000400,

        eGeometryAppliesWithResize = 0x00000800,

        // AVAILABLE 0x00000800,

        eReparentChildren = 0x00001000,

        eDetachChildren = 0x00002000,

        eRelativeLayerChanged = 0x00004000,

libs/gui/include/gui/SurfaceComposerClient.h

+0 −6
Original line number Diff line number Diff line
@@ -446,12 +446,6 @@ public: 
        Transaction& setOverrideScalingMode(const sp<SurfaceControl>& sc,

                int32_t overrideScalingMode);



        // If the size changes in this transaction, all geometry updates specified

        // in this transaction will not complete until a buffer of the new size

        // arrives. As some elements normally apply immediately, this enables

        // freezing the total geometry of a surface until a resize is completed.

        Transaction& setGeometryAppliesWithResize(const sp<SurfaceControl>& sc);



#ifndef NO_INPUT

        Transaction& setInputWindowInfo(const sp<SurfaceControl>& sc, const InputWindowInfo& info);

        Transaction& transferTouchFocus(const sp<IBinder>& fromToken, const sp<IBinder>& toToken);

services/surfaceflinger/BufferQueueLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ status_t BufferQueueLayer::updateTexImage(bool& recomputeVisibleRegions, nsecs_t 
    const int32_t layerID = getSequence();

    LayerRejecter r(mDrawingState, getCurrentState(), recomputeVisibleRegions,

                    getProducerStickyTransform() != 0, mName.string(), mOverrideScalingMode,

                    getTransformToDisplayInverse(), mFreezeGeometryUpdates);

                    getTransformToDisplayInverse());



    if (isRemovedFromCurrentState()) {

        expectedPresentTime = 0;