1 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp
index 8fb4d4b..91335c7 100644
--- a/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp
+++ b/Source/WebCore/platform/graphics/android/rendering/SurfaceCollectionManager.cpp
@@ -205,9 +205,17 @@ int SurfaceCollectionManager::drawGL(double currentTime, IntRect& viewRect,
         returnFlags |= uirenderer::DrawGlInfo::kStatusInvoke;
 
     if (!shouldDraw) {
-        if (didCollectionSwap) {
+        if (didCollectionSwap
+            || (!m_paintingCollection
+                && m_drawingCollection
+                && m_drawingCollection->isReady())) {
+            // either a swap just occurred, or there is no more work to be done: do a full draw
             m_drawingCollection->swapTiles();
             returnFlags |= uirenderer::DrawGlInfo::kStatusDraw;
+        } else {
+            // current collection not ready - invoke functor in process mode
+            // until either drawing or painting collection is ready
+            returnFlags |= uirenderer::DrawGlInfo::kStatusInvoke;
         }
 
         return returnFlags;