Backed out changeset c92c76073e9c (bug 1160877) for causing B2G phone startup crashes.

--HG--
extra : rebase_source : 35bfd977a1f0f164e56df642dc30ae47d1611a3a

widget/gonk/libdisplay/GonkDisplayJB.cpp

@@ -167,8 +167,9 @@ GonkDisplayJB::~GonkDisplayJB()
 ANativeWindow*
 GonkDisplayJB::GetNativeWindow()
 {
-    StopBootAnim();
-
+    if (!mBootAnimBuffer.get()) {
+        StopBootAnimation();
+    }
     return mSTClient.get();
 }
 
@@ -234,7 +235,10 @@ GonkDisplayJB::GetDispSurface()
 bool
 GonkDisplayJB::SwapBuffers(EGLDisplay dpy, EGLSurface sur)
 {
-    StopBootAnim();
+    if (mBootAnimBuffer.get()) {
+        StopBootAnimation();
+        mBootAnimBuffer = nullptr;
+    }
 
     // Should be called when composition rendering is complete for a frame.
     // Only HWC v1.0 needs this call.
@@ -333,8 +337,10 @@ GonkDisplayJB::QueueBuffer(ANativeWindowBuffer* buf)
 void
 GonkDisplayJB::UpdateDispSurface(EGLDisplay dpy, EGLSurface sur)
 {
-    StopBootAnim();
-
+    if (mBootAnimBuffer.get()) {
+        StopBootAnimation();
+        mBootAnimBuffer = nullptr;
+    }
     eglSwapBuffers(dpy, sur);
 }
 
@@ -350,15 +356,6 @@ GonkDisplayJB::GetPrevDispAcquireFd()
     return mDispSurface->GetPrevDispAcquireFd();
 }
 
-void
-GonkDisplayJB::StopBootAnim()
-{
-    if (mBootAnimBuffer.get()) {
-        mBootAnimBuffer = nullptr;
-    }
-    StopBootAnimation();
-}
-
 __attribute__ ((visibility ("default")))
 GonkDisplay*
 GetGonkDisplay()

widget/gonk/libdisplay/GonkDisplayJB.h

@@ -55,8 +55,6 @@ public:
     bool Post(buffer_handle_t buf, int fence);
 
 private:
-    void StopBootAnim();
-
     hw_module_t const*        mModule;
     hw_module_t const*        mFBModule;
     hwc_composer_device_1_t*  mHwc;