Changeset 259798 in webkit

Timestamp:

Apr 9, 2020, 7:20:59 AM (6 years ago)

Author:

Antti Koivisto

Message:

Use more WeakPtr in RenderTreeBuilder::FirstLetter
​https://bugs.webkit.org/show_bug.cgi?id=210251
<rdar://problem/61180381>

Reviewed by Zalan Bujtas.

For safety.

• rendering/updating/RenderTreeBuilderFirstLetter.cpp:

(WebCore::RenderTreeBuilder::FirstLetter::createRenderers):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/updating/RenderTreeBuilderFirstLetter.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-09  Antti Koivisto  <antti@apple.com>
+
+        Use more WeakPtr in RenderTreeBuilder::FirstLetter
+        https://bugs.webkit.org/show_bug.cgi?id=210251
+        <rdar://problem/61180381>
+
+        Reviewed by Zalan Bujtas.
+
+        For safety.
+
+        * rendering/updating/RenderTreeBuilderFirstLetter.cpp:
+        (WebCore::RenderTreeBuilder::FirstLetter::createRenderers):
+
 2020-04-09  Delan Azabani  <dazabani@igalia.com>
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp

@@ -252 +252 @@
 
         auto* textNode = currentTextChild.textNode();
-        auto* beforeChild = currentTextChild.nextSibling();
+        auto beforeChild = makeWeakPtr(currentTextChild.nextSibling());
         auto inlineWrapperForDisplayContents = makeWeakPtr(currentTextChild.inlineWrapperForDisplayContents());
         auto hasInlineWrapperForDisplayContents = inlineWrapperForDisplayContents.get();
@@ -269 +269 @@
         ASSERT_UNUSED(hasInlineWrapperForDisplayContents, hasInlineWrapperForDisplayContents == inlineWrapperForDisplayContents.get());
         remainingText.setInlineWrapperForDisplayContents(inlineWrapperForDisplayContents.get());
-        m_builder.attach(*textContentParent, WTFMove(newRemainingText), beforeChild);
+        m_builder.attach(*textContentParent, WTFMove(newRemainingText), beforeChild.get());
 
         // FIXME: Make attach the final step so that we don't need to keep firstLetter around.