Merge r228884 - [RenderTreeBuilder] Move RenderTextFragment::willBeRe…

…moved() mutation logic to RenderTreeBuilder https://bugs.webkit.org/show_bug.cgi?id=182946 <rdar://problem/37690039> Reviewed by Antti Koivisto. No change in functionality. * rendering/RenderTextFragment.cpp: (WebCore::RenderTextFragment::willBeDestroyed): * rendering/updating/RenderTreeBuilder.cpp: (WebCore::RenderTreeBuilder::takeChild): * rendering/updating/RenderTreeBuilderFirstLetter.cpp: (WebCore::RenderTreeBuilder::FirstLetter::cleanupOnRemoval): * rendering/updating/RenderTreeBuilderFirstLetter.h:
WebKit · Feb 26, 2018 · 30d78bd · 30d78bd
1 parent 6c54488
commit 30d78bd
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2018-02-21  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderTextFragment::willBeRemoved() mutation logic to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182946
+        <rdar://problem/37690039>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/RenderTextFragment.cpp:
+        (WebCore::RenderTextFragment::willBeDestroyed):
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::takeChild):
+        * rendering/updating/RenderTreeBuilderFirstLetter.cpp:
+        (WebCore::RenderTreeBuilder::FirstLetter::cleanupOnRemoval):
+        * rendering/updating/RenderTreeBuilderFirstLetter.h:
+
 2018-02-21  Ms2ger  <Ms2ger@igalia.com>
 
         [GCrypt] Remove unsound assertion from CryptoKeyRSA::exportData().

diff --git a/Source/WebCore/rendering/RenderTextFragment.cpp b/Source/WebCore/rendering/RenderTextFragment.cpp
@@ -59,7 +59,10 @@ RenderTextFragment::RenderTextFragment(Document& textNode, const String& text)
 {
 }
 
-RenderTextFragment::~RenderTextFragment() = default;
+RenderTextFragment::~RenderTextFragment()
+{
+    ASSERT(!m_firstLetter);
+}
 
 bool RenderTextFragment::canBeSelectionLeaf() const
 {
@@ -74,13 +77,6 @@ void RenderTextFragment::styleDidChange(StyleDifference diff, const RenderStyle*
         block->mutableStyle().removeCachedPseudoStyle(FIRST_LETTER);
 }
 
-void RenderTextFragment::willBeDestroyed(RenderTreeBuilder& builder)
-{
-    if (m_firstLetter)
-        builder.removeAndDestroy(*m_firstLetter);
-    RenderText::willBeDestroyed(builder);
-}
-
 void RenderTextFragment::setText(const String& newText, bool force)
 {
     RenderText::setText(newText, force);

diff --git a/Source/WebCore/rendering/RenderTextFragment.h b/Source/WebCore/rendering/RenderTextFragment.h
@@ -60,7 +60,6 @@ class RenderTextFragment final : public RenderText {
 private:
     bool isTextFragment() const override { return true; }
     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
-    void willBeDestroyed(RenderTreeBuilder&) override;
 
     UChar previousCharacter() const override;
 

diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp
@@ -154,6 +154,9 @@ void RenderTreeBuilder::removeAndDestroy(RenderObject& renderer)
         fullScreenBuilder().cleanupOnDestroy(downcast<RenderFullScreen>(renderer));
 #endif
 
+    if (is<RenderTextFragment>(renderer))
+        firstLetterBuilder().cleanupOnDestroy(downcast<RenderTextFragment>(renderer));
+
     // We need to detach the subtree first so that the descendants don't have
     // access to previous/next sublings at takeChild().
     // FIXME: webkit.org/b/182909.

diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp b/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp
@@ -151,6 +151,13 @@ void RenderTreeBuilder::FirstLetter::updateAfterDescendants(RenderBlock& block)
     createRenderers(block, downcast<RenderText>(*firstLetterRenderer));
 }
 
+void RenderTreeBuilder::FirstLetter::cleanupOnDestroy(RenderTextFragment& textFragment)
+{
+    if (!textFragment.firstLetter())
+        return;
+    m_builder.removeAndDestroy(*textFragment.firstLetter());
+}
+
 void RenderTreeBuilder::FirstLetter::updateStyle(RenderBlock& firstLetterBlock, RenderObject& currentChild)
 {
     RenderElement* firstLetter = currentChild.parent();

diff --git a/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.h b/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.h
@@ -36,6 +36,7 @@ class RenderTreeBuilder::FirstLetter {
     FirstLetter(RenderTreeBuilder&);
 
     void updateAfterDescendants(RenderBlock&);
+    void cleanupOnDestroy(RenderTextFragment&);
 
 private:
     void updateStyle(RenderBlock& firstLetterBlock, RenderObject& currentChild);