Tweak PaintInvalidationReasons

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

 // Copyright 2017 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.
 
 #include "core/editing/CaretDisplayItemClient.h"
 
 #include "core/HTMLNames.h"
 #include "core/editing/FrameSelection.h"
 #include "core/frame/FrameView.h"
 #include "core/layout/LayoutTestHelper.h"
@@ skipping 82 matching lines @@
   LayoutRect caret_visual_rect = GetCaretDisplayItemClient().VisualRect();
   EXPECT_EQ(1, caret_visual_rect.Width());
   EXPECT_EQ(block->Location(), caret_visual_rect.Location());
 
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(1u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect),
             (*raster_invalidations)[0].rect);
   EXPECT_EQ(block, (*raster_invalidations)[0].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[0].reason);
 
   std::unique_ptr<JSONArray> object_invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   ASSERT_EQ(1u, object_invalidations->size());
   String s;
   JSONObject::Cast(object_invalidations->at(0))->Get("object")->AsString(&s);
   EXPECT_EQ("Caret", s);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Move the caret to the end of the text. Should invalidate both the old and
   // new carets.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   Selection().SetSelection(
       SelectionInDOMTree::Builder().Collapse(Position(text, 5)).Build());
   UpdateAllLifecyclePhases();
   EXPECT_TRUE(block->ShouldPaintCursorCaret());
 
   LayoutRect new_caret_visual_rect = GetCaretDisplayItemClient().VisualRect();
   EXPECT_EQ(caret_visual_rect.Size(), new_caret_visual_rect.Size());
   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()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect),
             (*raster_invalidations)[0].rect);
   EXPECT_EQ(block, (*raster_invalidations)[0].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[0].reason);
   EXPECT_EQ(EnclosingIntRect(new_caret_visual_rect),
             (*raster_invalidations)[1].rect);
   EXPECT_EQ(block, (*raster_invalidations)[1].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[1].reason);
 
   object_invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   ASSERT_EQ(1u, object_invalidations->size());
   JSONObject::Cast(object_invalidations->at(0))->Get("object")->AsString(&s);
   EXPECT_EQ("Caret", s);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Remove selection. Should invalidate the old caret.
   LayoutRect old_caret_visual_rect = new_caret_visual_rect;
@@ skipping 48 matching lines @@
   EXPECT_EQ(block2->VisualRect().Location(), caret_visual_rect2.Location());
   EXPECT_FALSE(block1->ShouldPaintCursorCaret());
   EXPECT_TRUE(block2->ShouldPaintCursorCaret());
 
   const auto* raster_invalidations =
       &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect1),
             (*raster_invalidations)[0].rect);
   EXPECT_EQ(block1, (*raster_invalidations)[0].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[0].reason);
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect2),
             (*raster_invalidations)[1].rect);
   EXPECT_EQ(block2, (*raster_invalidations)[1].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[1].reason);
 
   std::unique_ptr<JSONArray> object_invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   ASSERT_EQ(2u, object_invalidations->size());
   GetDocument().View()->SetTracksPaintInvalidations(false);
 
   // Move the caret back into block1.
   GetDocument().View()->SetTracksPaintInvalidations(true);
   Selection().SetSelection(SelectionInDOMTree::Builder()
                                .Collapse(Position(block_element1, 0))
                                .Build());
   UpdateAllLifecyclePhases();
 
   EXPECT_EQ(caret_visual_rect1, GetCaretDisplayItemClient().VisualRect());
   EXPECT_TRUE(block1->ShouldPaintCursorCaret());
   EXPECT_FALSE(block2->ShouldPaintCursorCaret());
 
   raster_invalidations = &GetRasterInvalidationTracking()->invalidations;
   ASSERT_EQ(2u, raster_invalidations->size());
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect1),
             (*raster_invalidations)[0].rect);
   EXPECT_EQ(block1, (*raster_invalidations)[0].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[0].reason);
   EXPECT_EQ(EnclosingIntRect(caret_visual_rect2),
             (*raster_invalidations)[1].rect);
   EXPECT_EQ(block2, (*raster_invalidations)[1].client);
-  EXPECT_EQ(kPaintInvalidationCaret, (*raster_invalidations)[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, (*raster_invalidations)[1].reason);
 
   object_invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   ASSERT_EQ(2u, object_invalidations->size());
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
 TEST_F(CaretDisplayItemClientTest, UpdatePreviousLayoutBlock) {
   GetDocument().body()->setContentEditable("true", ASSERT_NO_EXCEPTION);
   GetDocument().GetPage()->GetFocusController().SetActive(true);
@@ skipping 79 matching lines @@
   LayoutRect new_caret_visual_rect = GetCaretDisplayItemClient().VisualRect();
   EXPECT_EQ(caret_visual_rect.Size(), new_caret_visual_rect.Size());
   EXPECT_EQ(caret_visual_rect.Y(), new_caret_visual_rect.Y());
   EXPECT_LT(caret_visual_rect.X(), new_caret_visual_rect.X());
 
   const auto& 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);
-  EXPECT_EQ(kPaintInvalidationCaret, raster_invalidations[0].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, raster_invalidations[0].reason);
   EXPECT_EQ(EnclosingIntRect(new_caret_visual_rect),
             raster_invalidations[1].rect);
   EXPECT_EQ(block, raster_invalidations[1].client);
-  EXPECT_EQ(kPaintInvalidationCaret, raster_invalidations[1].reason);
+  EXPECT_EQ(PaintInvalidationReason::kCaret, raster_invalidations[1].reason);
 
   auto object_invalidations =
       GetDocument().View()->TrackedObjectPaintInvalidationsAsJSON();
   ASSERT_EQ(1u, object_invalidations->size());
   String s;
   JSONObject::Cast(object_invalidations->at(0))->Get("object")->AsString(&s);
   EXPECT_EQ("Caret", s);
   GetDocument().View()->SetTracksPaintInvalidations(false);
 }
 
@@ skipping 28 matching lines @@
   EXPECT_EQ(LayoutRect(50, 50, 1, 1), GetCaretDisplayItemClient().VisualRect());
 
   // Uncomposite container.
   container->setAttribute(HTMLNames::styleAttr, "");
   UpdateAllLifecyclePhases();
   EXPECT_EQ(LayoutRect(116, 105, 1, 1),
             GetCaretDisplayItemClient().VisualRect());
 }
 
 }  // namespace blink