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

Commit a4cae586 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 am: cb7b8039 

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



Change-Id: I9ef2f136c8db92bad97f5e5238ee5ca2056a6ca6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c4531eb cb7b8039

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

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class HdrCapabilities; 
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

 */

class DisplayColorProfile {

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

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ struct GpuCompositionResult; 
} // 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 {

public:

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

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

    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)};



    // The dataspace for this layer

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

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

    layerStack = ui::DEFAULT_LAYER_STACK;

    transformToDisplayInverse = false;

    dataspace = ui::Dataspace::UNKNOWN;

    desiredHdrSdrRatio = 1.f;

    currentHdrSdrRatio = 1.f;

    dataspaceRequested = false;

services/surfaceflinger/Layer.cpp

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

        prepareGeometryCompositionState();

        snapshot->roundedCorner = getRoundedCornerState();

        snapshot->stretchEffect = getStretchEffect();

        snapshot->transformedBounds = mScreenBounds;

        if (mEffectiveShadowRadius > 0.f) {

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