diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-13 16:23:34 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-14 10:37:21 +0000 |
commit | 38a9a29f4f9436cace7f0e7abf9c586057df8a4e (patch) | |
tree | c4e8c458dc595bc0ddb435708fa2229edfd00bd4 /chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc | |
parent | e684a3455bcc29a6e3e66a004e352dea4e1141e7 (diff) | |
download | qtwebengine-chromium-38a9a29f4f9436cace7f0e7abf9c586057df8a4e.tar.gz |
BASELINE: Update Chromium to 73.0.3683.37
Change-Id: I08c9af2948b645f671e5d933aca1f7a90ea372f2
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc | 121 |
1 files changed, 73 insertions, 48 deletions
diff --git a/chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc b/chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc index 31723b02f8d..b068340c278 100644 --- a/chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc +++ b/chromium/third_party/blink/renderer/core/paint/paint_layer_clipper_test.cc @@ -48,14 +48,16 @@ TEST_F(PaintLayerClipperTest, ParentBackgroundClipRectSubpixelAccumulation) { LayoutSize(FloatSize(0.25, 0.35))); ClipRect background_rect_gm; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateBackgroundClipRect(context, background_rect_gm); EXPECT_EQ(LayoutRect(FloatRect(8.25, 8.34375, 300, 300)), background_rect_gm.Rect()); ClipRect background_rect_nogm; - target_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect(context, background_rect_nogm); EXPECT_EQ(LayoutRect(FloatRect(8.25, 8.34375, 300, 300)), @@ -78,14 +80,16 @@ TEST_F(PaintLayerClipperTest, BackgroundClipRectSubpixelAccumulation) { LayoutSize(FloatSize(0.25, 0.35))); ClipRect background_rect_gm; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateBackgroundClipRect(context, background_rect_gm); EXPECT_GE(background_rect_gm.Rect().Size().Width().ToInt(), 33554422); EXPECT_GE(background_rect_gm.Rect().Size().Height().ToInt(), 33554422); ClipRect background_rect_nogm; - target_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect(context, background_rect_nogm); EXPECT_GE(background_rect_nogm.Rect().Size().Width().ToInt(), 33554422); @@ -110,14 +114,16 @@ TEST_F(PaintLayerClipperTest, SVGBackgroundClipRectSubpixelAccumulation) { LayoutSize(FloatSize(0.25, 0.35))); ClipRect background_rect_gm; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateBackgroundClipRect(context, background_rect_gm); EXPECT_GE(background_rect_gm.Rect().Size().Width().ToInt(), 33554422); EXPECT_GE(background_rect_gm.Rect().Size().Height().ToInt(), 33554422); ClipRect background_rect_nogm; - target_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect(context, background_rect_nogm); EXPECT_GE(background_rect_nogm.Rect().Size().Width().ToInt(), 33554422); @@ -145,7 +151,8 @@ TEST_F(PaintLayerClipperTest, LayoutSVGRoot) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -175,7 +182,8 @@ TEST_F(PaintLayerClipperTest, ControlClip) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -215,7 +223,8 @@ TEST_F(PaintLayerClipperTest, RoundedClip) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -256,7 +265,8 @@ TEST_F(PaintLayerClipperTest, RoundedClipNested) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - child_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + child_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &child_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -293,7 +303,8 @@ TEST_F(PaintLayerClipperTest, ControlClipSelect) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -326,7 +337,8 @@ TEST_F(PaintLayerClipperTest, LayoutSVGRootChild) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -352,7 +364,7 @@ TEST_F(PaintLayerClipperTest, ContainPaintClip) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - layer->Clipper(PaintLayer::kUseGeometryMapper) + layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); EXPECT_GE(background_rect.Rect().Size().Width().ToInt(), 33554422); @@ -363,7 +375,7 @@ TEST_F(PaintLayerClipperTest, ContainPaintClip) { ClipRectsContext context_clip( layer, &layer->GetLayoutObject().FirstFragment(), kUncachedClipRects); - layer->Clipper(PaintLayer::kUseGeometryMapper) + layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context_clip, &layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); EXPECT_EQ(LayoutRect(0, 0, 200, 200), background_rect.Rect()); @@ -389,7 +401,7 @@ TEST_F(PaintLayerClipperTest, NestedContainPaintClip) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - layer->Clipper(PaintLayer::kUseGeometryMapper) + layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); EXPECT_EQ(LayoutRect(0, 0, 200, 400), background_rect.Rect()); @@ -400,7 +412,7 @@ TEST_F(PaintLayerClipperTest, NestedContainPaintClip) { layer->Parent(), &layer->Parent()->GetLayoutObject().FirstFragment(), kUncachedClipRects); - layer->Clipper(PaintLayer::kUseGeometryMapper) + layer->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context_clip, &layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); EXPECT_EQ(LayoutRect(0, 0, 200, 200), background_rect.Rect()); @@ -426,18 +438,19 @@ TEST_F(PaintLayerClipperTest, LocalClipRectFixedUnderTransform) { PaintLayer* fixed = ToLayoutBoxModelObject(GetLayoutObjectByElementId("fixed"))->Layer(); - EXPECT_EQ(LayoutRect(0, 0, 100, 100), - transformed->Clipper(PaintLayer::kUseGeometryMapper) - .LocalClipRect(*transformed)); + EXPECT_EQ( + LayoutRect(0, 0, 100, 100), + transformed->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) + .LocalClipRect(*transformed)); EXPECT_EQ(LayoutRect(0, 50, 100, 100), - fixed->Clipper(PaintLayer::kUseGeometryMapper) + fixed->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .LocalClipRect(*transformed)); } TEST_F(PaintLayerClipperTest, ClearClipRectsRecursive) { - // SPv2 will re-use a global GeometryMapper, so this + // CAP will re-use a global GeometryMapper, so this // logic does not apply. - if (RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) + if (RuntimeEnabledFeatures::CompositeAfterPaintEnabled()) return; SetBodyInnerHTML(R"HTML( @@ -462,7 +475,7 @@ TEST_F(PaintLayerClipperTest, ClearClipRectsRecursive) { EXPECT_TRUE(parent->GetClipRectsCache()); EXPECT_TRUE(child->GetClipRectsCache()); - parent->Clipper(PaintLayer::kUseGeometryMapper) + parent->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .ClearClipRectsIncludingDescendants(); EXPECT_FALSE(parent->GetClipRectsCache()); @@ -470,9 +483,9 @@ TEST_F(PaintLayerClipperTest, ClearClipRectsRecursive) { } TEST_F(PaintLayerClipperTest, ClearClipRectsRecursiveChild) { - // SPv2 will re-use a global GeometryMapper, so this + // CAP will re-use a global GeometryMapper, so this // logic does not apply. - if (RuntimeEnabledFeatures::SlimmingPaintV2Enabled()) + if (RuntimeEnabledFeatures::CompositeAfterPaintEnabled()) return; SetBodyInnerHTML(R"HTML( @@ -497,7 +510,7 @@ TEST_F(PaintLayerClipperTest, ClearClipRectsRecursiveChild) { EXPECT_TRUE(parent->GetClipRectsCache()); EXPECT_TRUE(child->GetClipRectsCache()); - child->Clipper(PaintLayer::kUseGeometryMapper) + child->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .ClearClipRectsIncludingDescendants(); EXPECT_TRUE(parent->GetClipRectsCache()); @@ -524,7 +537,7 @@ TEST_F(PaintLayerClipperTest, CSSClip) { LayoutRect layer_bounds(infinite_rect); ClipRect background_rect(infinite_rect); ClipRect foreground_rect(infinite_rect); - target->Clipper(PaintLayer::kUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -554,7 +567,7 @@ TEST_F(PaintLayerClipperTest, Filter) { LayoutRect layer_bounds(infinite_rect); ClipRect background_rect(infinite_rect); ClipRect foreground_rect(infinite_rect); - target->Clipper(PaintLayer::kUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -569,7 +582,7 @@ TEST_F(PaintLayerClipperTest, Filter) { // Test without GeometryMapper. background_rect = infinite_rect; foreground_rect = infinite_rect; - target->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect, foreground_rect); // The non-GeometryMapper path applies the immediate filter effect in @@ -583,7 +596,7 @@ TEST_F(PaintLayerClipperTest, Filter) { kUncachedClipRects); background_rect = infinite_rect; foreground_rect = infinite_rect; - target->Clipper(PaintLayer::kUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(root_context, &target->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); // This includes the filter effect because it's applied before mapping the @@ -594,7 +607,7 @@ TEST_F(PaintLayerClipperTest, Filter) { // Test mapping to the root layer without GeometryMapper. background_rect = infinite_rect; foreground_rect = infinite_rect; - target->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateRects(root_context, nullptr, nullptr, layer_bounds, background_rect, foreground_rect); EXPECT_EQ(LayoutRect(38, 41, 204, 304), background_rect.Rect()); @@ -636,7 +649,7 @@ TEST_F(PaintLayerClipperTest, IgnoreRootLayerClipWithCSSClip) { LayoutRect layer_bounds(infinite_rect); ClipRect background_rect(infinite_rect); ClipRect foreground_rect(infinite_rect); - target->Clipper(PaintLayer::kUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -672,7 +685,7 @@ TEST_F(PaintLayerClipperTest, IgnoreRootLayerClipWithOverflowClip) { LayoutRect layer_bounds(infinite_rect); ClipRect background_rect(infinite_rect); ClipRect foreground_rect(infinite_rect); - target->Clipper(PaintLayer::kUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -709,7 +722,7 @@ TEST_F(PaintLayerClipperTest, IgnoreRootLayerClipWithBothClip) { LayoutRect layer_bounds(infinite_rect); ClipRect background_rect(infinite_rect); ClipRect foreground_rect(infinite_rect); - target->Clipper(PaintLayer::kUseGeometryMapper) + target->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -747,7 +760,8 @@ TEST_F(PaintLayerClipperTest, Fragmentation) { .NextFragment() ->NextFragment()); - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &target_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -758,7 +772,8 @@ TEST_F(PaintLayerClipperTest, Fragmentation) { foreground_rect.Rect()); EXPECT_EQ(LayoutRect(FloatRect(0, 0, 100, 200)), layer_bounds); - target_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + target_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects( context, target_paint_layer->GetLayoutObject().FirstFragment().NextFragment(), @@ -798,7 +813,8 @@ TEST_F(PaintLayerClipperTest, ScrollbarClipBehaviorChild) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - child_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + child_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &child_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -808,7 +824,8 @@ TEST_F(PaintLayerClipperTest, ScrollbarClipBehaviorChild) { EXPECT_EQ(LayoutRect(0, 0, 193, 293), foreground_rect.Rect()); EXPECT_EQ(LayoutRect(0, 0, 500, 500), layer_bounds); - child_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + child_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect, foreground_rect); @@ -842,7 +859,8 @@ TEST_F(PaintLayerClipperTest, ScrollbarClipBehaviorChildScrollBetween) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - child_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + child_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &child_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -852,7 +870,8 @@ TEST_F(PaintLayerClipperTest, ScrollbarClipBehaviorChildScrollBetween) { EXPECT_EQ(LayoutRect(8, 8, 193, 293), foreground_rect.Rect()); EXPECT_EQ(LayoutRect(8, 8, 500, 500), layer_bounds); - child_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + child_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect, foreground_rect); @@ -884,7 +903,8 @@ TEST_F(PaintLayerClipperTest, ScrollbarClipBehaviorParent) { LayoutRect layer_bounds; ClipRect background_rect, foreground_rect; - parent_paint_layer->Clipper(PaintLayer::kUseGeometryMapper) + parent_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kUseGeometryMapper) .CalculateRects(context, &parent_paint_layer->GetLayoutObject().FirstFragment(), nullptr, layer_bounds, background_rect, foreground_rect); @@ -895,7 +915,8 @@ TEST_F(PaintLayerClipperTest, ScrollbarClipBehaviorParent) { EXPECT_EQ(LayoutRect(0, 0, 193, 293), foreground_rect.Rect()); EXPECT_EQ(LayoutRect(0, 0, 200, 300), layer_bounds); - parent_paint_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + parent_paint_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateRects(context, nullptr, nullptr, layer_bounds, background_rect, foreground_rect); @@ -922,12 +943,13 @@ TEST_F(PaintLayerClipperTest, FixedLayerClipRectInDocumentSpace) { GetDocument() .GetLayoutView() ->Layer() - ->Clipper(PaintLayer::kDoNotUseGeometryMapper) + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .ClearClipRectsIncludingDescendants(); { ClipRect clip_rect; - target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect( ClipRectsContext(GetDocument().GetLayoutView()->Layer(), &GetDocument().GetLayoutView()->FirstFragment(), @@ -942,7 +964,8 @@ TEST_F(PaintLayerClipperTest, FixedLayerClipRectInDocumentSpace) { { ClipRect clip_rect; - target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect( ClipRectsContext(GetDocument().GetLayoutView()->Layer(), &GetDocument().GetLayoutView()->FirstFragment(), @@ -974,12 +997,13 @@ TEST_F(PaintLayerClipperTest, GetDocument() .GetLayoutView() ->Layer() - ->Clipper(PaintLayer::kDoNotUseGeometryMapper) + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .ClearClipRectsIncludingDescendants(); { ClipRect clip_rect; - target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect( ClipRectsContext(GetDocument().GetLayoutView()->Layer(), &GetDocument().GetLayoutView()->FirstFragment(), @@ -994,7 +1018,8 @@ TEST_F(PaintLayerClipperTest, { ClipRect clip_rect; - target_layer->Clipper(PaintLayer::kDoNotUseGeometryMapper) + target_layer + ->Clipper(PaintLayer::GeometryMapperOption::kDoNotUseGeometryMapper) .CalculateBackgroundClipRect( ClipRectsContext(GetDocument().GetLayoutView()->Layer(), &GetDocument().GetLayoutView()->FirstFragment(), |