From a5aedbd7ffaf42b7f287b587035018b42d61a41c Mon Sep 17 00:00:00 2001
From: Chavi Weingarten <chaviw@google.com>
Date: Fri, 9 Apr 2021 13:37:33 +0000
Subject: Revert^2 "Remove setFrame from BufferStateLayer"

1014c4bf14f5c250b78d7e917fb59aaa9b0d9b0a

Change-Id: I4c1cbc2b40e4f5f68bd5e6dcbe6c77405ad155b0
---
 libs/gui/LayerState.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'libs/gui/LayerState.cpp')

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;
-- 
cgit v1.2.3-59-g8ed1b