Title: [283570] trunk/Source/WebCore
- Revision
- 283570
- Author
- [email protected]
- Date
- 2021-10-05 14:54:06 -0700 (Tue, 05 Oct 2021)
Log Message
Remove leftover ASSERT.
Unreviewed.
* layout/formattingContexts/inline/InlineLineBuilder.cpp:
(WebCore::Layout::LineBuilder::inlineItemWidth const): We could very well run the fast text measuring codepath with different styles e.g. when there's color difference.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (283569 => 283570)
--- trunk/Source/WebCore/ChangeLog 2021-10-05 21:28:34 UTC (rev 283569)
+++ trunk/Source/WebCore/ChangeLog 2021-10-05 21:54:06 UTC (rev 283570)
@@ -1,3 +1,12 @@
+2021-10-05 Alan Bujtas <[email protected]>
+
+ Remove leftover ASSERT.
+
+ Unreviewed.
+
+ * layout/formattingContexts/inline/InlineLineBuilder.cpp:
+ (WebCore::Layout::LineBuilder::inlineItemWidth const): We could very well run the fast text measuring codepath with different styles e.g. when there's color difference.
+
2021-10-05 Gabriel Nava Marino <[email protected]>
Incorrect Length constructor used after blending negative Length
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp (283569 => 283570)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp 2021-10-05 21:28:34 UTC (rev 283569)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineLineBuilder.cpp 2021-10-05 21:54:06 UTC (rev 283570)
@@ -217,10 +217,8 @@
{
if (is<InlineTextItem>(inlineItem)) {
auto& inlineTextItem = downcast<InlineTextItem>(inlineItem);
- if (auto contentWidth = inlineTextItem.width()) {
- ASSERT(&inlineTextItem.firstLineStyle() == &inlineTextItem.style());
+ if (auto contentWidth = inlineTextItem.width())
return *contentWidth;
- }
auto& fontCascade = m_isFirstLine ? inlineTextItem.firstLineStyle().fontCascade() : inlineTextItem.style().fontCascade();
if (!inlineTextItem.isWhitespace() || InlineTextItem::shouldPreserveSpacesAndTabs(inlineTextItem))
return TextUtil::width(inlineTextItem, fontCascade, contentLogicalLeft);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
