summarylogtreecommitdiffstats
path: root/0008-Revert-FragmentItem-Two-fixes-for-outline.patch
diff options
context:
space:
mode:
Diffstat (limited to '0008-Revert-FragmentItem-Two-fixes-for-outline.patch')
-rw-r--r--0008-Revert-FragmentItem-Two-fixes-for-outline.patch84
1 files changed, 0 insertions, 84 deletions
diff --git a/0008-Revert-FragmentItem-Two-fixes-for-outline.patch b/0008-Revert-FragmentItem-Two-fixes-for-outline.patch
deleted file mode 100644
index 66acc660bf4e..000000000000
--- a/0008-Revert-FragmentItem-Two-fixes-for-outline.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From bcac6dec62f192996a5bc061c140da211fc7e8bf Mon Sep 17 00:00:00 2001
-From: Daniel Playfair Cal <daniel.playfair.cal@gmail.com>
-Date: Fri, 17 Apr 2020 02:30:27 +1000
-Subject: [PATCH 8/8] Revert "[FragmentItem] Two fixes for outline"
-
-This reverts commit a340aadc092315215068045d847516f985b6a9f3.
----
- .../layout/ng/layout_ng_block_flow_mixin.cc | 13 ++-----
- .../ng/ng_physical_container_fragment.cc | 34 -------------------
- 2 files changed, 2 insertions(+), 45 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.cc b/third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.cc
-index ef990b7ce3fd..4beb7958545c 100644
---- a/third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.cc
-+++ b/third_party/blink/renderer/core/layout/ng/layout_ng_block_flow_mixin.cc
-@@ -110,18 +110,9 @@ void LayoutNGBlockFlowMixin<Base>::AddOutlineRects(
- To<NGPhysicalBoxFragment>(PaintFragment()->PhysicalFragment())
- .AddSelfOutlineRects(additional_offset, include_block_overflows,
- &rects);
-- return;
-- }
--
-- if (const NGPhysicalBoxFragment* fragment = CurrentFragment()) {
-- if (fragment->HasItems()) {
-- fragment->AddSelfOutlineRects(additional_offset, include_block_overflows,
-- &rects);
-- return;
-- }
-+ } else {
-+ Base::AddOutlineRects(rects, additional_offset, include_block_overflows);
- }
--
-- Base::AddOutlineRects(rects, additional_offset, include_block_overflows);
- }
-
- // Retrieve NGBaseline from the current fragment.
-diff --git a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.cc b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.cc
-index 82f57612ce45..a2f8092c791a 100644
---- a/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.cc
-+++ b/third_party/blink/renderer/core/layout/ng/ng_physical_container_fragment.cc
-@@ -90,40 +90,6 @@ void NGPhysicalContainerFragment::AddOutlineRectsForNormalChildren(
- const PhysicalOffset& additional_offset,
- NGOutlineType outline_type,
- const LayoutBoxModelObject* containing_block) const {
-- if (const auto* box = DynamicTo<NGPhysicalBoxFragment>(this)) {
-- if (const NGFragmentItems* items = box->Items()) {
-- for (NGInlineCursor cursor(*items); cursor; cursor.MoveToNext()) {
-- DCHECK(cursor.Current().Item());
-- const NGFragmentItem& item = *cursor.Current().Item();
-- if (item.Type() == NGFragmentItem::kLine) {
-- AddOutlineRectsForDescendant(
-- {item.LineBoxFragment(), item.OffsetInContainerBlock()},
-- outline_rects, additional_offset, outline_type, containing_block);
-- continue;
-- }
-- if (item.Type() == NGFragmentItem::kBox) {
-- if (const NGPhysicalBoxFragment* child_box = item.BoxFragment()) {
-- DCHECK(!child_box->IsOutOfFlowPositioned());
-- AddOutlineRectsForDescendant(
-- {child_box, item.OffsetInContainerBlock()}, outline_rects,
-- additional_offset, outline_type, containing_block);
-- }
-- continue;
-- }
-- DCHECK(item.IsText());
-- }
-- // Don't add |Children()|. If |this| has |NGFragmentItems|, children are
-- // either line box, which we already handled in items, or OOF, which we
-- // should ignore.
-- DCHECK(std::all_of(PostLayoutChildren().begin(),
-- PostLayoutChildren().end(), [](const NGLink& child) {
-- return child->IsLineBox() ||
-- child->IsOutOfFlowPositioned();
-- }));
-- return;
-- }
-- }
--
- for (const auto& child : PostLayoutChildren()) {
- // Outlines of out-of-flow positioned descendants are handled in
- // NGPhysicalBoxFragment::AddSelfOutlineRects().
---
-2.26.1
-