diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-19 14:54:31 -0700 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-20 09:33:49 -0700 |
| commit | 2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca (patch) | |
| tree | e9a2ec93fffb786b8eccf3f4bdba490c769337e6 /Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp | |
| parent | 7ad2efca85a989d9ab57e311af605a6fed9c9925 (diff) | |
| download | external_webkit-2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca.zip external_webkit-2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca.tar.gz external_webkit-2ac76fe4e18c3325c8b3bb8f9435fdc7b96c0aca.tar.bz2 | |
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
Diffstat (limited to 'Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/layers/VideoLayerManager.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
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; } |