From 766c9c53dd3602beb938b76c4376ded2630f59bb Mon Sep 17 00:00:00 2001 From: chaviw Date: Wed, 10 Feb 2021 17:36:47 -0800 Subject: Simplify width, height, transform variable for BSL Initial refactor to remove setFrame and use crop and transform instead. Renamed some BSL variables to avoid confusion. Test: Builds Bug: 170765639 Change-Id: I907940638c32103cb867c3b1566b9d4ce26c7274 --- services/surfaceflinger/Layer.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'services/surfaceflinger/Layer.cpp') diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 061ad0e03e..d7d349a2b5 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -109,11 +109,11 @@ Layer::Layer(const LayerCreationArgs& args) mCurrentState.layerStack = 0; mCurrentState.sequence = 0; mCurrentState.requested_legacy = mCurrentState.active_legacy; - mCurrentState.active.w = UINT32_MAX; - mCurrentState.active.h = UINT32_MAX; - mCurrentState.active.transform.set(0, 0); + mCurrentState.width = UINT32_MAX; + mCurrentState.height = UINT32_MAX; + mCurrentState.transform.set(0, 0); mCurrentState.frameNumber = 0; - mCurrentState.transform = 0; + mCurrentState.bufferTransform = 0; mCurrentState.transformToDisplayInverse = false; mCurrentState.crop.makeInvalid(); mCurrentState.acquireFence = new Fence(-1); @@ -2431,7 +2431,7 @@ void Layer::writeToProtoCommonState(LayerProto* layerInfo, LayerVector::StateSet const LayerVector& children = useDrawing ? mDrawingChildren : mCurrentChildren; const State& state = useDrawing ? mDrawingState : mCurrentState; - ui::Transform requestedTransform = state.active_legacy.transform; + ui::Transform requestedTransform = state.transform; if (traceFlags & SurfaceTracing::TRACE_CRITICAL) { layerInfo->set_id(sequence); @@ -2460,11 +2460,10 @@ void Layer::writeToProtoCommonState(LayerProto* layerInfo, LayerVector::StateSet return layerInfo->mutable_requested_position(); }); - LayerProtoHelper::writeSizeToProto(state.active_legacy.w, state.active_legacy.h, + LayerProtoHelper::writeSizeToProto(state.width, state.height, [&]() { return layerInfo->mutable_size(); }); - LayerProtoHelper::writeToProto(state.crop_legacy, - [&]() { return layerInfo->mutable_crop(); }); + LayerProtoHelper::writeToProto(state.crop, [&]() { return layerInfo->mutable_crop(); }); layerInfo->set_is_opaque(isOpaque(state)); -- cgit v1.2.3-59-g8ed1b