commit e85d7fad8633b24e1613daf9dae6630bf8dc1488
author Dominik Laskowski <domlaskowski@google.com> Mon May 15 10:50:22 2023 -0400
committer Dominik Laskowski <domlaskowski@google.com> Mon May 15 10:52:55 2023 -0400
tree 370a3164909cb60071f845aaf36cb66a981469c5
parent 1f8fa3f9cd57b4b9d0e3735af6c968bc6b472fc3

Revert "SF: Encapsulate frame targeting"

This reverts commit c183eed053289c242c32c5c35a7071863165a61d.

Reason for revert: Regression in SF performance.

Bug: 281884106
Test: Jank suites
Change-Id: I05adaa57c955a8c09c210943bc06977b48362aa4

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index 833984f..945e488 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -20,11 +20,6 @@
 #include <chrono>
 #include <variant>
 
-#include <ftl/fake_guard.h>
-#include <ftl/match.h>
-#include <gui/ScreenCaptureResults.h>
-#include <ui/DynamicDisplayInfo.h>
-
 #include <compositionengine/Display.h>
 #include <compositionengine/LayerFECompositionState.h>
 #include <compositionengine/OutputLayer.h>
@@ -32,7 +27,11 @@
 #include <compositionengine/impl/Display.h>
 #include <compositionengine/impl/OutputLayerCompositionState.h>
 #include <compositionengine/mock/DisplaySurface.h>
+#include <ftl/fake_guard.h>
+#include <ftl/match.h>
+#include <gui/ScreenCaptureResults.h>
 
+#include <ui/DynamicDisplayInfo.h>
 #include "DisplayDevice.h"
 #include "FakeVsyncConfiguration.h"
 #include "FrameTracer/FrameTracer.h"
@@ -45,6 +44,7 @@
 #include "Scheduler/RefreshRateSelector.h"
 #include "StartPropertySetThread.h"
 #include "SurfaceFlinger.h"
+#include "SurfaceFlingerDefaultFactory.h"
 #include "TestableScheduler.h"
 #include "mock/DisplayHardware/MockComposer.h"
 #include "mock/DisplayHardware/MockDisplayMode.h"
@@ -360,42 +360,25 @@
         commitTransactionsLocked(eDisplayTransactionNeeded);
     }
 
-    void commit(TimePoint frameTime, VsyncId vsyncId, TimePoint expectedVsyncTime,
-                bool composite = false) {
-        constexpr bool kBackpressureGpuComposition = true;
-        scheduler::FrameTargeter frameTargeter(kBackpressureGpuComposition);
-
-        frameTargeter.beginFrame({.frameBeginTime = frameTime,
-                                  .vsyncId = vsyncId,
-                                  .expectedVsyncTime = expectedVsyncTime,
-                                  .sfWorkDuration = 10ms},
-                                 *mScheduler->getVsyncSchedule());
-
-        mFlinger->commit(frameTargeter.target());
-
-        if (composite) {
-            mFlinger->composite(frameTargeter);
-        }
+    TimePoint commit(TimePoint frameTime, VsyncId vsyncId, TimePoint expectedVsyncTime) {
+        mFlinger->commit(frameTime, vsyncId, expectedVsyncTime);
+        return frameTime;
     }
 
-    void commit(TimePoint frameTime, VsyncId vsyncId, bool composite = false) {
-        return commit(frameTime, vsyncId, frameTime + Period(10ms), composite);
+    TimePoint commit(TimePoint frameTime, VsyncId vsyncId) {
+        return commit(frameTime, vsyncId, frameTime + Period(10ms));
     }
 
-    void commit(bool composite = false) {
+    TimePoint commit() {
         const TimePoint frameTime = scheduler::SchedulerClock::now();
-        commit(frameTime, kVsyncId, composite);
+        return commit(frameTime, kVsyncId);
     }
 
     void commitAndComposite(TimePoint frameTime, VsyncId vsyncId, TimePoint expectedVsyncTime) {
-        constexpr bool kComposite = true;
-        commit(frameTime, vsyncId, expectedVsyncTime, kComposite);
+        mFlinger->composite(commit(frameTime, vsyncId, expectedVsyncTime), vsyncId);
     }
 
-    void commitAndComposite() {
-        constexpr bool kComposite = true;
-        commit(kComposite);
-    }
+    void commitAndComposite() { mFlinger->composite(commit(), kVsyncId); }
 
     auto createDisplay(const String8& displayName, bool secure, float requestedRefreshRate = 0.0f) {
         return mFlinger->createDisplay(displayName, secure, requestedRefreshRate);