[SPv2] Fix layout test crashes about raster invalidation

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PaintController_h
 #define PaintController_h
 
 #include <memory>
 #include <utility>
 #include "platform/PlatformExport.h"
@@ skipping 177 matching lines @@
   enum Usage { kForNormalUsage, kForPaintRecordBuilder };
   void SetUsage(Usage usage) { usage_ = usage; }
   bool IsForPaintRecordBuilder() const {
     return usage_ == kForPaintRecordBuilder;
   }
 #endif
 
   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
   void BeginShouldKeepAlive(const DisplayItemClient&);
 
   void BeginSubsequence(const DisplayItemClient& client) {
     current_subsequence_clients_.push_back(&client);
     BeginShouldKeepAlive(client);
   }
 
@@ skipping 68 matching lines @@
   // Resets the indices (e.g. m_nextItemToMatch) of
   // m_currentPaintArtifact.getDisplayItemList() to their initial values. This
   // should be called when the DisplayItemList in m_currentPaintArtifact is
   // newly created, or is changed causing the previous indices to be invalid.
   void ResetCurrentListIndices();
 
   void GenerateChunkRasterInvalidationRects(PaintChunk& new_chunk);
   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).
   void ShowUnderInvalidationError(const char* reason,
                                   const DisplayItem& new_item,
                                   const DisplayItem* old_item) const;
 
   void ShowSequenceUnderInvalidationError(const char* reason,
                                           const DisplayItemClient&,
                                           int start,
@@ skipping 104 matching lines @@
   size_t under_invalidation_checking_begin_;
   size_t under_invalidation_checking_end_;
 
   // Number of probable under-invalidations that have been skipped temporarily
   // because the mismatching display items may be removed in the future because
   // of no-op pairs or compositing folding.
   int skipped_probable_under_invalidation_count_;
   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.
   Vector<const DisplayItemClient*> current_subsequence_clients_;
 #endif
 
   typedef HashMap<const DisplayItemClient*, SubsequenceMarkers>
       CachedSubsequenceMap;
   CachedSubsequenceMap current_cached_subsequences_;
   CachedSubsequenceMap new_cached_subsequences_;
   size_t last_cached_subsequence_end_;
 
   FRIEND_TEST_ALL_PREFIXES(PaintControllerTest, CachedSubsequenceSwapOrder);
   FRIEND_TEST_ALL_PREFIXES(PaintControllerTest, CachedNestedSubsequenceUpdate);
 };
 
 }  // namespace blink
 
 #endif  // PaintController_h