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

Commit 8ba8b076 authored by chaviw's avatar chaviw
Browse files

Remove detachChildren 

Since there are no longer callers of detachChildren, remove code and
test that involve detachChildren

Test: Builds and remaining tests pass
Bug: 177557720
Change-Id: Id5b7120b7f2c289d4e7ffb5565b29e2be18d6587
parent 263aff55

cmds/surfacereplayer/proto/src/trace.proto

+4 −9
Original line number Diff line number Diff line
@@ -50,11 +50,10 @@ message SurfaceChange { 
        CornerRadiusChange          corner_radius           = 16;

        ReparentChange              reparent                = 17;

        RelativeParentChange        relative_parent         = 18;

        DetachChildrenChange        detach_children         = 19;

        ReparentChildrenChange      reparent_children       = 20;

        BackgroundBlurRadiusChange  background_blur_radius  = 21;

        ShadowRadiusChange          shadow_radius           = 22;

        BlurRegionsChange           blur_regions            = 23;

        ReparentChildrenChange      reparent_children       = 19;

        BackgroundBlurRadiusChange  background_blur_radius  = 20;

        ShadowRadiusChange          shadow_radius           = 21;

        BlurRegionsChange           blur_regions            = 22;

    }

}
@@ -200,10 +199,6 @@ message RelativeParentChange { 
    required int32 z = 2;

}



message DetachChildrenChange {

    required bool detach_children = 1;

}



message ShadowRadiusChange {

    required float radius = 1;

}

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −8
Original line number Diff line number Diff line
@@ -417,9 +417,6 @@ status_t Replayer::doSurfaceTransaction( 
            case SurfaceChange::SurfaceChangeCase::kRelativeParent:

                setRelativeParentChange(transaction, change.id(), change.relative_parent());

                break;

            case SurfaceChange::SurfaceChangeCase::kDetachChildren:

                setDetachChildrenChange(transaction, change.id(), change.detach_children());

                break;

            case SurfaceChange::SurfaceChangeCase::kShadowRadius:

                setShadowRadiusChange(transaction, change.id(), change.shadow_radius());

                break;
@@ -713,11 +710,6 @@ void Replayer::setRelativeParentChange(SurfaceComposerClient::Transaction& t, 
    t.setRelativeLayer(mLayers[id], mLayers[c.relative_parent_id()], c.z());

}



void Replayer::setDetachChildrenChange(SurfaceComposerClient::Transaction& t,

        layer_id id, const DetachChildrenChange& c) {

    t.detachChildren(mLayers[id]);

}



void Replayer::setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

        layer_id id, const ReparentChildrenChange& c) {

    if (mLayers.count(c.parent_id()) == 0 || mLayers[c.parent_id()] == nullptr) {

cmds/surfacereplayer/replayer/Replayer.h

+0 −2
Original line number Diff line number Diff line
@@ -116,8 +116,6 @@ class Replayer { 
            layer_id id, const ReparentChange& c);

    void setRelativeParentChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const RelativeParentChange& c);

    void setDetachChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const DetachChildrenChange& c);

    void setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ReparentChildrenChange& c);

    void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

libs/gui/LayerState.cpp

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

        reparentSurfaceControl = other.reparentSurfaceControl;

    }

    if (other.what & eDetachChildren) {

        what |= eDetachChildren;

    }

    if (other.what & eRelativeLayerChanged) {

        what |= eRelativeLayerChanged;

        what &= ~eLayerChanged;

libs/gui/SurfaceComposerClient.cpp

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

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::detachChildren(

        const sp<SurfaceControl>& sc) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eDetachChildren;



    registerSurfaceControlForCallback(sc);

    return *this;

}



#ifndef NO_INPUT

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

        const sp<SurfaceControl>& sc,