diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-12 09:13:00 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 09:58:26 +0000 |
| commit | 03561cae90f1d99b5c54b1ef3be69f10e882b25e (patch) | |
| tree | cc5f0958e823c044e7ae51cc0117fe51432abe5e /chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc | |
| parent | fa98118a45f7e169f8846086dc2c22c49a8ba310 (diff) | |
| download | qtwebengine-chromium-03561cae90f1d99b5c54b1ef3be69f10e882b25e.tar.gz | |
BASELINE: Update Chromium to 88.0.4324.208
Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc')
| -rw-r--r-- | chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc b/chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc index 5ee89f43187..8f3cfc4a409 100644 --- a/chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc +++ b/chromium/third_party/blink/renderer/core/paint/paint_layer_painter.cc @@ -299,7 +299,7 @@ void PaintLayerPainter::AdjustForPaintProperties( static IntRect FirstFragmentVisualRect(const LayoutBoxModelObject& object) { // We don't want to include overflowing contents. PhysicalRect overflow_rect = - object.IsBox() ? ToLayoutBox(object).PhysicalSelfVisualOverflowRect() + object.IsBox() ? To<LayoutBox>(object).PhysicalSelfVisualOverflowRect() : object.PhysicalVisualOverflowRect(); overflow_rect.Move(object.FirstFragment().PaintOffset()); return EnclosingIntRect(overflow_rect); @@ -374,8 +374,7 @@ PaintResult PaintLayerPainter::PaintLayerContents( // is not scrolled and should be above scrolled content. bool should_paint_self_outline = is_self_painting_layer && !is_painting_overlay_overflow_controls && - (is_painting_composited_decoration || - (!is_painting_overflow_contents && !is_painting_mask)) && + is_painting_composited_decoration && paint_layer_.GetLayoutObject().StyleRef().HasOutline(); PhysicalOffset subpixel_accumulation = @@ -521,7 +520,8 @@ PaintResult PaintLayerPainter::PaintLayerContents( } if (paint_layer_.GetScrollableArea() && - paint_layer_.GetScrollableArea()->HasOverlayOverflowControls()) { + paint_layer_.GetScrollableArea() + ->ShouldOverflowControlsPaintAsOverlay()) { if (is_painting_overlay_overflow_controls || !paint_layer_.NeedsReorderOverlayOverflowControls()) { PaintOverlayOverflowControlsForFragments( @@ -645,8 +645,9 @@ void PaintLayerPainter::PaintOverlayOverflowControlsForFragments( GraphicsContext& context, const PaintLayerPaintingInfo& painting_info, PaintLayerFlags paint_flags) { - DCHECK(paint_layer_.GetScrollableArea() && - paint_layer_.GetScrollableArea()->HasOverlayOverflowControls()); + DCHECK( + paint_layer_.GetScrollableArea() && + paint_layer_.GetScrollableArea()->ShouldOverflowControlsPaintAsOverlay()); // We don't need to paint composited overflow controls. if (paint_layer_.GetScrollableArea()->HasLayerForHorizontalScrollbar() || |