Title: [264072] releases/WebKitGTK/webkit-2.28/Source/WebCore
- Revision
- 264072
- Author
- [email protected]
- Date
- 2020-07-08 02:02:35 -0700 (Wed, 08 Jul 2020)
Log Message
Merge r259798 - 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):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (264071 => 264072)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-07-08 09:02:28 UTC (rev 264071)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog 2020-07-08 09:02:35 UTC (rev 264072)
@@ -1,3 +1,16 @@
+2020-04-09 Antti Koivisto <[email protected]>
+
+ 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-01 Keith Miller <[email protected]>
Bindings that override getOwnPropertySlotByIndex need to say they MayHaveIndexedAccessors
Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp (264071 => 264072)
--- releases/WebKitGTK/webkit-2.28/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp 2020-07-08 09:02:28 UTC (rev 264071)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/rendering/updating/RenderTreeBuilderFirstLetter.cpp 2020-07-08 09:02:35 UTC (rev 264072)
@@ -251,7 +251,7 @@
}
auto* textNode = currentTextChild.textNode();
- auto* beforeChild = currentTextChild.nextSibling();
+ auto beforeChild = makeWeakPtr(currentTextChild.nextSibling());
auto inlineWrapperForDisplayContents = makeWeakPtr(currentTextChild.inlineWrapperForDisplayContents());
auto hasInlineWrapperForDisplayContents = inlineWrapperForDisplayContents.get();
m_builder.destroy(currentTextChild);
@@ -268,7 +268,7 @@
RenderTextFragment& remainingText = *newRemainingText;
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.
auto& firstLetter = *newFirstLetter;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
