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

Commit 04ffe839 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge "SurfaceFlinger: Remove reparentChildren" into sc-dev am: cc608001 

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

Change-Id: Ic0aa745a58afa2e9160ea7735502faa0bed16b7a
parents 92045afd cc608001

cmds/surfacereplayer/proto/src/trace.proto

+0 −5
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ message SurfaceChange { 
        CornerRadiusChange          corner_radius           = 16;

        ReparentChange              reparent                = 17;

        RelativeParentChange        relative_parent         = 18;

        ReparentChildrenChange      reparent_children       = 19;

        BackgroundBlurRadiusChange  background_blur_radius  = 20;

        ShadowRadiusChange          shadow_radius           = 21;

        BlurRegionsChange           blur_regions            = 22;
@@ -190,10 +189,6 @@ message ReparentChange { 
    required int32 parent_id = 1;

}



message ReparentChildrenChange {

    required int32 parent_id = 1;

}



message RelativeParentChange {

    required int32 relative_parent_id = 1;

    required int32 z = 2;

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −12
Original line number Diff line number Diff line
@@ -410,9 +410,6 @@ status_t Replayer::doSurfaceTransaction( 
            case SurfaceChange::SurfaceChangeCase::kReparent:

                setReparentChange(transaction, change.id(), change.reparent());

                break;

            case SurfaceChange::SurfaceChangeCase::kReparentChildren:

                setReparentChildrenChange(transaction, change.id(), change.reparent_children());

                break;

            case SurfaceChange::SurfaceChangeCase::kRelativeParent:

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

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

}



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

        layer_id id, const ReparentChildrenChange& c) {

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

        ALOGE("Layer %d not found in reparent children transaction", c.parent_id());

        return;

    }

    t.reparentChildren(mLayers[id], mLayers[c.parent_id()]);

}



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

        layer_id id, const ShadowRadiusChange& c) {

    t.setShadowRadius(mLayers[id], c.radius());

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 setReparentChildrenChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ReparentChildrenChange& c);

    void setShadowRadiusChange(SurfaceComposerClient::Transaction& t,

            layer_id id, const ShadowRadiusChange& c);

    void setBlurRegionsChange(SurfaceComposerClient::Transaction& t,

libs/gui/LayerState.cpp

+0 −4
Original line number Diff line number Diff line
@@ -430,10 +430,6 @@ void layer_state_t::merge(const layer_state_t& other) { 
        barrierSurfaceControl_legacy = other.barrierSurfaceControl_legacy;

        barrierFrameNumber = other.barrierFrameNumber;

    }

    if (other.what & eReparentChildren) {

        what |= eReparentChildren;

        reparentSurfaceControl = other.reparentSurfaceControl;

    }

    if (other.what & eRelativeLayerChanged) {

        what |= eRelativeLayerChanged;

        what &= ~eLayerChanged;

libs/gui/SurfaceComposerClient.cpp

+0 −14
Original line number Diff line number Diff line
@@ -1157,20 +1157,6 @@ SurfaceComposerClient::Transaction::deferTransactionUntil_legacy( 
    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::reparentChildren(

        const sp<SurfaceControl>& sc, const sp<SurfaceControl>& newParent) {

    layer_state_t* s = getLayerState(sc);

    if (!s) {

        mStatus = BAD_INDEX;

        return *this;

    }

    s->what |= layer_state_t::eReparentChildren;

    s->reparentSurfaceControl = newParent;



    registerSurfaceControlForCallback(sc);

    return *this;

}



SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::reparent(

        const sp<SurfaceControl>& sc, const sp<SurfaceControl>& newParent) {

    layer_state_t* s = getLayerState(sc);