diff options
| author | 2021-03-16 13:52:44 +0000 | |
|---|---|---|
| committer | 2021-03-16 13:52:44 +0000 | |
| commit | 2bbc3a88bd653c050ea270b6456747b40a44c5b3 (patch) | |
| tree | bb35b9c3c8b44daf3929d5f61f00263579242344 /libs/gui/LayerState.cpp | |
| parent | c6465a548630238bdf71a1aa3ebdb4ede7e016d6 (diff) | |
| parent | 25714500c80a7c4efa5cd82ccd914a57bc5d51e6 (diff) | |
Merge "Rename crop_legacy to just crop" into sc-dev
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index 288bf92c15..6bb8bf2d5b 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -41,7 +41,6 @@ layer_state_t::layer_state_t() flags(0), mask(0), reserved(0), - crop_legacy(Rect::INVALID_RECT), cornerRadius(0.0f), backgroundBlurRadius(0), barrierFrameNumber(0), @@ -85,7 +84,7 @@ status_t layer_state_t::write(Parcel& output) const SAFE_PARCEL(output.writeUint32, flags); SAFE_PARCEL(output.writeUint32, mask); SAFE_PARCEL(matrix.write, output); - SAFE_PARCEL(output.write, crop_legacy); + SAFE_PARCEL(output.write, crop); SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, barrierSurfaceControl_legacy); SAFE_PARCEL(SurfaceControl::writeNullableToParcel, output, reparentSurfaceControl); SAFE_PARCEL(output.writeUint64, barrierFrameNumber); @@ -191,7 +190,7 @@ status_t layer_state_t::read(const Parcel& input) SAFE_PARCEL(input.readUint32, &mask); SAFE_PARCEL(matrix.read, input); - SAFE_PARCEL(input.read, crop_legacy); + SAFE_PARCEL(input.read, crop); SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &barrierSurfaceControl_legacy); SAFE_PARCEL(SurfaceControl::readNullableFromParcel, input, &reparentSurfaceControl); SAFE_PARCEL(input.readUint64, &barrierFrameNumber); @@ -407,10 +406,6 @@ void layer_state_t::merge(const layer_state_t& other) { what |= eLayerStackChanged; layerStack = other.layerStack; } - if (other.what & eCropChanged_legacy) { - what |= eCropChanged_legacy; - crop_legacy = other.crop_legacy; - } if (other.what & eCornerRadiusChanged) { what |= eCornerRadiusChanged; cornerRadius = other.cornerRadius; |