third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp - Issue 1588543004: Remove paintInvalidationRect from display item client invalidation

Unified Diff: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

Issue 1588543004: Remove paintInvalidationRect from display item client invalidation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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

Download patch

Index: third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

index 65a8fb6a8f9589416a14a18f5a164a2a57c60c09..7260c3195b99988ba14f1b1ca58faee5a4a2aad7 100644

--- a/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

+++ b/third_party/WebKit/Source/platform/graphics/paint/PaintControllerTest.cpp

@@ -127,7 +127,7 @@ TEST_F(PaintControllerTest, UpdateBasic)

TestDisplayItem(second, backgroundDrawingType),

TestDisplayItem(first, foregroundDrawingType));

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 300, 300));

drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 300, 300));

paintController().commitNewDisplayItems();

@@ -154,7 +154,7 @@ TEST_F(PaintControllerTest, UpdateSwapOrder)

TestDisplayItem(second, backgroundDrawingType),

TestDisplayItem(unaffected, backgroundDrawingType));

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(second);

drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));

drawRect(context, unaffected, backgroundDrawingType, FloatRect(300, 300, 10, 10));

@@ -215,7 +215,7 @@ TEST_F(PaintControllerTest, UpdateInvalidationWithPhases)

TestDisplayItem(second, foregroundDrawingType),

TestDisplayItem(third, foregroundDrawingType));

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 100, 100));

drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 50, 200));

drawRect(context, third, backgroundDrawingType, FloatRect(300, 100, 50, 50));

@@ -247,8 +247,8 @@ TEST_F(PaintControllerTest, UpdateAddFirstOverlap)

TestDisplayItem(second, backgroundDrawingType),

TestDisplayItem(second, foregroundDrawingType));

- paintController().invalidate(first, PaintInvalidationFull, nullptr);

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(first);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));

drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));

drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));

@@ -261,7 +261,7 @@ TEST_F(PaintControllerTest, UpdateAddFirstOverlap)

TestDisplayItem(second, backgroundDrawingType),

TestDisplayItem(second, foregroundDrawingType));

- paintController().invalidate(first, PaintInvalidationFull, nullptr);

+ paintController().invalidate(first);

drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));

drawRect(context, second, foregroundDrawingType, FloatRect(200, 200, 50, 50));

paintController().commitNewDisplayItems();

@@ -285,8 +285,8 @@ TEST_F(PaintControllerTest, UpdateAddLastOverlap)

TestDisplayItem(first, backgroundDrawingType),

TestDisplayItem(first, foregroundDrawingType));

- paintController().invalidate(first, PaintInvalidationFull, nullptr);

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(first);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));

drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));

drawRect(context, second, backgroundDrawingType, FloatRect(200, 200, 50, 50));

@@ -299,8 +299,8 @@ TEST_F(PaintControllerTest, UpdateAddLastOverlap)

TestDisplayItem(second, backgroundDrawingType),

TestDisplayItem(second, foregroundDrawingType));

- paintController().invalidate(first, PaintInvalidationFull, nullptr);

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(first);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));

drawRect(context, first, foregroundDrawingType, FloatRect(100, 100, 150, 150));

paintController().commitNewDisplayItems();

@@ -329,7 +329,7 @@ TEST_F(PaintControllerTest, UpdateClip)

TestDisplayItem(second, backgroundDrawingType),

TestDisplayItem(first, DisplayItem::clipTypeToEndClipType(clipType)));

- paintController().invalidate(first, PaintInvalidationFull, nullptr);

+ paintController().invalidate(first);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));

drawRect(context, second, backgroundDrawingType, FloatRect(100, 100, 150, 150));

paintController().commitNewDisplayItems();

@@ -338,7 +338,7 @@ TEST_F(PaintControllerTest, UpdateClip)

TestDisplayItem(first, backgroundDrawingType),

TestDisplayItem(second, backgroundDrawingType));

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(100, 100, 150, 150));

{

ClipRecorder clipRecorder(context, second, clipType, LayoutRect(1, 1, 2, 2));

@@ -371,7 +371,7 @@ TEST_F(PaintControllerTest, CachedDisplayItems)

const SkPicture* firstPicture = static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[0]).picture();

const SkPicture* secondPicture = static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[1]).picture();

- paintController().invalidate(first, PaintInvalidationFull, nullptr);

+ paintController().invalidate(first);

EXPECT_FALSE(paintController().clientCacheIsValid(first));

EXPECT_TRUE(paintController().clientCacheIsValid(second));

@@ -423,7 +423,7 @@ TEST_F(PaintControllerTest, ComplexUpdateSwapOrder)

TestDisplayItem(container2, foregroundDrawingType));

// Simulate the situation when container1 e.g. gets a z-index that is now greater than container2.

- paintController().invalidate(container1, PaintInvalidationFull, nullptr);

+ paintController().invalidate(container1);

drawRect(context, container2, backgroundDrawingType, FloatRect(100, 200, 100, 100));

drawRect(context, content2, backgroundDrawingType, FloatRect(100, 200, 50, 200));

drawRect(context, content2, foregroundDrawingType, FloatRect(100, 200, 50, 200));

@@ -581,13 +581,13 @@ TEST_F(PaintControllerTest, CachedNestedSubsequenceUpdate)

TestDisplayItem(container2, DisplayItem::EndSubsequence));

// Invalidate container1 but not content1.

- paintController().invalidate(container1, PaintInvalidationFull, nullptr);

+ paintController().invalidate(container1);

// Container2 itself now becomes empty (but still has the 'content2' child),

// and chooses not to output subsequence info.

- paintController().invalidate(container2, PaintInvalidationFull, nullptr);

- paintController().invalidate(content2, PaintInvalidationFull, nullptr);

+ paintController().invalidate(container2);

+ paintController().invalidate(content2);

EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, container2));

EXPECT_FALSE(SubsequenceRecorder::useCachedSubsequenceIfPossible(context, content2));

// Content2 now outputs foreground only.

@@ -683,7 +683,7 @@ TEST_F(PaintControllerTest, Scope)

EXPECT_NE(picture2, static_cast<const DrawingDisplayItem&>(paintController().displayItemList()[2]).picture());

// Now the multicol becomes 3 columns and repaints.

- paintController().invalidate(multicol, PaintInvalidationFull, nullptr);

+ paintController().invalidate(multicol);

drawRect(context, multicol, backgroundDrawingType, FloatRect(100, 100, 100, 100));

paintController().beginScope();

@@ -732,7 +732,7 @@ TEST_F(PaintControllerTest, OptimizeNoopPairs)

TestDisplayItem(second, DisplayItem::EndClipPath),

TestDisplayItem(third, backgroundDrawingType));

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));

{

ClipRecorder clipRecorder(context, second, clipType, LayoutRect(1, 1, 2, 2));

@@ -746,7 +746,7 @@ TEST_F(PaintControllerTest, OptimizeNoopPairs)

TestDisplayItem(first, backgroundDrawingType),

TestDisplayItem(third, backgroundDrawingType));

- paintController().invalidate(second, PaintInvalidationFull, nullptr);

+ paintController().invalidate(second);

drawRect(context, first, backgroundDrawingType, FloatRect(0, 0, 100, 100));

{

ClipRecorder clipRecorder(context, second, clipType, LayoutRect(1, 1, 2, 2));

« no previous file with comments | « third_party/WebKit/Source/platform/graphics/paint/PaintController.cpp ('k') | no next file » | no next file with comments »