corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 977596 - Fix build failure on flatfish r=jmuizelaar

Browse Source
This commit is contained in:
Sotaro Ikeda
2014-02-27 13:26:22 -08:00
parent e91d511c9c
commit a20fea9d9b
10 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/layers/opengl/GrallocTextureClient.cpp
View File

@@ -218,10 +218,15 @@ GrallocTextureClientOGL::Lock(OpenMode aMode)
return true;
}
#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 18
#if MOZ_WIDGET_GONK && ANDROID_VERSION >= 17
if (mReleaseFenceHandle.IsValid()) {
android::sp<Fence> fence = mReleaseFenceHandle.mFence;
#if ANDROID_VERSION == 17
fence->waitForever(1000, "GrallocTextureClientOGL::Lock");
// 1000 is what Android uses. It is warning timeout ms.
#else
fence->waitForever("GrallocTextureClientOGL::Lock");
#endif
mReleaseFenceHandle = FenceHandle();
}
#endif