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

Commit da80354b authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Remove detachChildren" into sc-dev am: a73115b7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bdb012d09d4aa0443f85406f990bbbf68d93746
parents 8bd5503c a73115b7

cmds/surfacereplayer/proto/src/trace.proto

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

        CornerRadiusChange          corner_radius           = 16;

        ReparentChange              reparent                = 17;

        ReparentChange              reparent                = 17;

        RelativeParentChange        relative_parent         = 18;

        RelativeParentChange        relative_parent         = 18;

        DetachChildrenChange        detach_children         = 19;

        ReparentChildrenChange      reparent_children       = 19;

        ReparentChildrenChange      reparent_children       = 20;

        BackgroundBlurRadiusChange  background_blur_radius  = 20;

        BackgroundBlurRadiusChange  background_blur_radius  = 21;

        ShadowRadiusChange          shadow_radius           = 21;

        ShadowRadiusChange          shadow_radius           = 22;

        BlurRegionsChange           blur_regions            = 22;

        BlurRegionsChange           blur_regions            = 23;

    }

    }

}

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

    required int32 z = 2;

}

}





message DetachChildrenChange {

    required bool detach_children = 1;

}



message ShadowRadiusChange {

message ShadowRadiusChange {

    required float radius = 1;

    required float radius = 1;

}

}

cmds/surfacereplayer/replayer/Replayer.cpp

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

            case SurfaceChange::SurfaceChangeCase::kRelativeParent:

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

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

                break;

                break;

            case SurfaceChange::SurfaceChangeCase::kDetachChildren:

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

                break;

            case SurfaceChange::SurfaceChangeCase::kShadowRadius:

            case SurfaceChange::SurfaceChangeCase::kShadowRadius:

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

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

                break;

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

    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,

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

        layer_id id, const ReparentChildrenChange& c) {

        layer_id id, const ReparentChildrenChange& c) {

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

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

cmds/surfacereplayer/replayer/Replayer.h

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

            layer_id id, const ReparentChange& c);

    void setRelativeParentChange(SurfaceComposerClient::Transaction& t,

    void setRelativeParentChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const RelativeParentChange& c);

            layer_id id, const RelativeParentChange& c);

    void setDetachChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const DetachChildrenChange& c);

    void setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

    void setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ReparentChildrenChange& c);

            layer_id id, const ReparentChildrenChange& c);

    void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

    void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

libs/gui/LayerState.cpp

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

        what |= eReparentChildren;

        reparentSurfaceControl = other.reparentSurfaceControl;

        reparentSurfaceControl = other.reparentSurfaceControl;

    }

    }

    if (other.what & eDetachChildren) {

        what |= eDetachChildren;

    }

    if (other.what & eRelativeLayerChanged) {

    if (other.what & eRelativeLayerChanged) {

        what |= eRelativeLayerChanged;

        what |= eRelativeLayerChanged;

        what &= ~eLayerChanged;

        what &= ~eLayerChanged;

libs/gui/SurfaceComposerClient.cpp

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

    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

#ifndef NO_INPUT

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

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

        const sp<SurfaceControl>& sc,

        const sp<SurfaceControl>& sc,