Bug 944866 - Bustage Intermittent failure. r=bustage on a CLOSED TREE
authorBenoit Girard <b56girard@gmail.com>
Tue, 03 Dec 2013 15:04:47 -0500
changeset 158643 ad6fa6ac9d1124d1b7fa9fe63d4999dfc3cd469b
parent 158642 c30753241b8d562c483b0dc5925a8c5fbf3258a8
child 158644 65a57bce96ef0fcaa914b4114e16e92afb667731
push id25752
push usercbook@mozilla.com
push dateWed, 04 Dec 2013 08:35:03 +0000
treeherdermozilla-central@8187818246ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs944866
milestone28.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 944866 - Bustage Intermittent failure. r=bustage on a CLOSED TREE
gfx/layers/ipc/CompositorParent.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -554,17 +554,16 @@ CompositorParent::Composite()
 void
 CompositorParent::CompositeInTransaction()
 {
   profiler_tracing("Paint", "Composite", TRACING_INTERVAL_START);
   PROFILER_LABEL("CompositorParent", "Composite");
   NS_ABORT_IF_FALSE(CompositorThreadID() == PlatformThread::CurrentId(),
                     "Composite can only be called on the compositor thread");
   mCurrentCompositeTask = nullptr;
-  mLayerManager->SetDebugOverlayWantsNextFrame(false);
 
   mLastCompose = TimeStamp::Now();
 
   if (!CanComposite()) {
     return;
   }
 
   AutoResolveRefLayers resolve(mCompositionManager);
@@ -589,16 +588,17 @@ CompositorParent::CompositeInTransaction
 
 #ifdef MOZ_DUMP_PAINTING
   static bool gDumpCompositorTree = false;
   if (gDumpCompositorTree) {
     printf_stderr("Painting --- compositing layer tree:\n");
     mLayerManager->Dump();
   }
 #endif
+  mLayerManager->SetDebugOverlayWantsNextFrame(false);
   mLayerManager->EndEmptyTransaction();
 
   if (mLayerManager->DebugOverlayWantsNextFrame()) {
     ScheduleComposition();
   }
 
 #ifdef COMPOSITOR_PERFORMANCE_WARNING
   if (mExpectedComposeTime + TimeDuration::FromMilliseconds(15) < TimeStamp::Now()) {