From 0b65fac4a7c89746750cffe7ffc0aebd6c3449fd Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Thu, 15 Nov 2012 15:16:27 -0800 Subject: Revert "TransferQueue: use a few extra buffers" bug:7549630 bug:6876502 This reverts commit 923f222d2281bf1faac6221b3fb1298940a6d205. Change-Id: I232a5b5b077dc1046ff2d6272876a5e5b441d42c --- .../WebCore/platform/graphics/android/rendering/TransferQueue.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp index 7c03219..b15fa6d 100644 --- a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp @@ -117,13 +117,9 @@ void TransferQueue::initGLResources(int width, int height) m_sharedSurfaceTexture->setSynchronousMode(true); int extraBuffersNeeded = 0; - int extraHackyBuffersNeeded = 0; - if (m_transferQueueSize == EFFICIENT_SIZE) - extraHackyBuffersNeeded = 13; m_ANW->query(m_ANW.get(), NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS, &extraBuffersNeeded); - bufferQueue->setBufferCount(m_transferQueueSize + extraBuffersNeeded + - extraHackyBuffersNeeded); + bufferQueue->setBufferCount(m_transferQueueSize + extraBuffersNeeded); int result = native_window_set_buffers_geometry(m_ANW.get(), width, height, HAL_PIXEL_FORMAT_RGBA_8888); -- cgit v1.1 From e02247f4c53e1df4cac3a7b265ffb4307cca3650 Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Mon, 3 Dec 2012 10:34:32 -0800 Subject: Only signal collection swap on true swap bug:7484054 Change-Id: I7cb648f64f45711013996be7e2cd0dabdbd614ae --- .../platform/graphics/android/rendering/SurfaceCollectionManager.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp index 9914176..f3ff0cf 100644 --- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp +++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp @@ -304,10 +304,6 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect, if (m_drawingCollection) { bool drawingReady = didCollectionSwap || m_drawingCollection->isReady(); - // call the page swap callback if registration happened without more collections enqueued - if (collectionsSwappedPtr && drawingReady && !m_paintingCollection) - *collectionsSwappedPtr = true; - if (didCollectionSwap || m_fastSwapMode || (drawingReady && !m_paintingCollection)) m_drawingCollection->swapTiles(); -- cgit v1.1