diff options
| author | Patrick Scott <phanna@android.com> | 2011-02-01 12:40:26 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-01 12:40:26 -0800 |
| commit | 17d1fdc369e49357c72fdd50cba59e69a34dade6 (patch) | |
| tree | bfc8027d396f76cb376934105700583dc536ef71 /WebCore/platform | |
| parent | c6280ca9a4e12f9847852c063d5048a3d3d29422 (diff) | |
| parent | f44ff79cacf8ed02e3fdbf60ad4c6f0edd03e628 (diff) | |
| download | external_webkit-17d1fdc369e49357c72fdd50cba59e69a34dade6.zip external_webkit-17d1fdc369e49357c72fdd50cba59e69a34dade6.tar.gz external_webkit-17d1fdc369e49357c72fdd50cba59e69a34dade6.tar.bz2 | |
Merge "Fix updates on scrolling layers." into honeycomb
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index 07a0e00..42104dc 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -749,9 +749,11 @@ void LayerAndroid::reserveGLTextures() android::AutoMutex lock(m_atomicSync); // we set the reservedTexture if it's different from the drawing texture if (m_reservedTexture != reservedTexture && - ((m_reservedTexture != m_drawingTexture) || + ((reservedTexture != m_drawingTexture) || (m_reservedTexture == 0 && m_drawingTexture == 0))) { - if (m_reservedTexture) + // Call release on the reserved texture if it is not the same as the + // drawing texture. + if (m_reservedTexture && (m_reservedTexture != m_drawingTexture)) m_reservedTexture->release(this); m_reservedTexture = reservedTexture; } |