Bug 775170 - Use naming convention from coding style guide for static member of StateMachineTracker. r=doublec
authorMatthew Gregan <kinetik@flim.org>
Wed, 18 Jul 2012 13:26:24 -0400
changeset 99806 99e1cfe5ccba9070b7dfc4be6d1da0d15c8dba88
parent 99805 752d38520b854c535fcc9779ed2e13f31ef4ed19
child 99807 eed94b0e2d4ae240a80bbb634e1f1f6ba0ff6513
push id12198
push usermgregan@mozilla.com
push dateThu, 19 Jul 2012 19:08:17 +0000
treeherdermozilla-inbound@99e1cfe5ccba [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdoublec
bugs775170
milestone17.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 775170 - Use naming convention from coding style guide for static member of StateMachineTracker. r=doublec
content/media/nsBuiltinDecoderStateMachine.cpp
--- a/content/media/nsBuiltinDecoderStateMachine.cpp
+++ b/content/media/nsBuiltinDecoderStateMachine.cpp
@@ -216,17 +216,17 @@ public:
   // Returns true if aStateMachine has a pending request for a
   // decode thread.
   bool IsQueued(nsBuiltinDecoderStateMachine* aStateMachine);
 #endif
 
 private:
   // Holds global instance of StateMachineTracker.
   // Writable on main thread only.
-  static StateMachineTracker* mInstance;
+  static StateMachineTracker* sInstance;
 
   // Reentrant monitor that must be obtained to access
   // the decode thread count member and methods.
   ReentrantMonitor mMonitor;
 
   // Number of instances of nsBuiltinDecoderStateMachine
   // that are currently instantiated. Access on the
   // main thread only.
@@ -242,25 +242,25 @@ private:
   // the mMonitor.
   nsIThread* mStateMachineThread;
 
   // Queue of state machines waiting for decode threads. Entries at the front
   // get their threads first.
   nsDeque mPending;
 };
 
-StateMachineTracker* StateMachineTracker::mInstance = nsnull;
+StateMachineTracker* StateMachineTracker::sInstance = nsnull;
 
 StateMachineTracker& StateMachineTracker::Instance()
 {
-  if (!mInstance) {
+  if (!sInstance) {
     NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
-    mInstance = new StateMachineTracker();
+    sInstance = new StateMachineTracker();
   }
-  return *mInstance;
+  return *sInstance;
 }
 
 void StateMachineTracker::EnsureGlobalStateMachine() 
 {
   NS_ASSERTION(NS_IsMainThread(), "Should be on main thread.");
   ReentrantMonitorAutoEnter mon(mMonitor);
   if (mStateMachineCount == 0) {
     NS_ASSERTION(!mStateMachineThread, "Should have null state machine thread!");
@@ -298,17 +298,17 @@ void StateMachineTracker::CleanupGlobalS
     {
       ReentrantMonitorAutoEnter mon(mMonitor);
       nsCOMPtr<nsIRunnable> event = new ShutdownThreadEvent(mStateMachineThread);
       NS_RELEASE(mStateMachineThread);
       mStateMachineThread = nsnull;
       NS_DispatchToMainThread(event);
 
       NS_ASSERTION(mDecodeThreadCount == 0, "Decode thread count must be zero.");
-      mInstance = nsnull;
+      sInstance = nsnull;
     }
     delete this;
   }
 }
 
 void StateMachineTracker::NoteDecodeThreadDestroyed()
 {
   ReentrantMonitorAutoEnter mon(mMonitor);