Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/external/webkit into 1.1

Android 4.2.2 release 1

2 files changed, 1 insertions, 9 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();
 
diff --git a/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp b/Source/WebCore/platform/graphics/android/rendering/TransferQueue.cpp
index 857d377..fd7b92e 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);