third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp - Issue 2872423002: Tweak PaintInvalidationReasons

Unified Diff: third_party/WebKit/Source/core/editing/CaretDisplayItemClientTest.cpp

Issue 2872423002: Tweak PaintInvalidationReasons (Closed)

Patch Set: Rebaseline-cl Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « third_party/WebKit/Source/core/editing/CaretDisplayItemClient.cpp ('k') | third_party/WebKit/Source/core/editing/markers/DocumentMarkerController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 406799e172d78a9aba0a8b52eb4e37a03c525780..d3525f1254401620c8b411a572661a9d7b249e19 100644

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

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

@@ -100,7 +100,7 @@ TEST_F(CaretDisplayItemClientTest, CaretPaintInvalidation) {

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();

@@ -128,11 +128,11 @@ TEST_F(CaretDisplayItemClientTest, CaretPaintInvalidation) {

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();

@@ -201,11 +201,11 @@ TEST_F(CaretDisplayItemClientTest, CaretMovesBetweenBlocks) {

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();

@@ -228,11 +228,11 @@ TEST_F(CaretDisplayItemClientTest, CaretMovesBetweenBlocks) {

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();

@@ -332,11 +332,11 @@ TEST_F(CaretDisplayItemClientTest, CaretHideMoveAndShow) {

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();