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

Commit 60d6922a authored by Pablo Ceballos's avatar Pablo Ceballos
Browse files

libsgui: Change Rect default constructor 

The current Rect default constructor initializes to all zeroes. Change
it to initialize to an invalid Rect.

Modify all of the existing invocations of the default constructor to
maintain the existing behavior.

Bug 18173359

Change-Id: Ibbad076f1550a94f56d7b1cf5350071f2022e09a
parent 72f314a5

include/gui/CpuConsumer.h

+19 −0
Original line number Diff line number Diff line
@@ -67,6 +67,25 @@ class CpuConsumer : public ConsumerBase 
        uint8_t    *dataCr;

        uint32_t    chromaStride;

        uint32_t    chromaStep;



        LockedBuffer() :

            data(NULL),

            width(0),

            height(0),

            format(PIXEL_FORMAT_NONE),

            stride(0),

            crop(0, 0, 0, 0),

            transform(0),

            scalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),

            timestamp(0),

            dataSpace(HAL_DATASPACE_UNKNOWN),

            frameNumber(0),

            flexFormat(PIXEL_FORMAT_NONE),

            dataCb(NULL),

            dataCr(NULL),

            chromaStride(0),

            chromaStep(0)

        {}

    };



    // Create a new CPU consumer. The maxLockedBuffers parameter specifies

include/private/gui/LayerState.h

+3 −2
Original line number Diff line number Diff line
@@ -58,11 +58,10 @@ struct layer_state_t { 
        :   what(0),

            x(0), y(0), z(0), w(0), h(0), layerStack(0),

            alpha(0), flags(0), mask(0),

            reserved(0)

            reserved(0), crop(Rect::INVALID_RECT)

    {

        matrix.dsdx = matrix.dtdy = 1.0f;

        matrix.dsdy = matrix.dtdx = 0.0f;

        crop.makeInvalid();

    }



    status_t    write(Parcel& output) const;
@@ -117,6 +116,8 @@ struct DisplayState { 
        eDisplaySizeChanged         = 0x08

    };



    DisplayState();



    uint32_t what;

    sp<IBinder> token;

    sp<IGraphicBufferProducer> surface;

include/private/ui/RegionHelper.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public: 
    }



    void operator()(region_rasterizer& rasterizer) {

        RECT current;

        RECT current(Rect::EMPTY_RECT);

        do {

            SpannerInner spannerInner(spanner.lhs, spanner.rhs);

            int inside = spanner.next(current.top, current.bottom);

include/ui/Rect.h

+2 −3
Original line number Diff line number Diff line
@@ -32,13 +32,12 @@ public: 
    typedef ARect::value_type value_type;



    static const Rect INVALID_RECT;

    static const Rect EMPTY_RECT;



    // we don't provide copy-ctor and operator= on purpose

    // because we want the compiler generated versions



    inline Rect() {

      left = right = top = bottom = 0;

    }

    inline Rect() : Rect(INVALID_RECT) {}



    inline Rect(int32_t w, int32_t h) {

        left = top = 0;

libs/gui/BufferItem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
namespace android {



BufferItem::BufferItem() :

    mCrop(Rect::INVALID_RECT),

    mTransform(0),

    mScalingMode(NATIVE_WINDOW_SCALING_MODE_FREEZE),

    mTimestamp(0),
@@ -34,7 +35,6 @@ BufferItem::BufferItem() : 
    mIsDroppable(false),

    mAcquireCalled(false),

    mTransformToDisplayInverse(false) {

    mCrop.makeInvalid();

}



BufferItem::~BufferItem() {}