diff options
author | 2021-09-13 22:25:40 +0000 | |
---|---|---|
committer | 2021-09-13 22:25:40 +0000 | |
commit | e8ff142eebcb12fbd91c0363b2d9fc314a956aa1 (patch) | |
tree | c2668e795a35c6f8fbc4e4265bdf67be1f51133e | |
parent | f41d4af5b991ae3b8f0e5c4b28028540399f33a5 (diff) | |
parent | b108a6d8dd4cf8585dd4a9c98b3baa84251a1e07 (diff) |
Merge "Changed DisplayDevice.cpp to adhere to new getters in ProjectionSpace"
-rw-r--r-- | services/surfaceflinger/DisplayDevice.cpp | 18 | ||||
-rw-r--r-- | services/surfaceflinger/DisplayDevice.h | 4 |
2 files changed, 12 insertions, 10 deletions
diff --git a/services/surfaceflinger/DisplayDevice.cpp b/services/surfaceflinger/DisplayDevice.cpp index 802a17d981..2f8a90f857 100644 --- a/services/surfaceflinger/DisplayDevice.cpp +++ b/services/surfaceflinger/DisplayDevice.cpp @@ -116,11 +116,11 @@ void DisplayDevice::disconnect() { } int DisplayDevice::getWidth() const { - return mCompositionDisplay->getState().displaySpace.bounds.getWidth(); + return mCompositionDisplay->getState().displaySpace.getBounds().width; } int DisplayDevice::getHeight() const { - return mCompositionDisplay->getState().displaySpace.bounds.getHeight(); + return mCompositionDisplay->getState().displaySpace.getBounds().height; } void DisplayDevice::setDisplayName(const std::string& displayName) { @@ -262,13 +262,15 @@ void DisplayDevice::setProjection(ui::Rotation orientation, Rect layerStackSpace if (!orientedDisplaySpaceRect.isValid()) { // The destination frame can be invalid if it has never been set, // in that case we assume the whole display size. - orientedDisplaySpaceRect = getCompositionDisplay()->getState().displaySpace.bounds; + orientedDisplaySpaceRect = + getCompositionDisplay()->getState().displaySpace.getBoundsAsRect(); } if (layerStackSpaceRect.isEmpty()) { // The layerStackSpaceRect can be invalid if it has never been set, in that case // we assume the whole framebuffer size. - layerStackSpaceRect = getCompositionDisplay()->getState().framebufferSpace.bounds; + layerStackSpaceRect = + getCompositionDisplay()->getState().framebufferSpace.getBoundsAsRect(); if (orientation == ui::ROTATION_90 || orientation == ui::ROTATION_270) { std::swap(layerStackSpaceRect.right, layerStackSpaceRect.bottom); } @@ -336,8 +338,8 @@ bool DisplayDevice::isSecure() const { return mCompositionDisplay->isSecure(); } -const Rect& DisplayDevice::getBounds() const { - return mCompositionDisplay->getState().displaySpace.bounds; +const Rect DisplayDevice::getBounds() const { + return mCompositionDisplay->getState().displaySpace.getBoundsAsRect(); } const Region& DisplayDevice::getUndefinedRegion() const { @@ -361,11 +363,11 @@ const ui::Transform& DisplayDevice::getTransform() const { } const Rect& DisplayDevice::getLayerStackSpaceRect() const { - return mCompositionDisplay->getState().layerStackSpace.content; + return mCompositionDisplay->getState().layerStackSpace.getContent(); } const Rect& DisplayDevice::getOrientedDisplaySpaceRect() const { - return mCompositionDisplay->getState().orientedDisplaySpace.content; + return mCompositionDisplay->getState().orientedDisplaySpace.getContent(); } bool DisplayDevice::hasWideColorGamut() const { diff --git a/services/surfaceflinger/DisplayDevice.h b/services/surfaceflinger/DisplayDevice.h index 43a6bd540a..9de578f0dc 100644 --- a/services/surfaceflinger/DisplayDevice.h +++ b/services/surfaceflinger/DisplayDevice.h @@ -156,8 +156,8 @@ public: // Return true if intent is supported by the display. bool hasRenderIntent(ui::RenderIntent intent) const; - const Rect& getBounds() const; - const Rect& bounds() const { return getBounds(); } + const Rect getBounds() const; + const Rect bounds() const { return getBounds(); } void setDisplayName(const std::string& displayName); const std::string& getDisplayName() const { return mDisplayName; } |