From ddd3e1cac3fb2cf6a935291f7c53af9a66d38396 Mon Sep 17 00:00:00 2001 From: Botond Ballo Date: Wed, 9 Apr 2014 14:07:33 -0400 Subject: [PATCH] Bug 976605 - Make AsyncPanZoomController::mMonitor 'mutable' to allow entering it from 'const' methods. r=kats --HG-- extra : source : 2cbc69f1a7c07e26568dc228a83d9443ab4d4233 --- gfx/layers/ipc/AsyncPanZoomController.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gfx/layers/ipc/AsyncPanZoomController.h b/gfx/layers/ipc/AsyncPanZoomController.h index c89d43bb9c6..3e7863336c9 100644 --- a/gfx/layers/ipc/AsyncPanZoomController.h +++ b/gfx/layers/ipc/AsyncPanZoomController.h @@ -643,7 +643,9 @@ protected: // monitor should be held. When setting |mState|, either the SetState() // function can be used, or the monitor can be held and then |mState| updated. // IMPORTANT: See the note about lock ordering at the top of APZCTreeManager.h. - ReentrantMonitor mMonitor; + // This is mutable to allow entering it from 'const' methods; doing otherwise + // would significantly limit what methods could be 'const'. + mutable ReentrantMonitor mMonitor; // Specifies whether we should use touch-action css property. Initialized from // the preferences. This property (in comparison with the global one) simplifies