Unreviewed, reverting r270544 and r270569.

Caused two editing tests to consistently crash on iOS Reverted changesets: "[LFC][Integration] Invalidate line layout path for children of inlines" https://bugs.webkit.org/show_bug.cgi?id=219639 https://trac.webkit.org/changeset/270544 "Unreviewed. Add missing LFC guards around LineLayout usage from r270544" https://trac.webkit.org/changeset/270569 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@270594 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Igalia · Dec 9, 2020 · caf78fd · caf78fd
1 parent b38833a
commit caf78fd
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 31 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2020-12-09 Ryan Haddad <[email protected]>
+
+ Unreviewed, reverting r270544 and r270569.
+
+ Caused two editing tests to consistently crash on iOS
+
+ Reverted changesets:
+
+ "[LFC][Integration] Invalidate line layout path for children
+ of inlines"
+ https://bugs.webkit.org/show_bug.cgi?id=219639
+ https://trac.webkit.org/changeset/270544
+
+ "Unreviewed. Add missing LFC guards around LineLayout usage
+ from r270544"
+ https://trac.webkit.org/changeset/270569
+
 2020-12-09 Antti Koivisto <[email protected]>
 
  Font loads are triggered too late

diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.cpp
@@ -68,33 +68,25 @@ LineLayout::LineLayout(RenderBlockFlow& flow)
 
 LineLayout::~LineLayout() = default;
 
-RenderBlockFlow* LineLayout::blockContainer(RenderObject& renderer)
+LineLayout* LineLayout::containing(RenderObject& renderer)
 {
+ if (!renderer.isInline())
+ return nullptr;
+
  // FIXME: These fake renderers have their parent set but are not actually in the tree.
  if (renderer.isReplica() || renderer.isRenderScrollbarPart())
  return nullptr;
 
  for (auto* parent = renderer.parent(); parent; parent = parent->parent()) {
- if (!parent->childrenInline())
- return nullptr;
  if (is<RenderBlockFlow>(*parent))
- return downcast<RenderBlockFlow>(parent);
+ return downcast<RenderBlockFlow>(*parent).modernLineLayout();
+ if (!is<RenderInline>(*parent))
+ return nullptr;
  }
 
  return nullptr;
 }
 
-LineLayout* LineLayout::containing(RenderObject& renderer)
-{
- if (!renderer.isInline())
- return nullptr;
-
- if (auto* container = blockContainer(renderer))
- return container->modernLineLayout();
-
- return nullptr;
-}
-
 const LineLayout* LineLayout::containing(const RenderObject& renderer)
 {
  return containing(const_cast<RenderObject&>(renderer));

diff --git a/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h b/Source/WebCore/layout/integration/LayoutIntegrationLineLayout.h
@@ -56,7 +56,6 @@ class LineLayout : public CanMakeWeakPtr<LineLayout> {
  LineLayout(RenderBlockFlow&);
  ~LineLayout();
 
- static RenderBlockFlow* blockContainer(RenderObject&);
  static LineLayout* containing(RenderObject&);
  static const LineLayout* containing(const RenderObject&);
 

diff --git a/Source/WebCore/rendering/RenderObject.cpp b/Source/WebCore/rendering/RenderObject.cpp
@@ -1466,23 +1466,13 @@ void RenderObject::willBeDestroyed()
 
 void RenderObject::insertedIntoTree()
 {
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
- if (auto* container = LayoutIntegration::LineLayout::blockContainer(*this))
- container->invalidateLineLayoutPath();
-#endif
-
  // FIXME: We should ASSERT(isRooted()) here but generated content makes some out-of-order insertion.
  if (!isFloating() && parent()->childrenInline())
  parent()->dirtyLinesFromChangedChild(*this);
 }
 
 void RenderObject::willBeRemovedFromTree()
 {
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
- if (auto* container = LayoutIntegration::LineLayout::blockContainer(*this))
- container->invalidateLineLayoutPath();
-#endif
-
  // FIXME: We should ASSERT(isRooted()) but we have some out-of-order removals which would need to be fixed first.
  // Update cached boundaries in SVG renderers, if a child is removed.
  parent()->setNeedsBoundariesUpdate();

diff --git a/Source/WebCore/rendering/RenderText.cpp b/Source/WebCore/rendering/RenderText.cpp
@@ -1461,10 +1461,8 @@ void RenderText::setText(const String& text, bool force)
  setNeedsLayoutAndPrefWidthsRecalc();
  m_knownToHaveNoOverflowAndNoFallbackFonts = false;
 
-#if ENABLE(LAYOUT_FORMATTING_CONTEXT)
- if (auto* container = LayoutIntegration::LineLayout::blockContainer(*this))
- container->invalidateLineLayoutPath();
-#endif
+ if (is<RenderBlockFlow>(*parent()))
+ downcast<RenderBlockFlow>(*parent()).invalidateLineLayoutPath();
 
  if (AXObjectCache* cache = document().existingAXObjectCache())
  cache->deferTextChangedIfNeeded(textNode());

diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
@@ -460,7 +460,8 @@ void RenderTreeBuilder::attachToRenderElementInternal(RenderElement& parent, Ren
 
  if (AXObjectCache* cache = parent.document().axObjectCache())
  cache->childrenChanged(&parent, newChild);
-
+ if (is<RenderBlockFlow>(parent))
+ downcast<RenderBlockFlow>(parent).invalidateLineLayoutPath();
  if (parent.hasOutlineAutoAncestor() || parent.outlineStyleForRepaint().outlineStyleIsAuto() == OutlineIsAuto::On)
  newChild->setHasOutlineAutoAncestor();
 }

diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderBlock.cpp
@@ -243,6 +243,8 @@ void RenderTreeBuilder::Block::attachIgnoringContinuation(RenderBlock& parent, R
  }
  }
 
+ parent.invalidateLineLayoutPath();
+
  m_builder.attachToRenderElement(parent, WTFMove(child), beforeChild);
 
  if (madeBoxesNonInline && is<RenderBlock>(parent.parent()) && parent.isAnonymousBlock())
@@ -290,6 +292,8 @@ RenderPtr<RenderObject> RenderTreeBuilder::Block::detach(RenderBlock& parent, Re
  auto next = makeWeakPtr(oldChild.nextSibling());
  bool canMergeAnonymousBlocks = canMergeContiguousAnonymousBlocks(oldChild, prev.get(), next.get());
 
+ parent.invalidateLineLayoutPath();
+
  auto takenChild = m_builder.detachFromRenderElement(parent, oldChild);
 
  if (canMergeAnonymousBlocks && prev && next) {