Merge heads
authorPatrick Walton <pwalton@mozilla.com>
Tue, 07 Feb 2012 22:05:42 -0800
changeset 90897 629225186db05edfd4926a12be2a3c6c9a03510f
parent 90896 ae574286846aeeab057b016a16b5fedbca8139ee (current diff)
parent 90895 04659e721b6626e0f99bbe949dc3951936a531d1 (diff)
child 90898 bfa7372a8ed01fc87680661638ad2c534276a987
push idunknown
push userunknown
push dateunknown
milestone12.0a1
Merge heads
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -99,23 +99,21 @@ CompositorParent::PauseComposition()
     static_cast<LayerManagerOGL*>(mLayerManager.get())->gl()->ReleaseSurface();
 #endif
   }
 }
 
 void
 CompositorParent::ResumeComposition()
 {
-  if (mPaused) {
-    mPaused = false;
+  mPaused = false;
 
 #ifdef MOZ_WIDGET_ANDROID
-    static_cast<LayerManagerOGL*>(mLayerManager.get())->gl()->RenewSurface();
+  static_cast<LayerManagerOGL*>(mLayerManager.get())->gl()->RenewSurface();
 #endif
-  }
 }
 
 void
 CompositorParent::SchedulePauseOnCompositorThread(::base::Thread &aCompositorThread)
 {
   CancelableTask *pauseTask = NewRunnableMethod(this,
                                                 &CompositorParent::PauseComposition);
   aCompositorThread.message_loop()->PostTask(FROM_HERE, pauseTask);