third_party/WebKit/Source/core/paint/PaintInfoTest.cpp - Issue 1584903002: Improvement handling of background and outline paint phases

Unified Diff: third_party/WebKit/Source/core/paint/PaintInfoTest.cpp

Issue 1584903002: Improvement handling of background and outline paint phases (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@PaintPhaseRename

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

« third_party/WebKit/Source/core/paint/ObjectPainter.cpp ('K') | « third_party/WebKit/Source/core/paint/PaintInfo.h ('k') | third_party/WebKit/Source/core/paint/PaintLayerPainter.cpp » ('j') | third_party/WebKit/Source/core/paint/TablePainter.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/paint/PaintInfoTest.cpp

diff --git a/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp b/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp

index e578ad47e08bcfca9fb5f3d76c5bbfa8cc83bf1d..1c9f076e062a9b147703e0af9f3f5ff11d825203 100644

--- a/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp

+++ b/third_party/WebKit/Source/core/paint/PaintInfoTest.cpp

@@ -22,7 +22,7 @@ protected:

TEST_F(PaintInfoTest, intersectsCullRect)

{

- PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 50), PaintPhaseSelfBlockBackground, GlobalPaintNormalPhase, PaintLayerNoFlag);

+ PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 50), PaintPhaseSelfBlockBackgroundOnly, GlobalPaintNormalPhase, PaintLayerNoFlag);

EXPECT_TRUE(paintInfo.cullRect().intersectsCullRect(IntRect(0, 0, 1, 1)));

EXPECT_FALSE(paintInfo.cullRect().intersectsCullRect(IntRect(51, 51, 1, 1)));

@@ -30,7 +30,7 @@ TEST_F(PaintInfoTest, intersectsCullRect)

TEST_F(PaintInfoTest, intersectsCullRectWithLayoutRect)

{

- PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 50), PaintPhaseSelfBlockBackground, GlobalPaintNormalPhase, PaintLayerNoFlag);

+ PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 50), PaintPhaseSelfBlockBackgroundOnly, GlobalPaintNormalPhase, PaintLayerNoFlag);

EXPECT_TRUE(paintInfo.cullRect().intersectsCullRect(LayoutRect(0, 0, 1, 1)));

EXPECT_TRUE(paintInfo.cullRect().intersectsCullRect(LayoutRect(0.1, 0.1, 0.1, 0.1)));

@@ -38,7 +38,7 @@ TEST_F(PaintInfoTest, intersectsCullRectWithLayoutRect)

TEST_F(PaintInfoTest, intersectsCullRectWithTransform)

{

- PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 50), PaintPhaseSelfBlockBackground, GlobalPaintNormalPhase, PaintLayerNoFlag);

+ PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 50), PaintPhaseSelfBlockBackgroundOnly, GlobalPaintNormalPhase, PaintLayerNoFlag);

AffineTransform transform;

transform.translate(-2, -2);

@@ -48,7 +48,7 @@ TEST_F(PaintInfoTest, intersectsCullRectWithTransform)

TEST_F(PaintInfoTest, updateCullRect)

{

- PaintInfo paintInfo(m_context, IntRect(1, 1, 50, 50), PaintPhaseSelfBlockBackground, GlobalPaintNormalPhase, PaintLayerNoFlag);

+ PaintInfo paintInfo(m_context, IntRect(1, 1, 50, 50), PaintPhaseSelfBlockBackgroundOnly, GlobalPaintNormalPhase, PaintLayerNoFlag);

AffineTransform transform;

transform.translate(1, 1);

paintInfo.updateCullRect(transform);

@@ -59,7 +59,7 @@ TEST_F(PaintInfoTest, updateCullRect)

TEST_F(PaintInfoTest, intersectsVerticalRange)

{

- PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 100), PaintPhaseSelfBlockBackground, GlobalPaintNormalPhase, PaintLayerNoFlag);

+ PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 100), PaintPhaseSelfBlockBackgroundOnly, GlobalPaintNormalPhase, PaintLayerNoFlag);

EXPECT_TRUE(paintInfo.cullRect().intersectsVerticalRange(0, 1));

EXPECT_FALSE(paintInfo.cullRect().intersectsVerticalRange(100, 101));

@@ -67,7 +67,7 @@ TEST_F(PaintInfoTest, intersectsVerticalRange)

TEST_F(PaintInfoTest, intersectsHorizontalRange)

{

- PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 100), PaintPhaseSelfBlockBackground, GlobalPaintNormalPhase, PaintLayerNoFlag);

+ PaintInfo paintInfo(m_context, IntRect(0, 0, 50, 100), PaintPhaseSelfBlockBackgroundOnly, GlobalPaintNormalPhase, PaintLayerNoFlag);

EXPECT_TRUE(paintInfo.cullRect().intersectsHorizontalRange(0, 1));

EXPECT_FALSE(paintInfo.cullRect().intersectsHorizontalRange(50, 51));