[SPv2] Fix layout test crashes about raster invalidation

third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp

Index: third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
diff --git a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
index 0aaecc29f3c0fddf654d9d7279d43c442aa709e0..a4a187c76d60bcf6b4683e30c010cc3020045b7c 100644
--- a/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
+++ b/third_party/WebKit/Source/platform/graphics/compositing/PaintArtifactCompositor.cpp
@@ -91,7 +91,7 @@ class PaintArtifactCompositor::ContentLayerClientImpl
       return;
 
     if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled())
-      tracking->tracked_raster_invalidations.clear();
+      tracking->tracked_invalidations.clear();
     else
       CcLayersRasterInvalidationTrackingMap().Remove(cc_picture_layer_.get());
   }
@@ -100,28 +100,24 @@ class PaintArtifactCompositor::ContentLayerClientImpl
     RasterInvalidationTracking* tracking =
         CcLayersRasterInvalidationTrackingMap().Find(cc_picture_layer_.get());
     if (tracking)
-      return !tracking->tracked_raster_invalidations.IsEmpty();
+      return !tracking->tracked_invalidations.IsEmpty();
     return false;
   }
 
-  void SetNeedsDisplayRect(const gfx::Rect& rect,
-                           RasterInvalidationInfo* raster_invalidation_info) {
+  void SetNeedsDisplayRect(const gfx::Rect& rect) {
     cc_picture_layer_->SetNeedsDisplayRect(rect);
+  }
 
-    if (!raster_invalidation_info || rect.IsEmpty())
-      return;
-
-    RasterInvalidationTracking& tracking =
+  void AddTrackedRasterInvalidations(
+      const RasterInvalidationTracking& tracking) {
+    auto& cc_tracking =
         CcLayersRasterInvalidationTrackingMap().Add(cc_picture_layer_.get());

[chrishtr, 2017/05/10 17:25:33]

cc_picture_layer_ is persisted across frames, and already tracks raster
invalidations.
What advantage does copying it from frame to frame in PaintController do vs
storing it here?

[Xianzhu, 2017/05/10 18:27:02]

I see. That's not necessary. We can just keep incremental tracking in
PaintController and add into cc_tracking.

-
-    tracking.tracked_raster_invalidations.push_back(*raster_invalidation_info);
+    cc_tracking.tracked_invalidations.AppendVector(
+        tracking.tracked_invalidations);
 
     if (RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled()) {
-      // TODO(crbug.com/496260): Some antialiasing effects overflow the paint
-      // invalidation rect.
-      IntRect r = raster_invalidation_info->rect;
-      r.Inflate(1);
-      tracking.raster_invalidation_region_since_last_paint.Unite(r);
+      cc_tracking.invalidation_region_since_last_paint.Unite(
+          tracking.invalidation_region_since_last_paint);
     }
   }
 
@@ -171,17 +167,10 @@ PaintArtifactCompositor::PaintArtifactCompositor() {
   root_layer_ = cc::Layer::Create();
   web_layer_ = Platform::Current()->CompositorSupport()->CreateLayerFromCCLayer(
       root_layer_.get());
-  is_tracking_raster_invalidations_ = false;
 }
 
 PaintArtifactCompositor::~PaintArtifactCompositor() {}
 
-void PaintArtifactCompositor::SetTracksRasterInvalidations(
-    bool tracks_paint_invalidations) {
-  ResetTrackedRasterInvalidations();
-  is_tracking_raster_invalidations_ = tracks_paint_invalidations;
-}
-
 void PaintArtifactCompositor::ResetTrackedRasterInvalidations() {
   for (auto& client : content_layer_clients_)
     client->ResetTrackedRasterInvalidations();
@@ -288,13 +277,12 @@ PaintArtifactCompositor::CompositedLayerForPendingLayer(
   cc_picture_layer->SetContentsOpaque(pending_layer.known_to_be_opaque);
   content_layer_client->ClearPaintChunkDebugData();
 
-  for (const auto& paint_chunk : pending_layer.paint_chunks) {
-    RasterInvalidationTracking* raster_tracking =
-        tracking_map ? tracking_map->Find(paint_chunk) : nullptr;
-    DCHECK(!raster_tracking ||
-           raster_tracking->tracked_raster_invalidations.size() ==
-               paint_chunk->raster_invalidation_rects.size());
+  // We always copy all tracked invalidations from paint_chunk to
+  // content_layer_client from scratch.
+  if (tracking_map)
+    content_layer_client->ResetTrackedRasterInvalidations();
 
+  for (const auto& paint_chunk : pending_layer.paint_chunks) {
     if (store_debug_info) {
       content_layer_client->AddPaintChunkDebugData(
           paint_artifact.GetDisplayItemList().SubsequenceAsJSON(
@@ -303,10 +291,8 @@ PaintArtifactCompositor::CompositedLayerForPendingLayer(
                   DisplayItemList::kShownOnlyDisplayItemTypes));
     }
 
-    for (unsigned index = 0;
-         index < paint_chunk->raster_invalidation_rects.size(); ++index) {
-      IntRect rect(
-          EnclosingIntRect(paint_chunk->raster_invalidation_rects[index]));
+    for (const auto& r : paint_chunk->raster_invalidation_rects) {
+      IntRect rect(EnclosingIntRect(r));
       gfx::Rect cc_invalidation_rect(rect.X(), rect.Y(),
                                      std::max(0, rect.Width()),
                                      std::max(0, rect.Height()));
@@ -315,12 +301,12 @@ PaintArtifactCompositor::CompositedLayerForPendingLayer(
       // Raster paintChunk.rasterInvalidationRects is in the space of the
       // containing transform node, so need to subtract off the layer offset.
       cc_invalidation_rect.Offset(-cc_combined_bounds.OffsetFromOrigin());
-      content_layer_client->SetNeedsDisplayRect(
-          cc_invalidation_rect,
-          raster_tracking
-              ? &raster_tracking->tracked_raster_invalidations[index]
-              : nullptr);
+      content_layer_client->SetNeedsDisplayRect(cc_invalidation_rect);
     }
+
+    if (auto* raster_tracking =
+            tracking_map ? tracking_map->Find(paint_chunk) : nullptr)
+      content_layer_client->AddTrackedRasterInvalidations(*raster_tracking);
   }
 
   new_content_layer_clients.push_back(std::move(content_layer_client));