[SPv2] Renaming and refactor about raster invalidation tracking

third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp

Index: third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp
diff --git a/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp b/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp
index d2275e34b1c327ba5a9df918f3c294e641d68edd..c783f1274b26a97bc05752785cc21617f3c8c328 100644
--- a/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp
+++ b/third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp
@@ -95,7 +95,7 @@ TEST_F(CaretDisplayItemClientTest, CaretPaintInvalidation) {
   EXPECT_EQ(block->Location(), caret_visual_rect.Location());
 
   const auto* raster_invalidations =
-      &GetRasterInvalidationTracking()->tracked_raster_invalidations;
+      &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect),
             (*raster_invalidations)[0].rect);
@@ -123,8 +123,7 @@ TEST_F(CaretDisplayItemClientTest, CaretPaintInvalidation) {
   EXPECT_EQ(caret_visual_rect.Y(), new_caret_visual_rect.Y());
   EXPECT_LT(caret_visual_rect.X(), new_caret_visual_rect.X());
 
-  raster_invalidations =
-      &GetRasterInvalidationTracking()->tracked_raster_invalidations;
+  raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect),
             (*raster_invalidations)[0].rect);
@@ -150,8 +149,7 @@ TEST_F(CaretDisplayItemClientTest, CaretPaintInvalidation) {
   EXPECT_FALSE(block->ShouldPaintCursorCaret());
   EXPECT_EQ(LayoutRect(), GetCaretDisplayItemClient().VisualRect());
 
-  raster_invalidations =
-      &GetRasterInvalidationTracking()->tracked_raster_invalidations;
+  raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(old_caret_visual_rect),
             (*raster_invalidations)[0].rect);
@@ -198,7 +196,7 @@ TEST_F(CaretDisplayItemClientTest, CaretMovesBetweenBlocks) {
   EXPECT_TRUE(block2->ShouldPaintCursorCaret());
 
   const auto* raster_invalidations =
-      &GetRasterInvalidationTracking()->tracked_raster_invalidations;
+      &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect1),
             (*raster_invalidations)[0].rect);
@@ -225,8 +223,7 @@ TEST_F(CaretDisplayItemClientTest, CaretMovesBetweenBlocks) {
   EXPECT_TRUE(block1->ShouldPaintCursorCaret());
   EXPECT_FALSE(block2->ShouldPaintCursorCaret());
 
-  raster_invalidations =
-      &GetRasterInvalidationTracking()->tracked_raster_invalidations;
+  raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect1),
             (*raster_invalidations)[0].rect);
@@ -331,7 +328,7 @@ TEST_F(CaretDisplayItemClientTest, CaretHideMoveAndShow) {
   EXPECT_LT(caret_visual_rect.X(), new_caret_visual_rect.X());
 
   const auto& raster_invalidations =
-      GetRasterInvalidationTracking()->tracked_raster_invalidations;
+      GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations.size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect), raster_invalidations[0].rect);
   EXPECT_EQ(block, raster_invalidations[0].client);