From 2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca Mon Sep 17 00:00:00 2001 From: Teng-Hui Zhu Date: Thu, 19 Apr 2012 14:54:31 -0700 Subject: Better handle the EGL context lost situation. Unless framework provide a better message, we can't avoid this EGL context issue totally if mis-match happen again. Clean up some obsolete code. Change-Id: Ica03daecd58f9757c8cad41e0f40d5d51b041748 --- .../graphics/android/layers/VideoLayerManager.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp') diff --git a/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp b/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp index 6501f98..a7b3184 100644 --- a/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp +++ b/Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp @@ -107,16 +107,15 @@ void VideoLayerManager::initGLResourcesIfNeeded() void VideoLayerManager::initGLResources() { GLUtils::checkGlError("before initGLResources()"); - if (!m_createdTexture) { - m_spinnerOuterTextureId = - createTextureFromImage(RenderSkinMediaButton::SPINNER_OUTER); - m_spinnerInnerTextureId = - createTextureFromImage(RenderSkinMediaButton::SPINNER_INNER); - m_posterTextureId = - createTextureFromImage(RenderSkinMediaButton::VIDEO); - m_playTextureId = createTextureFromImage(RenderSkinMediaButton::PLAY); - m_pauseTextureId = createTextureFromImage(RenderSkinMediaButton::PAUSE); - } + m_spinnerOuterTextureId = + createTextureFromImage(RenderSkinMediaButton::SPINNER_OUTER); + m_spinnerInnerTextureId = + createTextureFromImage(RenderSkinMediaButton::SPINNER_INNER); + m_posterTextureId = + createTextureFromImage(RenderSkinMediaButton::VIDEO); + m_playTextureId = createTextureFromImage(RenderSkinMediaButton::PLAY); + m_pauseTextureId = createTextureFromImage(RenderSkinMediaButton::PAUSE); + m_createdTexture = !GLUtils::checkGlError("initGLResources()"); return; } -- cgit v1.1