(WIP) Invalidation during painting (for synchronized painting)

third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp

Index: third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
index f14c0f14f6394cb26ef7c29174c0ba06574d1d29..3512dc6454644c8a2ffddc3c7649d02aab04d276 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp
@@ -116,17 +116,49 @@ void PaintController::endScope()
     endSkippingCache();
 }
 
-void PaintController::invalidate(const DisplayItemClient& client)
+void PaintController::invalidate(const DisplayItemClient& client, PaintInvalidationReason paintInvalidationReason, const IntRect& previousPaintInvalidationRect, const IntRect& newPaintInvalidationRect)
 {
-#if ENABLE(ASSERT)
-    // Slimming paint v1 CompositedLayerMapping may invalidate client on extra layers.
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() || clientCacheIsValid(client))
-        m_invalidations.append(client.debugName());
-#endif
-
     invalidateUntracked(client);
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled() && m_trackedPaintInvalidationObjects)
         m_trackedPaintInvalidationObjects->append(client.debugName());
+
+    fprintf(stderr, "###invalidate %p %s on %p(%s) %s old:%d,%d,%d,%d new:%d,%d,%d,%d\n",
+        &client, client.debugName().ascii().data(), this, m_debugName.ascii().data(),
+        paintInvalidationReasonToString(paintInvalidationReason),
+        previousPaintInvalidationRect.x(), previousPaintInvalidationRect.y(), previousPaintInvalidationRect.width(), previousPaintInvalidationRect.height(),
+        newPaintInvalidationRect.x(), newPaintInvalidationRect.y(), newPaintInvalidationRect.width(), newPaintInvalidationRect.height());
+
+    if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+        return;
+
+    Invalidation invalidation = { client, client.debugName(), previousPaintInvalidationRect, paintInvalidationReason };
+    if (paintInvalidationReason != PaintInvalidationIncremental) {
+        if (!previousPaintInvalidationRect.isEmpty())
+            m_invalidations.append(invalidation);
+        if (newPaintInvalidationRect != previousPaintInvalidationRect && !newPaintInvalidationRect.isEmpty()) {
+            invalidation.rect = newPaintInvalidationRect;
+            m_invalidations.append(invalidation);
+        }
+        return;
+    }
+
+    ASSERT(previousPaintInvalidationRect.location() == newPaintInvalidationRect.location());
+    if (LayoutUnit deltaRight = newPaintInvalidationRect.maxX() - previousPaintInvalidationRect.maxX()) {
+        if (deltaRight > 0)
+            invalidation.rect = IntRect(previousPaintInvalidationRect.maxX(), newPaintInvalidationRect.y(), deltaRight, newPaintInvalidationRect.height());
+        else
+            invalidation.rect = IntRect(newPaintInvalidationRect.maxX(), previousPaintInvalidationRect.y(), -deltaRight, previousPaintInvalidationRect.height());
+        if (!invalidation.rect.isEmpty())
+            m_invalidations.append(invalidation);
+    }
+    if (LayoutUnit deltaBottom = newPaintInvalidationRect.maxY() - previousPaintInvalidationRect.maxY()) {
+        if (deltaBottom > 0)
+            invalidation.rect = IntRect(newPaintInvalidationRect.x(), previousPaintInvalidationRect.maxY(), newPaintInvalidationRect.width(), deltaBottom);
+        else if (deltaBottom < 0)
+            invalidation.rect = IntRect(previousPaintInvalidationRect.x(), newPaintInvalidationRect.maxY(), previousPaintInvalidationRect.width(), -deltaBottom);
+        if (!invalidation.rect.isEmpty())
+            m_invalidations.append(invalidation);
+    }
 }
 
 void PaintController::invalidateUntracked(const DisplayItemClient& client)
@@ -159,7 +191,7 @@ bool PaintController::clientCacheIsValid(const DisplayItemClient& client) const
 
 void PaintController::invalidatePaintOffset(const DisplayItemClient& client)
 {
-    ASSERT(RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled());
+    ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
     invalidate(client);
 
 #if ENABLE(ASSERT)
@@ -171,7 +203,7 @@ void PaintController::invalidatePaintOffset(const DisplayItemClient& client)
 #if ENABLE(ASSERT)
 bool PaintController::paintOffsetWasInvalidated(const DisplayItemClient& client) const
 {
-    ASSERT(RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled());
+    ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled());
     return m_clientsWithPaintOffsetInvalidations.contains(&client);
 }
 #endif
@@ -290,8 +322,13 @@ void PaintController::commitNewDisplayItemsInternal(const LayoutSize& offsetFrom
         "num_non_cached_new_items", (int)m_newDisplayItemList.size() - m_numCachedNewItems);
     m_numCachedNewItems = 0;
 
-    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled())
+    if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+        for (const auto& invalidation : m_invalidations)
+            graphicsLayer->setNeedsDisplayInRect(invalidation.rect, invalidation.invalidationReason);
+        fprintf(stderr, "PaintController graphicsLayer %p %p(%s) clear invalidations\n", graphicsLayer, this, m_debugName.ascii().data());
+        m_invalidations.clear();
         m_clientsCheckedPaintInvalidation.clear();
+    }
 
     // These data structures are used during painting only.
     ASSERT(m_scopeStack.isEmpty());
@@ -341,7 +378,7 @@ void PaintController::commitNewDisplayItemsInternal(const LayoutSize& offsetFrom
 
         if (newDisplayItemHasCachedType) {
             ASSERT(newDisplayItem.isCached());
-            ASSERT(clientCacheIsValid(newDisplayItem.client()) || (RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled() && !paintOffsetWasInvalidated(newDisplayItem.client())));
+            ASSERT(clientCacheIsValid(newDisplayItem.client()) || (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled() && !paintOffsetWasInvalidated(newDisplayItem.client())));
             if (!isSynchronized) {
                 currentIt = findOutOfOrderCachedItem(newDisplayItemId, outOfOrderIndexContext);
 
@@ -375,7 +412,7 @@ void PaintController::commitNewDisplayItemsInternal(const LayoutSize& offsetFrom
             ASSERT(!newDisplayItem.isDrawing()
                 || newDisplayItem.skippedCache()
                 || !clientCacheIsValid(newDisplayItem.client())
-                || (RuntimeEnabledFeatures::slimmingPaintOffsetCachingEnabled() && paintOffsetWasInvalidated(newDisplayItem.client())));
+                || (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled() && paintOffsetWasInvalidated(newDisplayItem.client())));
 
             updatedList.appendByMoving(*newIt, visualRectForDisplayItem(*newIt, offsetFromLayoutObject));
 
@@ -559,6 +596,12 @@ WTF::String PaintController::displayItemListAsDebugString(const DisplayItemList&
         stringBuilder.append(", cacheIsValid: ");
         stringBuilder.append(clientCacheIsValid(displayItem.client()) ? "true" : "false");
         stringBuilder.append('}');
+        if (DisplayItem::isDrawingType(displayItem.type())) {
+            if (const SkPicture* picture = static_cast<const DrawingDisplayItem&>(displayItem).picture()) {
+                stringBuilder.append(", picture: ");
+                stringBuilder.append(pictureAsDebugString(picture));
+            }
+        }
     }
     return stringBuilder.toString();
 }