[SPv2] Fix layout test crashes about raster invalidation

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

Index: third_party/WebKit/Source/platform/graphics/paint/PaintController.h
diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintController.h b/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
index 5bfc86ec8e4156d37fca6adf2b74337b78eb6f6e..07522169b69f5358591fea243e758a5100ad845f 100644
--- a/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintController.h
@@ -195,7 +195,7 @@ class PLATFORM_EXPORT PaintController {
   void SetTracksRasterInvalidations(bool value);
   RasterInvalidationTrackingMap<const PaintChunk>*
   PaintChunksRasterInvalidationTrackingMap() {
-    return paint_chunks_raster_invalidation_tracking_map_.get();
+    return raster_invalidation_tracking_map_.get();
   }
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
@@ -284,9 +284,9 @@ class PLATFORM_EXPORT PaintController {
   void GenerateChunkRasterInvalidationRectsComparingOldChunk(
       PaintChunk& new_chunk,
       const PaintChunk& old_chunk);
-  void AddRasterInvalidationInfo(const DisplayItemClient*,
-                                 PaintChunk&,
-                                 const FloatRect&);
+  void AddRasterInvalidation(const DisplayItemClient*,
+                             PaintChunk&,
+                             const FloatRect&);
 
   // The following two methods are for checking under-invalidations
   // (when RuntimeEnabledFeatures::paintUnderInvalidationCheckingEnabled).
@@ -411,7 +411,7 @@ class PLATFORM_EXPORT PaintController {
   String under_invalidation_message_prefix_;
 
   std::unique_ptr<RasterInvalidationTrackingMap<const PaintChunk>>
-      paint_chunks_raster_invalidation_tracking_map_;
+      raster_invalidation_tracking_map_;
 
 #if CHECK_DISPLAY_ITEM_CLIENT_ALIVENESS
   // A stack recording subsequence clients that are currently painting.