summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Leon Scroggins III <scroggo@google.com> 2023-03-02 14:21:44 -0500
committer Leon Scroggins III <scroggo@google.com> 2023-03-03 10:38:06 -0500
commit1af0fb6ed00132a4f9c8f45eae420a7f552cd37a (patch)
tree57fb3288c30b7ff61166444f45e7786ba9b48e73 /services/surfaceflinger/SurfaceFlinger.cpp
parent5b6ca88e1444ebba97db26a226c9b3a8f169062b (diff)
Rename "leader" display to "pacesetter"
"Leader" became ambiguous once we began to consider that there are two orthogonal concepts that "leader" seems to imply: - The display with the highest refresh rate (originally called "leader") - The display that is refreshed first in a given update (assuming it's being updated) To better distinguish between the two, we've come up with new names: - pacesetter - front runner (for the second concept) Change uses of "leader" to "pacesetter" throughout SF and Scheduler. Bug: 255635821 Bug: 256196556 Test: m Change-Id: Ia02c35dd442d310695f1ce873fbaf30910c12419
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 78be3c0ad5..38b82b5725 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3336,7 +3336,7 @@ void SurfaceFlinger::processDisplayAdded(const wp<IBinder>& displayToken,
}
if (display->isVirtual()) {
- display->adjustRefreshRate(mScheduler->getLeaderRefreshRate());
+ display->adjustRefreshRate(mScheduler->getPacesetterRefreshRate());
}
mDisplays.try_emplace(displayToken, std::move(display));
@@ -7572,15 +7572,15 @@ void SurfaceFlinger::onActiveDisplayChangedLocked(const DisplayDevice* inactiveD
updateActiveDisplayVsyncLocked(activeDisplay);
mScheduler->setModeChangePending(false);
- mScheduler->setLeaderDisplay(mActiveDisplayId);
+ mScheduler->setPacesetterDisplay(mActiveDisplayId);
onActiveDisplaySizeChanged(activeDisplay);
mActiveDisplayTransformHint = activeDisplay.getTransformHint();
- // The policy of the new active/leader display may have changed while it was inactive. In that
- // case, its preferred mode has not been propagated to HWC (via setDesiredActiveMode). In either
- // case, the Scheduler's cachedModeChangedParams must be initialized to the newly active mode,
- // and the kernel idle timer of the newly active display must be toggled.
+ // The policy of the new active/pacesetter display may have changed while it was inactive. In
+ // that case, its preferred mode has not been propagated to HWC (via setDesiredActiveMode). In
+ // either case, the Scheduler's cachedModeChangedParams must be initialized to the newly active
+ // mode, and the kernel idle timer of the newly active display must be toggled.
constexpr bool kForce = true;
applyRefreshRateSelectorPolicy(mActiveDisplayId, activeDisplay.refreshRateSelector(), kForce);
}