Skip to content

Commit 01b8126

Browse files
committed
surfaceflinger: Remove unnecessary std::move
Moving a temporary object prevents copy elision, and could reduce performance. This fixes -Wpessimizing-move compiler warning. Test: presubmit Bug: 154270751 Change-Id: I745e7dbcbde53eed95111e78d1251bea43b3869f
1 parent f9d7f29 commit 01b8126

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

services/surfaceflinger/DisplayHardware/HidlComposerHal.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ sp<GraphicBuffer> allocateClearSlotBuffer() {
209209
if (!buffer || buffer->initCheck() != ::android::OK) {
210210
return nullptr;
211211
}
212-
return std::move(buffer);
212+
return buffer;
213213
}
214214

215215
} // anonymous namespace

services/surfaceflinger/Tracing/TransactionProtoParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ perfetto::protos::TransactionState TransactionProtoParser::toProto(const Transac
6262

6363
proto.mutable_layer_changes()->Reserve(static_cast<int32_t>(t.states.size()));
6464
for (auto& layerState : t.states) {
65-
proto.mutable_layer_changes()->Add(std::move(toProto(layerState)));
65+
proto.mutable_layer_changes()->Add(toProto(layerState));
6666
}
6767

6868
proto.mutable_display_changes()->Reserve(static_cast<int32_t>(t.displays.size()));
6969
for (auto& displayState : t.displays) {
70-
proto.mutable_display_changes()->Add(std::move(toProto(displayState)));
70+
proto.mutable_display_changes()->Add(toProto(displayState));
7171
}
7272

7373
proto.mutable_merged_transaction_ids()->Reserve(

services/surfaceflinger/Tracing/TransactionTracing.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void TransactionTracing::addEntry(const std::vector<CommittedUpdates>& committed
244244
static_cast<int32_t>(update.createdLayers.size()));
245245

246246
for (const auto& args : update.createdLayers) {
247-
entryProto.mutable_added_layers()->Add(std::move(mProtoParser.toProto(args)));
247+
entryProto.mutable_added_layers()->Add(mProtoParser.toProto(args));
248248
}
249249

250250
entryProto.mutable_destroyed_layers()->Reserve(
@@ -276,7 +276,7 @@ void TransactionTracing::addEntry(const std::vector<CommittedUpdates>& committed
276276
static_cast<int32_t>(update.displayInfos.size()));
277277
for (auto& [layerStack, displayInfo] : update.displayInfos) {
278278
entryProto.mutable_displays()->Add(
279-
std::move(mProtoParser.toProto(displayInfo, layerStack.id)));
279+
mProtoParser.toProto(displayInfo, layerStack.id));
280280
}
281281
}
282282

services/surfaceflinger/tests/unittests/TransactionTracingTest.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,14 @@ class TransactionTracingLayerHandlingTest : public TransactionTracingTest {
131131
// add layers and add some layer transaction
132132
{
133133
frontend::Update update;
134-
update.layerCreationArgs.emplace_back(std::move(
134+
update.layerCreationArgs.emplace_back(
135135
getLayerCreationArgs(mParentLayerId, /*parentId=*/UNASSIGNED_LAYER_ID,
136136
/*layerIdToMirror=*/UNASSIGNED_LAYER_ID, /*flags=*/123,
137-
/*addToRoot=*/true)));
138-
update.layerCreationArgs.emplace_back(std::move(
137+
/*addToRoot=*/true));
138+
update.layerCreationArgs.emplace_back(
139139
getLayerCreationArgs(mChildLayerId, mParentLayerId,
140140
/*layerIdToMirror=*/UNASSIGNED_LAYER_ID, /*flags=*/456,
141-
/*addToRoot=*/true)));
141+
/*addToRoot=*/true));
142142
TransactionState transaction;
143143
transaction.id = 50;
144144
ResolvedComposerState layerState;

0 commit comments

Comments
 (0)