summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc63
1 files changed, 32 insertions, 31 deletions
diff --git a/chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc b/chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc
index da070be1bda..bc5f72982a3 100644
--- a/chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc
+++ b/chromium/third_party/blink/renderer/core/paint/compositing/composited_layer_mapping_test.cc
@@ -12,6 +12,7 @@
#include "third_party/blink/renderer/core/layout/layout_image.h"
#include "third_party/blink/renderer/core/layout/layout_view.h"
#include "third_party/blink/renderer/core/paint/paint_layer.h"
+#include "third_party/blink/renderer/core/paint/paint_layer_scrollable_area.h"
#include "third_party/blink/renderer/core/testing/core_unit_test_helper.h"
namespace blink {
@@ -166,8 +167,8 @@ TEST_F(CompositedLayerMappingTest, TallCompositedScrolledLayerInterestRect) {
)HTML");
GetDocument().View()->UpdateAllLifecyclePhases();
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 8000), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 8000),
+ kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
Element* element = GetDocument().getElementById("target");
@@ -184,11 +185,11 @@ TEST_F(CompositedLayerMappingTest, TallNonCompositedScrolledLayerInterestRect) {
)HTML");
GetDocument().View()->UpdateAllLifecyclePhases();
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 8000), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 8000),
+ kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
- PaintLayer* paint_layer = GetDocument().View()->Layer();
+ PaintLayer* paint_layer = GetDocument().GetLayoutView()->Layer();
ASSERT_TRUE(paint_layer->GraphicsLayerBacking());
EXPECT_EQ(IntRect(0, 4000, 800, 7016),
RecomputeInterestRect(paint_layer->GraphicsLayerBacking()));
@@ -223,7 +224,7 @@ TEST_F(CompositedLayerMappingTest, VerticalRightLeftWritingModeDocument) {
)HTML");
GetDocument().View()->UpdateAllLifecyclePhases();
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(
ScrollOffset(-5000, 0), kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
@@ -628,8 +629,8 @@ TEST_F(CompositedLayerMappingTest, InterestRectChangeOnViewportScroll) {
EXPECT_EQ(IntRect(0, 0, 800, 4600),
PreviousInterestRect(root_scrolling_layer));
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 300), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 300),
+ kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
// Still use the previous interest rect because the recomputed rect hasn't
// changed enough.
@@ -638,8 +639,8 @@ TEST_F(CompositedLayerMappingTest, InterestRectChangeOnViewportScroll) {
EXPECT_EQ(IntRect(0, 0, 800, 4600),
PreviousInterestRect(root_scrolling_layer));
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 600), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 600),
+ kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
// Use recomputed interest rect because it changed enough.
EXPECT_EQ(IntRect(0, 0, 800, 5200),
@@ -647,16 +648,16 @@ TEST_F(CompositedLayerMappingTest, InterestRectChangeOnViewportScroll) {
EXPECT_EQ(IntRect(0, 0, 800, 5200),
PreviousInterestRect(root_scrolling_layer));
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 5400), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 5400),
+ kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
EXPECT_EQ(IntRect(0, 1400, 800, 8600),
RecomputeInterestRect(root_scrolling_layer));
EXPECT_EQ(IntRect(0, 1400, 800, 8600),
PreviousInterestRect(root_scrolling_layer));
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 9000), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 9000),
+ kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
// Still use the previous interest rect because it contains the recomputed
// interest rect.
@@ -665,8 +666,8 @@ TEST_F(CompositedLayerMappingTest, InterestRectChangeOnViewportScroll) {
EXPECT_EQ(IntRect(0, 1400, 800, 8600),
PreviousInterestRect(root_scrolling_layer));
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
- ScrollOffset(0, 2000), kProgrammaticScroll);
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(ScrollOffset(0, 2000),
+ kProgrammaticScroll);
// Use recomputed interest rect because it changed enough.
GetDocument().View()->UpdateAllLifecyclePhases();
EXPECT_EQ(IntRect(0, 0, 800, 6600),
@@ -865,7 +866,7 @@ TEST_F(CompositedLayerMappingTest, InterestRectOfIframeInScrolledDiv) {
"will-change: transform}</style><div id=target></div>");
// Scroll 8000 pixels down to move the iframe into view.
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(
ScrollOffset(0.0, 8000.0), kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
@@ -896,7 +897,7 @@ TEST_F(CompositedLayerMappingTest, InterestRectOfScrolledIframe) {
GetDocument().View()->UpdateAllLifecyclePhases();
// Scroll 7500 pixels down to bring the scrollable area to the bottom.
- ChildDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
+ ChildDocument().View()->LayoutViewport()->SetScrollOffset(
ScrollOffset(0.0, 7500.0), kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
@@ -930,7 +931,7 @@ TEST_F(CompositedLayerMappingTest, InterestRectOfIframeWithContentBoxOffset) {
// Scroll 3000 pixels down to bring the scrollable area to somewhere in the
// middle.
- ChildDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
+ ChildDocument().View()->LayoutViewport()->SetScrollOffset(
ScrollOffset(0.0, 3000.0), kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
@@ -972,7 +973,7 @@ TEST_F(CompositedLayerMappingTest, InterestRectOfIframeWithFixedContents) {
// this to the right-most 4000x4000 area.
EXPECT_EQ(IntRect(1000, 0, 4400, 300), RecomputeInterestRect(graphics_layer));
- ChildDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
+ ChildDocument().View()->LayoutViewport()->SetScrollOffset(
ScrollOffset(0.0, 3000.0), kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
@@ -998,7 +999,7 @@ TEST_F(CompositedLayerMappingTest, ScrolledFixedPositionInterestRect) {
auto* graphics_layer = fixed->EnclosingLayer()->GraphicsLayerBacking(fixed);
EXPECT_EQ(IntRect(0, 500, 100, 4030), RecomputeInterestRect(graphics_layer));
- GetDocument().View()->LayoutViewportScrollableArea()->SetScrollOffset(
+ GetDocument().View()->LayoutViewport()->SetScrollOffset(
ScrollOffset(0.0, 200.0), kProgrammaticScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
@@ -2470,20 +2471,20 @@ TEST_F(CompositedLayerMappingTest, ScrollingContainerBoundsChange) {
PaintLayerScrollableArea* scrollable_area = scroller->GetScrollableArea();
cc::Layer* scrolling_layer = scrollable_area->LayerForScrolling()->CcLayer();
- EXPECT_EQ(0, scrolling_layer->scroll_offset().y());
+ EXPECT_EQ(0, scrolling_layer->CurrentScrollOffset().y());
EXPECT_EQ(150, scrolling_layer->bounds().height());
EXPECT_EQ(100, scrolling_layer->scroll_container_bounds().height());
scrollerElement->setScrollTop(300);
scrollerElement->setAttribute(HTMLNames::styleAttr, "max-height: 25px;");
GetDocument().View()->UpdateAllLifecyclePhases();
- EXPECT_EQ(50, scrolling_layer->scroll_offset().y());
+ EXPECT_EQ(50, scrolling_layer->CurrentScrollOffset().y());
EXPECT_EQ(150, scrolling_layer->bounds().height());
EXPECT_EQ(25, scrolling_layer->scroll_container_bounds().height());
scrollerElement->setAttribute(HTMLNames::styleAttr, "max-height: 300px;");
GetDocument().View()->UpdateAllLifecyclePhases();
- EXPECT_EQ(50, scrolling_layer->scroll_offset().y());
+ EXPECT_EQ(50, scrolling_layer->CurrentScrollOffset().y());
EXPECT_EQ(150, scrolling_layer->bounds().height());
EXPECT_EQ(100, scrolling_layer->scroll_container_bounds().height());
}
@@ -2559,13 +2560,13 @@ TEST_F(CompositedLayerMappingTest, ForegroundLayerSizing) {
->Layer()
->GetCompositedLayerMapping();
ASSERT_TRUE(mapping);
- EXPECT_EQ(FloatSize(120, 120), mapping->MainGraphicsLayer()->Size());
+ EXPECT_EQ(IntSize(120, 120), mapping->MainGraphicsLayer()->Size());
ASSERT_TRUE(mapping->ClippingLayer());
EXPECT_EQ(FloatPoint(10, 10), mapping->ClippingLayer()->GetPosition());
- EXPECT_EQ(FloatSize(100, 100), mapping->ClippingLayer()->Size());
+ EXPECT_EQ(IntSize(100, 100), mapping->ClippingLayer()->Size());
ASSERT_TRUE(mapping->ForegroundLayer());
EXPECT_EQ(FloatPoint(0, 0), mapping->ForegroundLayer()->GetPosition());
- EXPECT_EQ(FloatSize(100, 100), mapping->ForegroundLayer()->Size());
+ EXPECT_EQ(IntSize(100, 100), mapping->ForegroundLayer()->Size());
}
TEST_F(CompositedLayerMappingTest, ScrollLayerSizingSubpixelAccumulation) {
@@ -2632,8 +2633,8 @@ TEST_F(CompositedLayerMappingTest, SquashingScroll) {
LayoutPoint(),
squashed->GroupedMapping()->SquashingOffsetFromTransformedAncestor());
- GetDocument().View()->LayoutViewportScrollableArea()->ScrollBy(
- ScrollOffset(0, 25), kUserScroll);
+ GetDocument().View()->LayoutViewport()->ScrollBy(ScrollOffset(0, 25),
+ kUserScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
EXPECT_EQ(
@@ -2658,8 +2659,8 @@ TEST_F(CompositedLayerMappingTest, SquashingScrollInterestRect) {
ToLayoutBoxModelObject(GetLayoutObjectByElementId("squashed"))->Layer();
EXPECT_EQ(kPaintsIntoGroupedBacking, squashed->GetCompositingState());
- GetDocument().View()->LayoutViewportScrollableArea()->ScrollBy(
- ScrollOffset(0, 5000), kUserScroll);
+ GetDocument().View()->LayoutViewport()->ScrollBy(ScrollOffset(0, 5000),
+ kUserScroll);
GetDocument().View()->UpdateAllLifecyclePhases();
EXPECT_EQ(IntRect(0, 1000, 200, 5000),
View Lorry Controller Status