summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceComposerClient.cpp
diff options
context:
space:
mode:
author Marin Shalamanov <shalamanov@google.com> 2020-07-29 23:34:07 +0200
committer Marin Shalamanov <shalamanov@google.com> 2020-08-11 16:44:07 +0200
commit6ad317c0dfcf07723ee36ed33c3eb16585469f63 (patch)
tree728a95dad18752fd36d7510118ee9eca31637387 /libs/gui/SurfaceComposerClient.cpp
parent141959209922a15acd27ee66e1408525f541a9dc (diff)
[SF, CE] Rename viewport, frame and destinationClip
This change introduces a new class ProjectionSpace and uses it in OutputCompositionState to describe the layer stack space, the physical display space and the oriented display space. We rename viewport to layerStackSpaceRect, frame to orientedDisplaySpaceRect and destinationClip displaySpaceRect. This aims to provide better readibility of the code and it's also consistent with SurfaceControl.setDisplayProjction where layerStackRect and displayRect are used for viewport and frame. Bug: 161793589 Bug: 160404780 Test: m && flash device Test: atest libsurfaceflinger_unittest libcompositionengine_test Test: adb shell dumpsys SurfaceFlinger Change-Id: Iee20b908157cbef4de4d9addf429f98356ec942d
Diffstat (limited to 'libs/gui/SurfaceComposerClient.cpp')
-rw-r--r--libs/gui/SurfaceComposerClient.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/SurfaceComposerClient.cpp b/libs/gui/SurfaceComposerClient.cpp
index b51bf1f525..62a3c45c1e 100644
--- a/libs/gui/SurfaceComposerClient.cpp
+++ b/libs/gui/SurfaceComposerClient.cpp
@@ -1137,7 +1137,7 @@ SurfaceComposerClient::Transaction& SurfaceComposerClient::Transaction::setFrame
return *this;
}
s->what |= layer_state_t::eFrameChanged;
- s->frame = frame;
+ s->orientedDisplaySpaceRect = frame;
registerSurfaceControlForCallback(sc);
return *this;
@@ -1545,8 +1545,8 @@ void SurfaceComposerClient::Transaction::setDisplayProjection(const sp<IBinder>&
const Rect& displayRect) {
DisplayState& s(getDisplayState(token));
s.orientation = orientation;
- s.viewport = layerStackRect;
- s.frame = displayRect;
+ s.layerStackSpaceRect = layerStackRect;
+ s.orientedDisplaySpaceRect = displayRect;
s.what |= DisplayState::eDisplayProjectionChanged;
mForceSynchronous = true; // TODO: do we actually still need this?
}