summaryrefslogtreecommitdiff
path: root/libs/gui/LayerState.cpp
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2021-04-09 13:37:33 +0000
committer Robert Carr <racarr@google.com> 2021-04-09 17:15:51 -0700
commita5aedbd7ffaf42b7f287b587035018b42d61a41c (patch)
tree443ab16a8eac8bd6bb4defcc4d04b8dee03eeb90 /libs/gui/LayerState.cpp
parentcc6080011d6e7c7ab219d6c4f7eabc99574dca87 (diff)
Revert^2 "Remove setFrame from BufferStateLayer"
1014c4bf14f5c250b78d7e917fb59aaa9b0d9b0a Change-Id: I4c1cbc2b40e4f5f68bd5e6dcbe6c77405ad155b0
Diffstat (limited to 'libs/gui/LayerState.cpp')
-rw-r--r--libs/gui/LayerState.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 5b213ad5c3..809438534c 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -455,10 +455,6 @@ void layer_state_t::merge(const layer_state_t& other) {
what |= eCropChanged;
crop = other.crop;
}
- if (other.what & eFrameChanged) {
- what |= eFrameChanged;
- orientedDisplaySpaceRect = other.orientedDisplaySpaceRect;
- }
if (other.what & eBufferChanged) {
what |= eBufferChanged;
buffer = other.buffer;