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

Commit 6ed1c08a authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant calls and correct some comments." into main am: 21fc3f3b 

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



Change-Id: I8842d2144d3d08b5ac4213c98dfe5bd7ae1e1f82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5e890c5 21fc3f3b

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -36,7 +36,7 @@ class HdrCapabilities; 
namespace compositionengine {

namespace compositionengine {





/**

/**

 * Encapsulates all the state and functionality for how colors should be

 * Encapsulates all the states and functionality for how colors should be

 * transformed for a display

 * transformed for a display

 */

 */

class DisplayColorProfile {

class DisplayColorProfile {

services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ struct GpuCompositionResult; 
} // namespace impl

} // namespace impl





/**

/**

 * Encapsulates all the state involved with composing layers for an output

 * Encapsulates all the states involved with composing layers for an output

 */

 */

class Output {

class Output {

public:

public:

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ struct OutputLayerCompositionState { 
    // The source crop for this layer on this output

    // The source crop for this layer on this output

    FloatRect sourceCrop;

    FloatRect sourceCrop;





    // The buffer transform to use for this layer o on this output.

    // The buffer transform to use for this layer on this output.

    Hwc2::Transform bufferTransform{static_cast<Hwc2::Transform>(0)};

    Hwc2::Transform bufferTransform{static_cast<Hwc2::Transform>(0)};





    // The dataspace for this layer

    // The dataspace for this layer

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ RequestedLayerState::RequestedLayerState(const LayerCreationArgs& args) 
    z = 0;

    z = 0;

    layerStack = ui::DEFAULT_LAYER_STACK;

    layerStack = ui::DEFAULT_LAYER_STACK;

    transformToDisplayInverse = false;

    transformToDisplayInverse = false;

    dataspace = ui::Dataspace::UNKNOWN;

    desiredHdrSdrRatio = 1.f;

    desiredHdrSdrRatio = 1.f;

    currentHdrSdrRatio = 1.f;

    currentHdrSdrRatio = 1.f;

    dataspaceRequested = false;

    dataspaceRequested = false;

services/surfaceflinger/Layer.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -4175,7 +4175,6 @@ void Layer::updateSnapshot(bool updateGeometry) { 
        prepareBasicGeometryCompositionState();

        prepareBasicGeometryCompositionState();

        prepareGeometryCompositionState();

        prepareGeometryCompositionState();

        snapshot->roundedCorner = getRoundedCornerState();

        snapshot->roundedCorner = getRoundedCornerState();

        snapshot->stretchEffect = getStretchEffect();

        snapshot->transformedBounds = mScreenBounds;

        snapshot->transformedBounds = mScreenBounds;

        if (mEffectiveShadowRadius > 0.f) {

        if (mEffectiveShadowRadius > 0.f) {

            snapshot->shadowSettings = mFlinger->mDrawingState.globalShadowSettings;

            snapshot->shadowSettings = mFlinger->mDrawingState.globalShadowSettings;