commit e6057f8fac4f62027696d0be56dd77cbe8d7b00d
author John Reck <jreck@android.com> Tue Feb 12 23:09:53 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 12 23:09:54 2013 +0000
tree 628e8df34cda6b83c69aefcf0d58c1a96a814ff3
parent b6cb93cfb62e26168298b6f6e606af379350b064
parent f0085a265fadca39e90d6eaf1a922a543ec8e9a3

Merge "Fix compilation warning for list of initialization constructor arguments after bae7aeaa87."

Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp

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 @@
     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();
 

Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp

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 @@
         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);