Bug 1098701. Part 2: Allow disabling thread assertions. r=kats

dothq · Jan 23, 2015 · fece617 · fece617
1 parent 130c675
commit fece617
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/widget/VsyncDispatcher.cpp b/widget/VsyncDispatcher.cpp
@@ -7,6 +7,7 @@
 #include "VsyncDispatcher.h"
 #include "VsyncSource.h"
 #include "gfxPlatform.h"
+#include "mozilla/layers/Compositor.h"
 #include "mozilla/layers/CompositorParent.h"
 
 #ifdef MOZ_ENABLE_PROFILER_SPS
@@ -15,6 +16,14 @@
 #endif
 
 namespace mozilla {
+static bool sThreadAssertionsEnabled = true;
+
+void CompositorVsyncDispatcher::SetThreadAssertionsEnabled(bool aEnable)
+{
+  // Should only be used in test environments
+  MOZ_ASSERT(NS_IsMainThread());
+  sThreadAssertionsEnabled = aEnable;
+}
 
 CompositorVsyncDispatcher::CompositorVsyncDispatcher()
   : mCompositorObserverLock("CompositorObserverLock")
@@ -47,6 +56,16 @@ CompositorVsyncDispatcher::NotifyVsync(TimeStamp aVsyncTimestamp)
   }
 }
 
+void
+CompositorVsyncDispatcher::AssertOnCompositorThread()
+{
+  if (!sThreadAssertionsEnabled) {
+    return;
+  }
+
+  Compositor::AssertOnCompositorThread();
+}
+
 void
 CompositorVsyncDispatcher::ObserveVsync(bool aEnable)
 {
@@ -66,9 +85,11 @@ CompositorVsyncDispatcher::ObserveVsync(bool aEnable)
 void
 CompositorVsyncDispatcher::SetCompositorVsyncObserver(VsyncObserver* aVsyncObserver)
 {
-  MOZ_ASSERT(layers::CompositorParent::IsInCompositorThread());
-  MutexAutoLock lock(mCompositorObserverLock);
-  mCompositorVsyncObserver = aVsyncObserver;
+  AssertOnCompositorThread();
+  { // scope lock
+    MutexAutoLock lock(mCompositorObserverLock);
+    mCompositorVsyncObserver = aVsyncObserver;
+  }
 
   bool observeVsync = aVsyncObserver != nullptr;
   nsCOMPtr<nsIRunnable> vsyncControl = NS_NewRunnableMethodWithArg<bool>(this,

diff --git a/widget/VsyncDispatcher.h b/widget/VsyncDispatcher.h
@@ -46,7 +46,13 @@ class CompositorVsyncDispatcher MOZ_FINAL
   void SetCompositorVsyncObserver(VsyncObserver* aVsyncObserver);
   void Shutdown();
 
+  // This can be used to enable or disable thread assertions.
+  // This is useful for gtests because usually things run
+  // in only one thread in that environment
+  static void SetThreadAssertionsEnabled(bool aEnable);
+
 private:
+  void AssertOnCompositorThread();
   virtual ~CompositorVsyncDispatcher();
   void ObserveVsync(bool aEnable);