Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp

Issue 2465983002: Rename "paint invalidation rect" etc. to "visual rect". (Closed)
Patch Set: - Created 4 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp
diff --git a/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp b/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp
index 9d24f1e331496dc20e05a10b8aad4306f24a3528..4c462ef0c94bf3803f68f627fcd5c390c50c3c07 100644
--- a/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp
+++ b/third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp
@@ -234,14 +234,14 @@ TEST_F(VisualRectMappingTest, SelfFlippedWritingMode) {
"</div>");
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect overflowRect = target->localOverflowRectForPaintInvalidation();
+ LayoutRect visualRect = target->localVisualRect();
// -40 = -box_shadow_offset_x(40) (with target's top-right corner as the
// origin)
// 140 = width(100) + box_shadow_offset_x(40)
// 70 = height(50) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(-40, 0, 140, 70), overflowRect);
+ EXPECT_EQ(LayoutRect(-40, 0, 140, 70), visualRect);
- LayoutRect rect = overflowRect;
+ LayoutRect rect = visualRect;
// TODO(wkorman): The calls to flipForWritingMode() here and in other test
// cases below are necessary because mapToVisualRectInAncestorSpace()
// currently expects the input rect to be in "physical coordinates" (*not*
@@ -252,11 +252,11 @@ TEST_F(VisualRectMappingTest, SelfFlippedWritingMode) {
// This rect is in physical coordinates of target.
EXPECT_EQ(LayoutRect(0, 0, 140, 70), rect);
- rect = overflowRect;
+ rect = visualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(&layoutView(), rect));
EXPECT_EQ(LayoutRect(222, 111, 140, 70), rect);
- checkPaintInvalidationStateRectMapping(rect, overflowRect, *target,
+ checkPaintInvalidationStateRectMapping(rect, visualRect, *target,
layoutView(), layoutView());
}
@@ -270,15 +270,14 @@ TEST_F(VisualRectMappingTest, ContainerFlippedWritingMode) {
"</div>");
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
+ LayoutRect targetVisualRect = target->localVisualRect();
// -40 = -box_shadow_offset_x(40) (with target's top-right corner as the
// origin)
// 140 = width(100) + box_shadow_offset_x(40)
// 110 = height(90) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(-40, 0, 140, 110), targetOverflowRect);
+ EXPECT_EQ(LayoutRect(-40, 0, 140, 110), targetVisualRect);
- LayoutRect rect = targetOverflowRect;
+ LayoutRect rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
// This rect is in physical coordinates of target.
@@ -286,31 +285,30 @@ TEST_F(VisualRectMappingTest, ContainerFlippedWritingMode) {
LayoutBlock* container =
toLayoutBlock(getLayoutObjectByElementId("container"));
- rect = targetOverflowRect;
+ rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(container, rect));
// 100 is the physical x location of target in container.
EXPECT_EQ(LayoutRect(100, 0, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(&layoutView(), rect));
EXPECT_EQ(LayoutRect(322, 111, 140, 110), rect);
- checkPaintInvalidationStateRectMapping(rect, targetOverflowRect, *target,
+ checkPaintInvalidationStateRectMapping(rect, targetVisualRect, *target,
layoutView(), layoutView());
- LayoutRect containerOverflowRect =
- container->localOverflowRectForPaintInvalidation();
- EXPECT_EQ(LayoutRect(0, 0, 200, 100), containerOverflowRect);
- rect = containerOverflowRect;
+ LayoutRect containerVisualRect = container->localVisualRect();
+ EXPECT_EQ(LayoutRect(0, 0, 200, 100), containerVisualRect);
+ rect = containerVisualRect;
container->flipForWritingMode(rect);
EXPECT_TRUE(container->mapToVisualRectInAncestorSpace(container, rect));
EXPECT_EQ(LayoutRect(0, 0, 200, 100), rect);
- rect = containerOverflowRect;
+ rect = containerVisualRect;
container->flipForWritingMode(rect);
EXPECT_TRUE(container->mapToVisualRectInAncestorSpace(&layoutView(), rect));
EXPECT_EQ(LayoutRect(222, 111, 200, 100), rect);
- checkPaintInvalidationStateRectMapping(
- rect, containerOverflowRect, *container, layoutView(), layoutView());
+ checkPaintInvalidationStateRectMapping(rect, containerVisualRect, *container,
+ layoutView(), layoutView());
}
TEST_F(VisualRectMappingTest, ContainerOverflowScroll) {
@@ -331,16 +329,15 @@ TEST_F(VisualRectMappingTest, ContainerOverflowScroll) {
document().view()->updateAllLifecyclePhases();
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
+ LayoutRect targetVisualRect = target->localVisualRect();
// 140 = width(100) + box_shadow_offset_x(40)
// 110 = height(90) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(0, 0, 140, 110), targetOverflowRect);
- LayoutRect rect = targetOverflowRect;
+ EXPECT_EQ(LayoutRect(0, 0, 140, 110), targetVisualRect);
+ LayoutRect rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
EXPECT_EQ(LayoutRect(0, 0, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(container, rect));
rect.move(-container->scrolledContentOffset());
// 2 = target_x(0) + container_border_left(10) - scroll_left(8)
@@ -349,32 +346,31 @@ TEST_F(VisualRectMappingTest, ContainerOverflowScroll) {
// overflow:scroll.
EXPECT_EQ(LayoutRect(2, 3, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(&layoutView(), rect));
// (2, 3, 140, 100) is first clipped by container's overflow clip, to
// (10, 10, 50, 80), then is by added container's offset in LayoutView
// (111, 222).
EXPECT_EQ(LayoutRect(232, 121, 50, 80), rect);
- checkPaintInvalidationStateRectMapping(rect, targetOverflowRect, *target,
+ checkPaintInvalidationStateRectMapping(rect, targetVisualRect, *target,
layoutView(), layoutView());
- LayoutRect containerOverflowRect =
- container->localOverflowRectForPaintInvalidation();
+ LayoutRect containerVisualRect = container->localVisualRect();
// Because container has overflow clip, its visual overflow doesn't include
// overflow from children.
// 70 = width(50) + border_left_width(10) + border_right_width(10)
// 100 = height(80) + border_top_width(10) + border_bottom_width(10)
- EXPECT_EQ(LayoutRect(0, 0, 70, 100), containerOverflowRect);
- rect = containerOverflowRect;
+ EXPECT_EQ(LayoutRect(0, 0, 70, 100), containerVisualRect);
+ rect = containerVisualRect;
EXPECT_TRUE(container->mapToVisualRectInAncestorSpace(container, rect));
// Container should not apply overflow clip on its own overflow rect.
EXPECT_EQ(LayoutRect(0, 0, 70, 100), rect);
- rect = containerOverflowRect;
+ rect = containerVisualRect;
EXPECT_TRUE(container->mapToVisualRectInAncestorSpace(&layoutView(), rect));
EXPECT_EQ(LayoutRect(222, 111, 70, 100), rect);
- checkPaintInvalidationStateRectMapping(
- rect, containerOverflowRect, *container, layoutView(), layoutView());
+ checkPaintInvalidationStateRectMapping(rect, containerVisualRect, *container,
+ layoutView(), layoutView());
}
TEST_F(VisualRectMappingTest, ContainerFlippedWritingModeAndOverflowScroll) {
@@ -401,21 +397,20 @@ TEST_F(VisualRectMappingTest, ContainerFlippedWritingModeAndOverflowScroll) {
document().view()->updateAllLifecyclePhases();
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
+ LayoutRect targetVisualRect = target->localVisualRect();
// -40 = -box_shadow_offset_x(40) (with target's top-right corner as the
// origin)
// 140 = width(100) + box_shadow_offset_x(40)
// 110 = height(90) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(-40, 0, 140, 110), targetOverflowRect);
+ EXPECT_EQ(LayoutRect(-40, 0, 140, 110), targetVisualRect);
- LayoutRect rect = targetOverflowRect;
+ LayoutRect rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
// This rect is in physical coordinates of target.
EXPECT_EQ(LayoutRect(0, 0, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(container, rect));
rect.move(-container->scrolledContentOffset());
@@ -424,7 +419,7 @@ TEST_F(VisualRectMappingTest, ContainerFlippedWritingModeAndOverflowScroll) {
// Rect is clipped by container's overflow clip because of overflow:scroll.
EXPECT_EQ(LayoutRect(-2, 3, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(&layoutView(), rect));
// (-2, 3, 140, 100) is first clipped by container's overflow clip, to
@@ -434,31 +429,30 @@ TEST_F(VisualRectMappingTest, ContainerFlippedWritingModeAndOverflowScroll) {
// offset
// by extra horizontal border-widths because of layout error.
EXPECT_EQ(LayoutRect(322, 121, 50, 80), rect);
- checkPaintInvalidationStateRectMapping(rect, targetOverflowRect, *target,
+ checkPaintInvalidationStateRectMapping(rect, targetVisualRect, *target,
layoutView(), layoutView());
- LayoutRect containerOverflowRect =
- container->localOverflowRectForPaintInvalidation();
+ LayoutRect containerVisualRect = container->localVisualRect();
// Because container has overflow clip, its visual overflow doesn't include
// overflow from children.
// 110 = width(50) + border_left_width(40) + border_right_width(20)
// 120 = height(80) + border_top_width(10) + border_bottom_width(30)
- EXPECT_EQ(LayoutRect(0, 0, 110, 120), containerOverflowRect);
+ EXPECT_EQ(LayoutRect(0, 0, 110, 120), containerVisualRect);
- rect = containerOverflowRect;
+ rect = containerVisualRect;
container->flipForWritingMode(rect);
EXPECT_TRUE(container->mapToVisualRectInAncestorSpace(container, rect));
EXPECT_EQ(LayoutRect(0, 0, 110, 120), rect);
- rect = containerOverflowRect;
+ rect = containerVisualRect;
container->flipForWritingMode(rect);
EXPECT_TRUE(container->mapToVisualRectInAncestorSpace(&layoutView(), rect));
// TODO(crbug.com/600039): rect.x() should be 222 (left), but is offset by
// extra horizontal
// border-widths because of layout error.
EXPECT_EQ(LayoutRect(282, 111, 110, 120), rect);
- checkPaintInvalidationStateRectMapping(
- rect, containerOverflowRect, *container, layoutView(), layoutView());
+ checkPaintInvalidationStateRectMapping(rect, containerVisualRect, *container,
+ layoutView(), layoutView());
}
TEST_F(VisualRectMappingTest, ContainerOverflowHidden) {
@@ -479,16 +473,15 @@ TEST_F(VisualRectMappingTest, ContainerOverflowHidden) {
document().view()->updateAllLifecyclePhases();
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
+ LayoutRect targetVisualRect = target->localVisualRect();
// 140 = width(100) + box_shadow_offset_x(40)
// 110 = height(90) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(0, 0, 140, 110), targetOverflowRect);
- LayoutRect rect = targetOverflowRect;
+ EXPECT_EQ(LayoutRect(0, 0, 140, 110), targetVisualRect);
+ LayoutRect rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
EXPECT_EQ(LayoutRect(0, 0, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(container, rect));
// Rect is not clipped by container's overflow clip.
EXPECT_EQ(LayoutRect(10, 10, 140, 110), rect);
@@ -517,21 +510,20 @@ TEST_F(VisualRectMappingTest, ContainerFlippedWritingModeAndOverflowHidden) {
document().view()->updateAllLifecyclePhases();
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
+ LayoutRect targetVisualRect = target->localVisualRect();
// -40 = -box_shadow_offset_x(40) (with target's top-right corner as the
// origin)
// 140 = width(100) + box_shadow_offset_x(40)
// 110 = height(90) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(-40, 0, 140, 110), targetOverflowRect);
+ EXPECT_EQ(LayoutRect(-40, 0, 140, 110), targetVisualRect);
- LayoutRect rect = targetOverflowRect;
+ LayoutRect rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
// This rect is in physical coordinates of target.
EXPECT_EQ(LayoutRect(0, 0, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
target->flipForWritingMode(rect);
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(container, rect));
// 58 = target_physical_x(100) + container_border_left(40) - scroll_left(58)
@@ -562,18 +554,17 @@ TEST_F(VisualRectMappingTest, ContainerAndTargetDifferentFlippedWritingMode) {
document().view()->updateAllLifecyclePhases();
LayoutBlock* target = toLayoutBlock(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
+ LayoutRect targetVisualRect = target->localVisualRect();
// 140 = width(100) + box_shadow_offset_x(40)
// 110 = height(90) + box_shadow_offset_y(20)
- EXPECT_EQ(LayoutRect(0, 0, 140, 110), targetOverflowRect);
+ EXPECT_EQ(LayoutRect(0, 0, 140, 110), targetVisualRect);
- LayoutRect rect = targetOverflowRect;
+ LayoutRect rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
// This rect is in physical coordinates of target.
EXPECT_EQ(LayoutRect(0, 0, 140, 110), rect);
- rect = targetOverflowRect;
+ rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(container, rect));
rect.move(-container->scrolledContentOffset());
// -2 = target_physical_x(100) + container_border_left(40) - scroll_left(142)
@@ -608,13 +599,12 @@ TEST_F(VisualRectMappingTest,
toLayoutBlock(getLayoutObjectByElementId("normal-flow"));
EXPECT_EQ(scroller, &normalFlow->containerForPaintInvalidation());
- LayoutRect normalFlowOverflowRect =
- normalFlow->localOverflowRectForPaintInvalidation();
- EXPECT_EQ(LayoutRect(0, 0, 2000, 2000), normalFlowOverflowRect);
- LayoutRect rect = normalFlowOverflowRect;
+ LayoutRect normalFlowVisualRect = normalFlow->localVisualRect();
+ EXPECT_EQ(LayoutRect(0, 0, 2000, 2000), normalFlowVisualRect);
+ LayoutRect rect = normalFlowVisualRect;
EXPECT_TRUE(normalFlow->mapToVisualRectInAncestorSpace(scroller, rect));
EXPECT_EQ(LayoutRect(0, 0, 2000, 2000), rect);
- checkPaintInvalidationStateRectMapping(rect, normalFlowOverflowRect,
+ checkPaintInvalidationStateRectMapping(rect, normalFlowVisualRect,
*normalFlow, layoutView(), *scroller);
LayoutBlock* stackingContext =
@@ -623,13 +613,12 @@ TEST_F(VisualRectMappingTest,
EXPECT_EQ(stackingContext, &absolute->containerForPaintInvalidation());
EXPECT_EQ(stackingContext, absolute->container());
- LayoutRect absoluteOverflowRect =
- absolute->localOverflowRectForPaintInvalidation();
- EXPECT_EQ(LayoutRect(0, 0, 50, 50), absoluteOverflowRect);
- rect = absoluteOverflowRect;
+ LayoutRect absoluteVisualRect = absolute->localVisualRect();
+ EXPECT_EQ(LayoutRect(0, 0, 50, 50), absoluteVisualRect);
+ rect = absoluteVisualRect;
EXPECT_TRUE(absolute->mapToVisualRectInAncestorSpace(stackingContext, rect));
EXPECT_EQ(LayoutRect(222, 111, 50, 50), rect);
- checkPaintInvalidationStateRectMapping(rect, absoluteOverflowRect, *absolute,
+ checkPaintInvalidationStateRectMapping(rect, absoluteVisualRect, *absolute,
layoutView(), *stackingContext);
}
@@ -660,14 +649,13 @@ TEST_F(VisualRectMappingTest,
EXPECT_EQ(stackingContext, &absolute->containerForPaintInvalidation());
EXPECT_EQ(container, absolute->container());
- LayoutRect absoluteOverflowRect =
- absolute->localOverflowRectForPaintInvalidation();
- EXPECT_EQ(LayoutRect(0, 0, 50, 50), absoluteOverflowRect);
- LayoutRect rect = absoluteOverflowRect;
+ LayoutRect absoluteVisualRect = absolute->localVisualRect();
+ EXPECT_EQ(LayoutRect(0, 0, 50, 50), absoluteVisualRect);
+ LayoutRect rect = absoluteVisualRect;
EXPECT_TRUE(absolute->mapToVisualRectInAncestorSpace(stackingContext, rect));
// -172 = top(50) - y_offset_of_stacking_context(222)
EXPECT_EQ(LayoutRect(50, -172, 50, 50), rect);
- checkPaintInvalidationStateRectMapping(rect, absoluteOverflowRect, *absolute,
+ checkPaintInvalidationStateRectMapping(rect, absoluteVisualRect, *absolute,
layoutView(), *stackingContext);
}
@@ -681,13 +669,12 @@ TEST_F(VisualRectMappingTest, CSSClip) {
LayoutBox* target = toLayoutBox(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
- EXPECT_EQ(LayoutRect(0, 0, 400, 400), targetOverflowRect);
- LayoutRect rect = targetOverflowRect;
+ LayoutRect targetVisualRect = target->localVisualRect();
+ EXPECT_EQ(LayoutRect(0, 0, 400, 400), targetVisualRect);
+ LayoutRect rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(&layoutView(), rect));
EXPECT_EQ(LayoutRect(0, 0, 200, 200), rect);
- checkPaintInvalidationStateRectMapping(rect, targetOverflowRect, *target,
+ checkPaintInvalidationStateRectMapping(rect, targetVisualRect, *target,
layoutView(), layoutView());
}
@@ -701,13 +688,12 @@ TEST_F(VisualRectMappingTest, ContainPaint) {
LayoutBox* target = toLayoutBox(getLayoutObjectByElementId("target"));
- LayoutRect targetOverflowRect =
- target->localOverflowRectForPaintInvalidation();
- EXPECT_EQ(LayoutRect(0, 0, 400, 400), targetOverflowRect);
- LayoutRect rect = targetOverflowRect;
+ LayoutRect targetVisualRect = target->localVisualRect();
+ EXPECT_EQ(LayoutRect(0, 0, 400, 400), targetVisualRect);
+ LayoutRect rect = targetVisualRect;
EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(&layoutView(), rect));
EXPECT_EQ(LayoutRect(0, 0, 200, 200), rect);
- checkPaintInvalidationStateRectMapping(rect, targetOverflowRect, *target,
+ checkPaintInvalidationStateRectMapping(rect, targetVisualRect, *target,
layoutView(), layoutView());
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/PaintInvalidationState.cpp ('k') | third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698