Rename "paint invalidation rect" etc. to "visual rect".

third_party/WebKit/Source/core/layout/VisualRectMappingTest.cpp

 // Copyright 2015 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/layout/LayoutTestHelper.h"
 #include "core/layout/LayoutView.h"
 #include "core/layout/PaintInvalidationState.h"
 #include "core/paint/PaintLayer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 216 matching lines @@
 
 TEST_F(VisualRectMappingTest, SelfFlippedWritingMode) {
   setBodyInnerHTML(
       "<div id='target' style='writing-mode: vertical-rl; box-shadow: 40px "
       "20px black;"
       "    width: 100px; height: 50px; position: absolute; top: 111px; left: "
       "222px'>"
       "</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*
   // "physical coordinates with flipped block-flow direction"), see
   // LayoutBoxModelObject.h.
   target->flipForWritingMode(rect);
   EXPECT_TRUE(target->mapToVisualRectInAncestorSpace(target, rect));
   // 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());
 }
 
 TEST_F(VisualRectMappingTest, ContainerFlippedWritingMode) {
   setBodyInnerHTML(
       "<div id='container' style='writing-mode: vertical-rl; position: "
       "absolute; top: 111px; left: 222px'>"
       "    <div id='target' style='box-shadow: 40px 20px black; width: 100px; "
       "height: 90px'></div>"
       "    <div style='width: 100px; height: 100px'></div>"
       "</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.
   EXPECT_EQ(LayoutRect(0, 0, 140, 110), rect);
 
   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) {
   setBodyInnerHTML(
       "<div id='container' style='position: absolute; top: 111px; left: 222px;"
       "    border: 10px solid red; overflow: scroll; width: 50px; height: "
       "80px;'>"
       "    <div id='target' style='box-shadow: 40px 20px black; width: 100px; "
       "height: 90px'></div>"
       "</div>");
 
   LayoutBlock* container =
       toLayoutBlock(getLayoutObjectByElementId("container"));
   EXPECT_EQ(LayoutUnit(), container->scrollTop());
   EXPECT_EQ(LayoutUnit(), container->scrollLeft());
   container->setScrollTop(LayoutUnit(7));
   container->setScrollLeft(LayoutUnit(8));
   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)
   // 3 = target_y(0) + container_border_top(10) - scroll_top(7)
   // Rect is not clipped by container's overflow clip because of
   // 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) {
   setBodyInnerHTML(
       "<div id='container' style='writing-mode: vertical-rl; position: "
       "absolute; top: 111px; left: 222px;"
       "    border: solid red; border-width: 10px 20px 30px 40px;"
       "    overflow: scroll; width: 50px; height: 80px'>"
       "    <div id='target' style='box-shadow: 40px 20px black; width: 100px; "
       "height: 90px'></div>"
       "    <div style='width: 100px; height: 100px'></div>"
       "</div>");
 
   LayoutBlock* container =
       toLayoutBlock(getLayoutObjectByElementId("container"));
   EXPECT_EQ(LayoutUnit(), container->scrollTop());
   // The initial scroll offset is to the left-most because of flipped blocks
   // writing mode.
   // 150 = total_layout_overflow(100 + 100) - width(50)
   EXPECT_EQ(LayoutUnit(150), container->scrollLeft());
   container->setScrollTop(LayoutUnit(7));
   container->setScrollLeft(
       LayoutUnit(142));  // Scroll to the right by 8 pixels.
   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());
   // -2 = target_physical_x(100) + container_border_left(40) - scroll_left(142)
   // 3 = target_y(0) + container_border_top(10) - scroll_top(7)
   // 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
   // (40, 10, 50, 80), then is added by container's offset in LayoutView
   // (111, 222).
   // TODO(crbug.com/600039): rect.x() should be 262 (left + border-left), but is
   // 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) {
   setBodyInnerHTML(
       "<div id='container' style='position: absolute; top: 111px; left: 222px;"
       "    border: 10px solid red; overflow: hidden; width: 50px; height: "
       "80px;'>"
       "    <div id='target' style='box-shadow: 40px 20px black; width: 100px; "
       "height: 90px'></div>"
       "</div>");
 
   LayoutBlock* container =
       toLayoutBlock(getLayoutObjectByElementId("container"));
   EXPECT_EQ(LayoutUnit(), container->scrollTop());
   EXPECT_EQ(LayoutUnit(), container->scrollLeft());
   container->setScrollTop(LayoutUnit(27));
   container->setScrollLeft(LayoutUnit(28));
   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);
 }
 
 TEST_F(VisualRectMappingTest, ContainerFlippedWritingModeAndOverflowHidden) {
   setBodyInnerHTML(
       "<div id='container' style='writing-mode: vertical-rl; position: "
       "absolute; top: 111px; left: 222px;"
       "    border: solid red; border-width: 10px 20px 30px 40px;"
       "    overflow: hidden; width: 50px; height: 80px'>"
       "    <div id='target' style='box-shadow: 40px 20px black; width: 100px; "
       "height: 90px'></div>"
       "    <div style='width: 100px; height: 100px'></div>"
       "</div>");
 
   LayoutBlock* container =
       toLayoutBlock(getLayoutObjectByElementId("container"));
   EXPECT_EQ(LayoutUnit(), container->scrollTop());
   // The initial scroll offset is to the left-most because of flipped blocks
   // writing mode.
   // 150 = total_layout_overflow(100 + 100) - width(50)
   EXPECT_EQ(LayoutUnit(150), container->scrollLeft());
   container->setScrollTop(LayoutUnit(7));
   container->setScrollLeft(LayoutUnit(82));  // Scroll to the right by 8 pixels.
   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)
   EXPECT_EQ(LayoutRect(-10, 10, 140, 110), rect);
 }
 
 TEST_F(VisualRectMappingTest, ContainerAndTargetDifferentFlippedWritingMode) {
   setBodyInnerHTML(
       "<div id='container' style='writing-mode: vertical-rl; position: "
       "absolute; top: 111px; left: 222px;"
@@ skipping 10 matching lines @@
   // The initial scroll offset is to the left-most because of flipped blocks
   // writing mode.
   // 150 = total_layout_overflow(100 + 100) - width(50)
   EXPECT_EQ(LayoutUnit(150), container->scrollLeft());
   container->setScrollTop(LayoutUnit(7));
   container->setScrollLeft(
       LayoutUnit(142));  // Scroll to the right by 8 pixels.
   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)
   // 3 = target_y(0) + container_border_top(10) - scroll_top(7)
   // Rect is not clipped by container's overflow clip.
   EXPECT_EQ(LayoutRect(-2, 3, 140, 110), rect);
 }
 
 TEST_F(VisualRectMappingTest,
        DifferentPaintInvalidaitionContainerForAbsolutePosition) {
@@ skipping 14 matching lines @@
 
   LayoutBlock* scroller = toLayoutBlock(getLayoutObjectByElementId("scroller"));
   scroller->setScrollTop(LayoutUnit(77));
   scroller->setScrollLeft(LayoutUnit(88));
   document().view()->updateAllLifecyclePhases();
 
   LayoutBlock* normalFlow =
       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 =
       toLayoutBlock(getLayoutObjectByElementId("stacking-context"));
   LayoutBlock* absolute = toLayoutBlock(getLayoutObjectByElementId("absolute"));
   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);
 }
 
 TEST_F(VisualRectMappingTest,
        ContainerOfAbsoluteAbovePaintInvalidationContainer) {
   enableCompositing();
   document().frame()->settings()->setPreferCompositingToLCDTextEnabled(true);
 
   setBodyInnerHTML(
       "<div id='container' style='position: absolute; top: 88px; left: 99px'>"
@@ skipping 10 matching lines @@
       "</div>");
 
   LayoutBlock* stackingContext =
       toLayoutBlock(getLayoutObjectByElementId("stacking-context"));
   LayoutBlock* absolute = toLayoutBlock(getLayoutObjectByElementId("absolute"));
   LayoutBlock* container =
       toLayoutBlock(getLayoutObjectByElementId("container"));
   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);
 }
 
 TEST_F(VisualRectMappingTest, CSSClip) {
   setBodyInnerHTML(
       "<div id='container' style='position: absolute; top: 0px; left: 0px; "
       "clip: rect(0px, 200px, 200px, 0px)'>"
       "    <div id='target' style='width: 400px; height: 400px'></div>"
       "    </div>"
       "</div>");
 
   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());
 }
 
 TEST_F(VisualRectMappingTest, ContainPaint) {
   setBodyInnerHTML(
       "<div id='container' style='position: absolute; top: 0px; left: 0px; "
       "width: 200px; height: 200px; contain: paint'>"
       "    <div id='target' style='width: 400px; height: 400px'></div>"
       "    </div>"
       "</div>");
 
   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());
 }
 
 }  // namespace blink