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

Commit 9d1abea9 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

surfaceflinger: reorder width and height in RenderArea ctor 

Height is before width only in a crazy world.

Bug: 113041375
Test: take screenshot, rotate screen, screencap
Change-Id: Ia10b26dbba9a6a91abb5dae9fbe20bf17cd3e78f
parent b68fac79

services/surfaceflinger/DisplayDevice.h

+4 −4
Original line number Diff line number Diff line
@@ -335,11 +335,11 @@ class DisplayRenderArea : public RenderArea { 
public:

    DisplayRenderArea(const sp<const DisplayDevice> device,

                      ISurfaceComposer::Rotation rotation = ISurfaceComposer::eRotateNone)

          : DisplayRenderArea(device, device->getBounds(), device->getHeight(), device->getWidth(),

          : DisplayRenderArea(device, device->getBounds(), device->getWidth(), device->getHeight(),

                              rotation) {}

    DisplayRenderArea(const sp<const DisplayDevice> device, Rect sourceCrop, uint32_t reqHeight,

                      uint32_t reqWidth, ISurfaceComposer::Rotation rotation)

          : RenderArea(reqHeight, reqWidth, CaptureFill::OPAQUE, rotation), mDevice(device),

    DisplayRenderArea(const sp<const DisplayDevice> device, Rect sourceCrop, uint32_t reqWidth,

                      uint32_t reqHeight, ISurfaceComposer::Rotation rotation)

          : RenderArea(reqWidth, reqHeight, CaptureFill::OPAQUE, rotation), mDevice(device),

                              mSourceCrop(sourceCrop) {}



    const ui::Transform& getTransform() const override { return mDevice->getTransform(); }

services/surfaceflinger/RenderArea.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ ui::Transform::orientation_flags fromRotation(ISurfaceComposer::Rotation rotatio 
    return ui::Transform::ROT_0;

}



RenderArea::RenderArea(uint32_t reqHeight, uint32_t reqWidth, CaptureFill captureFill,

RenderArea::RenderArea(uint32_t reqWidth, uint32_t reqHeight, CaptureFill captureFill,

                       ISurfaceComposer::Rotation rotation)

      : mReqHeight(reqHeight), mReqWidth(reqWidth), mCaptureFill(captureFill) {

      : mReqWidth(reqWidth), mReqHeight(reqHeight), mCaptureFill(captureFill) {

    mRotationFlags = fromRotation(rotation);

}

services/surfaceflinger/RenderArea.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ public: 


    static float getCaptureFillValue(CaptureFill captureFill);



    RenderArea(uint32_t reqHeight, uint32_t reqWidth, CaptureFill captureFill,

    RenderArea(uint32_t reqWidth, uint32_t reqHeight, CaptureFill captureFill,

               ISurfaceComposer::Rotation rotation = ISurfaceComposer::eRotateNone);



    virtual ~RenderArea() = default;
@@ -71,8 +71,8 @@ public: 
    status_t updateDimensions(int displayRotation);



private:

    uint32_t mReqHeight;

    uint32_t mReqWidth;

    uint32_t mReqHeight;

    ui::Transform::orientation_flags mRotationFlags;

    CaptureFill mCaptureFill;

};

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4915,7 +4915,7 @@ status_t SurfaceFlinger::captureScreen(const sp<IBinder>& displayToken, 
        }

    }



    DisplayRenderArea renderArea(display, sourceCrop, reqHeight, reqWidth, rotation);

    DisplayRenderArea renderArea(display, sourceCrop, reqWidth, reqHeight, rotation);



    auto traverseLayers = std::bind(std::mem_fn(&SurfaceFlinger::traverseLayersInDisplay), this,

                                    display, minLayerZ, maxLayerZ, std::placeholders::_1);
@@ -4931,7 +4931,7 @@ status_t SurfaceFlinger::captureLayers(const sp<IBinder>& layerHandleBinder, 
    public:

        LayerRenderArea(SurfaceFlinger* flinger, const sp<Layer>& layer, const Rect crop,

                        int32_t reqWidth, int32_t reqHeight, bool childrenOnly)

              : RenderArea(reqHeight, reqWidth, CaptureFill::CLEAR),

              : RenderArea(reqWidth, reqHeight, CaptureFill::CLEAR),

                mLayer(layer),

                mCrop(crop),

                mFlinger(flinger),