Get rid of unused ASurfaceControl in frame metrics listener callback
Test: Existing tests Change-Id: Ia071814dabfc762d00d3324bfaa343ff94ab8338
This commit is contained in:
@@ -731,8 +731,8 @@ FrameInfo* CanvasContext::getFrameInfoFromLast4(uint64_t frameNumber, uint32_t s
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void CanvasContext::onSurfaceStatsAvailable(void* context, ASurfaceControl* control,
|
||||
int32_t surfaceControlId, ASurfaceControlStats* stats) {
|
||||
void CanvasContext::onSurfaceStatsAvailable(void* context, int32_t surfaceControlId,
|
||||
ASurfaceControlStats* stats) {
|
||||
auto* instance = static_cast<CanvasContext*>(context);
|
||||
|
||||
const ASurfaceControlFunctions& functions =
|
||||
|
||||
@@ -196,8 +196,8 @@ public:
|
||||
SkISize getNextFrameSize() const;
|
||||
|
||||
// Called when SurfaceStats are available.
|
||||
static void onSurfaceStatsAvailable(void* context, ASurfaceControl* control,
|
||||
int32_t surfaceControlId, ASurfaceControlStats* stats);
|
||||
static void onSurfaceStatsAvailable(void* context, int32_t surfaceControlId,
|
||||
ASurfaceControlStats* stats);
|
||||
|
||||
void setASurfaceTransactionCallback(
|
||||
const std::function<bool(int64_t, int64_t, int64_t)>& callback) {
|
||||
|
||||
@@ -149,16 +149,15 @@ struct ASurfaceControlStats {
|
||||
void ASurfaceControl_registerSurfaceStatsListener(ASurfaceControl* control, int32_t id,
|
||||
void* context,
|
||||
ASurfaceControl_SurfaceStatsListener func) {
|
||||
SurfaceStatsCallback callback = [func, control, id](void* callback_context, nsecs_t,
|
||||
const sp<Fence>&,
|
||||
const SurfaceStats& surfaceStats) {
|
||||
SurfaceStatsCallback callback = [func, id](void* callback_context, nsecs_t, const sp<Fence>&,
|
||||
const SurfaceStats& surfaceStats) {
|
||||
ASurfaceControlStats aSurfaceControlStats;
|
||||
|
||||
aSurfaceControlStats.acquireTime = surfaceStats.acquireTime;
|
||||
aSurfaceControlStats.previousReleaseFence = surfaceStats.previousReleaseFence;
|
||||
aSurfaceControlStats.frameNumber = surfaceStats.eventStats.frameNumber;
|
||||
|
||||
(*func)(callback_context, control, id, &aSurfaceControlStats);
|
||||
(*func)(callback_context, id, &aSurfaceControlStats);
|
||||
};
|
||||
|
||||
TransactionCompletedListener::getInstance()->addSurfaceStatsListener(context,
|
||||
|
||||
Reference in New Issue
Block a user