Bug 832998: Fix a backwards OMTA-throttling-enabled check, to fix performance regression on the non-OMTA-throttling case. r=nrc approval-mozilla-aurora=lsblakk
authorL. David Baron <dbaron@dbaron.org>
Tue, 22 Jan 2013 20:42:52 +0000
changeset 127297 2103dd3101ce4b60d7e4f87dc13651b73ed393c2
parent 127296 5b565584a2fdc42d21c927f4cce93ed92085cd38
child 127298 326cf46aa524f67ced7d005e3062d2bda4792795
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnrc
bugs832998
milestone20.0a2
Bug 832998: Fix a backwards OMTA-throttling-enabled check, to fix performance regression on the non-OMTA-throttling case. r=nrc approval-mozilla-aurora=lsblakk
layout/base/nsPresShell.cpp
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -3846,18 +3846,18 @@ PresShell::FlushPendingNotifications(moz
       mPresContext->FlushUserFontSet();
 
       // Flush any requested SMIL samples.
       if (mDocument->HasAnimationController()) {
         mDocument->GetAnimationController()->FlushResampleRequests();
       }
 
       if (aFlush.mFlushAnimations &&
-          (!CommonAnimationManager::ThrottlingEnabled() ||
-           !mPresContext->StyleUpdateForAllAnimationsIsUpToDate())) {
+          CommonAnimationManager::ThrottlingEnabled() &&
+          !mPresContext->StyleUpdateForAllAnimationsIsUpToDate()) {
         mPresContext->AnimationManager()->
           FlushAnimations(CommonAnimationManager::Cannot_Throttle);
         mPresContext->TransitionManager()->
           FlushTransitions(CommonAnimationManager::Cannot_Throttle);
         mPresContext->TickLastStyleUpdateForAllAnimations();
       }
 
       // The FlushResampleRequests() above flushed style changes.