summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2012-04-19 16:57:18 -0700
committerTeng-Hui Zhu <ztenghui@google.com>2012-04-19 16:57:18 -0700
commit8be7bb7ddda88fb9c35c9119972579930d27acb7 (patch)
tree1036b9e6bd79966e56ebd2a766d4d8e38cdedc55 /Source/WebCore
parent7ad2efca85a989d9ab57e311af605a6fed9c9925 (diff)
downloadexternal_webkit-8be7bb7ddda88fb9c35c9119972579930d27acb7.zip
external_webkit-8be7bb7ddda88fb9c35c9119972579930d27acb7.tar.gz
external_webkit-8be7bb7ddda88fb9c35c9119972579930d27acb7.tar.bz2
Revert "Revert "Turn on Fence sync for transfer queue.""
So it turns out the fence sync is not the cause of ANR. bug:6325463 This reverts commit 389739d3808edb3bc97ad75d2ea5e37e281ca411.
Diffstat (limited to 'Source/WebCore')
-rw-r--r--Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
index 5ede167..a330b41 100644
--- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
@@ -102,7 +102,7 @@ void TransferQueue::initGLResources(int width, int height)
m_sharedSurfaceTexture =
#if GPU_UPLOAD_WITHOUT_DRAW
new android::SurfaceTexture(m_sharedSurfaceTextureId, true,
- GL_TEXTURE_2D, false, bufferQueue);
+ GL_TEXTURE_2D, true, bufferQueue);
#else
new android::SurfaceTexture(m_sharedSurfaceTextureId, true,
GL_TEXTURE_EXTERNAL_OES, true,