Force kModeProcess functor invocation to return

Previously drawing would cease if no painting collection existed, regardless of
whether the drawing collection was ready. This change forces drawing to occur
once the functor enters kModeProcess, since it should only arrive there by
content missing.

Change-Id: I6c14ad4180499dda0461c6c45d46f22c5690f61b

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;