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/object_painter.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/object_painter.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/paint/object_painter.cc | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/chromium/third_party/blink/renderer/core/paint/object_painter.cc b/chromium/third_party/blink/renderer/core/paint/object_painter.cc index 9445e34562c..112deedc4ef 100644 --- a/chromium/third_party/blink/renderer/core/paint/object_painter.cc +++ b/chromium/third_party/blink/renderer/core/paint/object_painter.cc @@ -35,9 +35,8 @@ void ObjectPainter::PaintOutline(const PaintInfo& paint_info, return; } - Vector<LayoutRect> outline_rects; - layout_object_.AddOutlineRects( - outline_rects, paint_offset, + auto outline_rects = layout_object_.PhysicalOutlineRects( + paint_offset, layout_object_.OutlineRectsShouldIncludeBlockVisualOverflow()); if (outline_rects.IsEmpty()) return; @@ -46,18 +45,6 @@ void ObjectPainter::PaintOutline(const PaintInfo& paint_info, paint_info.context, layout_object_, paint_info.phase)) return; - // The result rects are in coordinates of m_layoutObject's border box. - // Block flipping is not applied yet if !m_layoutObject.isBox(). - if (!layout_object_.IsBox() && - layout_object_.StyleRef().IsFlippedBlocksWritingMode()) { - LayoutBlock* container = layout_object_.ContainingBlock(); - if (container) { - layout_object_.LocalToAncestorRects(outline_rects, container, - -paint_offset, paint_offset); - if (outline_rects.IsEmpty()) - return; - } - } DrawingRecorder recorder(paint_info.context, layout_object_, paint_info.phase); PaintOutlineRects(paint_info, outline_rects, style_to_use); @@ -87,10 +74,9 @@ void ObjectPainter::AddPDFURLRectIfNeeded(const PaintInfo& paint_info, if (!url.IsValid()) return; - Vector<LayoutRect> visual_overflow_rects; - layout_object_.AddElementVisualOverflowRects(visual_overflow_rects, - paint_offset); - IntRect rect = PixelSnappedIntRect(UnionRect(visual_overflow_rects)); + auto outline_rects = layout_object_.PhysicalOutlineRects( + paint_offset, NGOutlineType::kIncludeBlockVisualOverflow); + IntRect rect = PixelSnappedIntRect(UnionRect(outline_rects)); if (rect.IsEmpty()) return; |