summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-11-30 10:50:47 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-30 10:50:47 -0800
commit5b59024ec3e22bafe987cabff40f9a091d748fad (patch)
tree956d7adad3f7f4b2450a886f3b3ea3083ef5e3b5
parented5d84ae70b5ff966ed7a934d5658f6648088d30 (diff)
parenta5c5de101b2a1a1f1d347f21519299d05b745eab (diff)
downloadexternal_webkit-5b59024ec3e22bafe987cabff40f9a091d748fad.zip
external_webkit-5b59024ec3e22bafe987cabff40f9a091d748fad.tar.gz
external_webkit-5b59024ec3e22bafe987cabff40f9a091d748fad.tar.bz2
am a5c5de10: Merge "Set the exact buffer size to Surf Tex" into ics-mr1
* commit 'a5c5de101b2a1a1f1d347f21519299d05b745eab': Set the exact buffer size to Surf Tex
-rw-r--r--Source/WebCore/platform/graphics/android/TransferQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/TransferQueue.cpp
index afcfb47..9159d26 100644
--- a/Source/WebCore/platform/graphics/android/TransferQueue.cpp
+++ b/Source/WebCore/platform/graphics/android/TransferQueue.cpp
@@ -97,7 +97,7 @@ void TransferQueue::initSharedSurfaceTextures(int width, int height)
#endif
m_ANW = new android::SurfaceTextureClient(m_sharedSurfaceTexture);
m_sharedSurfaceTexture->setSynchronousMode(true);
- m_sharedSurfaceTexture->setBufferCount(ST_BUFFER_NUMBER+1);
+ m_sharedSurfaceTexture->setBufferCount(ST_BUFFER_NUMBER);
int result = native_window_set_buffers_geometry(m_ANW.get(),
width, height, HAL_PIXEL_FORMAT_RGBA_8888);