commit 01c31167ce5880ec5f6f97ac82c81c85c9807f19
author Patrick Williams <pdwilliams@google.com> Mon Nov 14 17:45:19 2022 +0000
committer Patrick Williams <pdwilliams@google.com> Mon Nov 14 17:45:19 2022 +0000
tree 6c6eb22a02b2ea63be3aaa07b274a1918a7ef88b
parent 25d2e5e121a6c92eb8ba68bd6e10615aca5f0a8b

SF: Fix use after move bug in screen capture refactor

Bug: 238643986
Test: presubmits
Change-Id: I1ff3d214eafcf02a1a50e2dc80a0ff4c01807aaf

services/surfaceflinger/ScreenCaptureOutput.cpp

diff --git a/services/surfaceflinger/ScreenCaptureOutput.cpp b/services/surfaceflinger/ScreenCaptureOutput.cpp
index 8f93ba4..37b3218 100644
--- a/services/surfaceflinger/ScreenCaptureOutput.cpp
+++ b/services/surfaceflinger/ScreenCaptureOutput.cpp
@@ -24,10 +24,16 @@
 
 namespace android {
 
-std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutputArgs&& args) {
+std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutputArgs args) {
     std::shared_ptr<ScreenCaptureOutput> output = compositionengine::impl::createOutputTemplated<
-            ScreenCaptureOutput, compositionengine::CompositionEngine,
-            ScreenCaptureOutputArgs&&>(args.compositionEngine, std::move(args));
+            ScreenCaptureOutput, compositionengine::CompositionEngine, const RenderArea&,
+            std::unordered_set<compositionengine::LayerFE*>,
+            const compositionengine::Output::ColorProfile&, bool>(args.compositionEngine,
+                                                                  args.renderArea,
+                                                                  std::move(
+                                                                          args.filterForScreenshot),
+                                                                  args.colorProfile,
+                                                                  args.regionSampling);
     output->editState().isSecure = args.renderArea.isSecure();
     output->setCompositionEnabled(true);
     output->setLayerFilter({args.layerStack});
@@ -50,11 +56,14 @@
     return output;
 }
 
-ScreenCaptureOutput::ScreenCaptureOutput(ScreenCaptureOutputArgs&& args)
-      : mRenderArea(args.renderArea),
-        mFilterForScreenshot(std::move(args.filterForScreenshot)),
-        mColorProfile(args.colorProfile),
-        mRegionSampling(args.regionSampling) {}
+ScreenCaptureOutput::ScreenCaptureOutput(
+        const RenderArea& renderArea,
+        std::unordered_set<compositionengine::LayerFE*> filterForScreenshot,
+        const compositionengine::Output::ColorProfile& colorProfile, bool regionSampling)
+      : mRenderArea(renderArea),
+        mFilterForScreenshot(std::move(filterForScreenshot)),
+        mColorProfile(colorProfile),
+        mRegionSampling(regionSampling) {}
 
 void ScreenCaptureOutput::updateColorProfile(const compositionengine::CompositionRefreshArgs&) {
     auto& outputState = editState();

services/surfaceflinger/ScreenCaptureOutput.h

diff --git a/services/surfaceflinger/ScreenCaptureOutput.h b/services/surfaceflinger/ScreenCaptureOutput.h
index 61b5ddb..5dffc1d 100644
--- a/services/surfaceflinger/ScreenCaptureOutput.h
+++ b/services/surfaceflinger/ScreenCaptureOutput.h
@@ -43,7 +43,10 @@
 // SurfaceFlinger::captureLayers and SurfaceFlinger::captureDisplay.
 class ScreenCaptureOutput : public compositionengine::impl::Output {
 public:
-    ScreenCaptureOutput(ScreenCaptureOutputArgs&&);
+    ScreenCaptureOutput(const RenderArea& renderArea,
+                        std::unordered_set<compositionengine::LayerFE*> filterForScreenshot,
+                        const compositionengine::Output::ColorProfile& colorProfile,
+                        bool regionSampling);
 
     void updateColorProfile(const compositionengine::CompositionRefreshArgs&) override;
 
@@ -64,6 +67,6 @@
     const bool mRegionSampling;
 };
 
-std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutputArgs&&);
+std::shared_ptr<ScreenCaptureOutput> createScreenCaptureOutput(ScreenCaptureOutputArgs);
 
 } // namespace android