Bug 849515 - Boot failed with genlock error, r=vlad
authorMichael Wu <mwu@mozilla.com>
Tue, 19 Mar 2013 19:32:08 -0400
changeset 125516 1356923ff93edb11b68682f4836d631c39ce3908
parent 125515 bbb0081483d995a95f9764bcf537e27170f6cb6b
child 125517 59ef39cbab731e14dd2e2c4fe627b0693c020c6b
push id24459
push useremorley@mozilla.com
push dateWed, 20 Mar 2013 11:46:36 +0000
treeherdermozilla-central@1d6fe70c79c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvlad
bugs849515
milestone22.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 849515 - Boot failed with genlock error, r=vlad
widget/gonk/nsWindow.cpp
--- a/widget/gonk/nsWindow.cpp
+++ b/widget/gonk/nsWindow.cpp
@@ -212,18 +212,16 @@ nsWindow::DoDraw(void)
         return;
     }
 
     if (!gWindowToRedraw) {
         LOG("  no window to draw, bailing");
         return;
     }
 
-    StopBootAnimation();
-
     nsIntRegion region = gWindowToRedraw->mDirtyRegion;
     gWindowToRedraw->mDirtyRegion.SetEmpty();
 
     nsIWidgetListener* listener = gWindowToRedraw->GetWidgetListener();
     if (listener) {
         listener->WillPaintWindow(gWindowToRedraw);
     }
 
@@ -565,16 +563,18 @@ nsWindow::GetLayerManager(PLayersChild* 
             BasicLayerManager* manager =
                 static_cast<BasicLayerManager*>(mLayerManager.get());
             manager->SetDefaultTargetConfiguration(mozilla::layers::BUFFER_NONE, 
                                                    ScreenRotation(EffectiveScreenRotation()));
         }
         return mLayerManager;
     }
 
+    StopBootAnimation();
+
     // Set mUseLayersAcceleration here to make it consistent with
     // nsBaseWidget::GetLayerManager
     mUseLayersAcceleration = ComputeShouldAccelerate(mUseLayersAcceleration);
     nsWindow *topWindow = sTopWindows[0];
 
     if (!topWindow) {
         LOGW(" -- no topwindow\n");
         return nullptr;