diff options
| -rw-r--r-- | Source/WebCore/platform/graphics/android/SharedTexture.cpp | 1 | ||||
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/SharedTexture.cpp b/Source/WebCore/platform/graphics/android/SharedTexture.cpp index cbe44da..4f52107 100644 --- a/Source/WebCore/platform/graphics/android/SharedTexture.cpp +++ b/Source/WebCore/platform/graphics/android/SharedTexture.cpp @@ -78,6 +78,7 @@ SharedTexture::~SharedTexture() else if (m_sharedTextureMode == SurfaceTextureMode) { m_sourceTexture->m_surfaceTexture.clear(); m_sourceTexture->m_ANW.clear(); + GLUtils::deleteTexture(&m_sourceTexture->m_textureId); } delete m_sourceTexture; delete m_targetTexture; diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 236c07b..e0bb6b4 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -482,7 +482,8 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, WebCore::In m_glWebViewState->resetRings(); if (extra) { if (extra == &m_ring) { - m_glWebViewState->setRings(m_ring.rings(), m_ring.m_isPressed); + if (root == m_ring.m_frame) + m_glWebViewState->setRings(m_ring.rings(), m_ring.m_isPressed); } else { LayerAndroid mainPicture(m_navPictureUI); PictureSet* content = m_baseLayer->content(); |