Bug 774388 - Patch 6: fix a silly double negation - r=nical
☠☠ backed out by 13b0d48c6fa3 ☠ ☠
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 06 Jun 2014 09:51:27 -0400
changeset 207514 0f81ceab808a25929596cad9b715d0b6e2ccf6a7
parent 207513 6f2e001c5f3923c740bf2e3d8ca8750739c88758
child 207515 ae35b095385111002024e4a9ef924fec3498bd2c
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs774388
milestone32.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 774388 - Patch 6: fix a silly double negation - r=nical
gfx/layers/ipc/CompositorParent.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -722,17 +722,19 @@ CompositorParent::ForceComposeToTarget(D
   mOverrideComposeReadiness = true;
 
   CompositeToTarget(aTarget, aRect);
 }
 
 bool
 CompositorParent::CanComposite()
 {
-  return !(mPaused || !mLayerManager || !mLayerManager->GetRoot());
+  return mLayerManager &&
+         mLayerManager->GetRoot() &&
+         !mPaused;
 }
 
 // Go down the composite layer tree, setting properties to match their
 // content-side counterparts.
 static void
 SetShadowProperties(Layer* aLayer)
 {
   // FIXME: Bug 717688 -- Do these updates in LayerTransactionParent::RecvUpdate.