Bug 1723170 - Remove sAsyncPanZoomControllerCount. r=tnikkel,decoder

All the code that uses it was conditioned on ShouldUseProgressivePaint(),
which was changed to always return false in the previous commit.

This also fixes a racy access to this static variable.

Depends on D123712

Differential Revision: https://phabricator.services.mozilla.com/D123713
This commit is contained in:
Botond Ballo 2021-09-01 19:36:35 +00:00
parent 1ab819eb65
commit 78ddb2abb6
2 changed files with 1 additions and 11 deletions

View File

@ -519,9 +519,6 @@ static const double kDefaultEstimatedPaintDurationMs = 50;
static bool gIsHighMemSystem = false;
static bool IsHighMemSystem() { return gIsHighMemSystem; }
// Counter used to give each APZC a unique id
static uint32_t sAsyncPanZoomControllerCount = 0;
AsyncPanZoomAnimation* PlatformSpecificStateBase::CreateFlingAnimation(
AsyncPanZoomController& aApzc, const FlingHandoffState& aHandoffState,
float aPLPPI) {
@ -732,7 +729,7 @@ AsyncPanZoomController::AsyncPanZoomController(
mNotificationBlockers(0),
mInputQueue(aInputQueue),
mPinchPaintTimerSet(false),
mAPZCId(sAsyncPanZoomControllerCount++),
mAPZCId(0),
mSharedLock(nullptr),
mTestAttributeAppliers(0),
mAsyncTransformAppliedToContent(false),

View File

@ -300,13 +300,6 @@ extern "C" const char* __tsan_default_suppressions() {
"race:mozilla::gl::MesaMemoryLeakWorkaround\n"
// Bug 1723321
"race:mozilla::layers::AsyncPanZoomController::AsyncPanZoomController\n"
// Bug 1723170
"race:mozilla::layers::APZCTreeManager::NewAPZCInstance\n"
// End of suppressions.
; // Please keep this semicolon.
}