commit cf076e61dbf727a931a6be1cc2811d795a165f77
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 12:23:02 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 12:23:02 2013 -0700
tree 368ffdee5359be7466ce242f5441bacd55aaf2ee
parent e02247f4c53e1df4cac3a7b265ffb4307cca3650
parent 61c04aad1e2313a22822173f3776b85d664984ae

am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '61c04aad1e2313a22822173f3776b85d664984ae':

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