зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1160877 - Fix gonkDisplay stop anim condition. r=mwu, a=me
--HG-- extra : rebase_source : c17fb0a0650827dc2fc7ae811642387a4b86a85a
This commit is contained in:
Родитель
9c1044ef66
Коммит
354bd0ccdd
|
@ -167,9 +167,8 @@ GonkDisplayJB::~GonkDisplayJB()
|
|||
ANativeWindow*
|
||||
GonkDisplayJB::GetNativeWindow()
|
||||
{
|
||||
if (!mBootAnimBuffer.get()) {
|
||||
StopBootAnimation();
|
||||
}
|
||||
StopBootAnim();
|
||||
|
||||
return mSTClient.get();
|
||||
}
|
||||
|
||||
|
@ -235,10 +234,7 @@ GonkDisplayJB::GetDispSurface()
|
|||
bool
|
||||
GonkDisplayJB::SwapBuffers(EGLDisplay dpy, EGLSurface sur)
|
||||
{
|
||||
if (mBootAnimBuffer.get()) {
|
||||
StopBootAnimation();
|
||||
mBootAnimBuffer = nullptr;
|
||||
}
|
||||
StopBootAnim();
|
||||
|
||||
// Should be called when composition rendering is complete for a frame.
|
||||
// Only HWC v1.0 needs this call.
|
||||
|
@ -337,10 +333,8 @@ GonkDisplayJB::QueueBuffer(ANativeWindowBuffer* buf)
|
|||
void
|
||||
GonkDisplayJB::UpdateDispSurface(EGLDisplay dpy, EGLSurface sur)
|
||||
{
|
||||
if (mBootAnimBuffer.get()) {
|
||||
StopBootAnimation();
|
||||
mBootAnimBuffer = nullptr;
|
||||
}
|
||||
StopBootAnim();
|
||||
|
||||
eglSwapBuffers(dpy, sur);
|
||||
}
|
||||
|
||||
|
@ -356,6 +350,15 @@ GonkDisplayJB::GetPrevDispAcquireFd()
|
|||
return mDispSurface->GetPrevDispAcquireFd();
|
||||
}
|
||||
|
||||
void
|
||||
GonkDisplayJB::StopBootAnim()
|
||||
{
|
||||
StopBootAnimation();
|
||||
if (mBootAnimBuffer.get()) {
|
||||
mBootAnimBuffer = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
__attribute__ ((visibility ("default")))
|
||||
GonkDisplay*
|
||||
GetGonkDisplay()
|
||||
|
|
|
@ -55,6 +55,8 @@ 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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче