Bug 1088898. Correctly set mLastCompose in force composites. r=benwa
authorMason Chang <mchang@mozilla.com>
Tue, 28 Oct 2014 19:32:36 -0700
changeset 212987 452f5c5264b24b3495309007e2e9b89340513d3a
parent 212986 8512443e6e4f2c266ade1023c46a66b37c5e5832
child 212988 8335aff95389012158d3525d9810bfc0247c994f
push id51107
push usermchang@mozilla.com
push dateWed, 29 Oct 2014 20:55:22 +0000
treeherdermozilla-inbound@452f5c5264b2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbenwa
bugs1088898
milestone36.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 1088898. Correctly set mLastCompose in force composites. r=benwa
gfx/layers/ipc/CompositorParent.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -597,16 +597,17 @@ CompositorParent::ResumeComposition()
     __android_log_print(ANDROID_LOG_INFO, "CompositorParent", "Unable to renew compositor surface; remaining in paused state");
 #endif
     lock.NotifyAll();
     return;
   }
 
   mPaused = false;
 
+  mLastCompose = TimeStamp::Now();
   CompositeToTarget(nullptr);
 
   // if anyone's waiting to make sure that composition really got resumed, tell them
   lock.NotifyAll();
 }
 
 void
 CompositorParent::ForceComposition()
@@ -910,16 +911,17 @@ void
 CompositorParent::ForceComposeToTarget(DrawTarget* aTarget, const nsIntRect* aRect)
 {
   PROFILER_LABEL("CompositorParent", "ForceComposeToTarget",
     js::ProfileEntry::Category::GRAPHICS);
 
   AutoRestore<bool> override(mOverrideComposeReadiness);
   mOverrideComposeReadiness = true;
 
+  mLastCompose = TimeStamp::Now();
   CompositeToTarget(aTarget, aRect);
 }
 
 bool
 CompositorParent::CanComposite()
 {
   return mLayerManager &&
          mLayerManager->GetRoot() &&