Diff
Modified: trunk/Source/WebCore/ChangeLog (281371 => 281372)
--- trunk/Source/WebCore/ChangeLog 2021-08-21 13:02:32 UTC (rev 281371)
+++ trunk/Source/WebCore/ChangeLog 2021-08-21 13:42:48 UTC (rev 281372)
@@ -1,3 +1,16 @@
+2021-08-21 Zalan Bujtas <za...@apple.com>
+
+ Fix spelling: MidWorkdBreak -> MidWordBreak
+
+ Unreviewed.
+
+ * layout/formattingContexts/inline/InlineContentBreaker.cpp:
+ (WebCore::Layout::InlineContentBreaker::tryBreakingTextRun const):
+ * layout/formattingContexts/inline/text/TextUtil.cpp:
+ (WebCore::Layout::TextUtil::midWordBreak):
+ (WebCore::Layout::TextUtil::midWorkdBreak): Deleted.
+ * layout/formattingContexts/inline/text/TextUtil.h:
+
2021-08-21 Youenn Fablet <you...@apple.com>
Prevent AudioSession category from moving out of PlayAndRecord too quickly
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp (281371 => 281372)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp 2021-08-21 13:02:32 UTC (rev 281371)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineContentBreaker.cpp 2021-08-21 13:42:48 UTC (rev 281372)
@@ -459,7 +459,7 @@
auto availableWidthExcludingHyphen = *availableWidth - hyphenWidth;
if (availableWidthExcludingHyphen <= 0 || !enoughWidthForHyphenation(availableWidthExcludingHyphen, fontCascade.pixelSize()))
return { };
- leftSideLength = TextUtil::midWorkdBreak(inlineTextItem, overflowingRun.logicalWidth, availableWidthExcludingHyphen, logicalLeft).length;
+ leftSideLength = TextUtil::midWordBreak(inlineTextItem, overflowingRun.logicalWidth, availableWidthExcludingHyphen, logicalLeft).length;
}
if (leftSideLength < limitBefore)
return { };
@@ -493,8 +493,8 @@
// Fast path for cases when there's no room at all. The content is breakable but we don't have space for it.
return { };
}
- auto midWorkdBreak = TextUtil::midWorkdBreak(inlineTextItem, overflowingRun.logicalWidth, *availableWidth, logicalLeft);
- return { midWorkdBreak.length, midWorkdBreak.logicalWidth };
+ auto midWordBreak = TextUtil::midWordBreak(inlineTextItem, overflowingRun.logicalWidth, *availableWidth, logicalLeft);
+ return { midWordBreak.length, midWordBreak.logicalWidth };
};
// With arbitrary breaking there's always a valid breaking position (even if it is before the first position).
return tryBreakingAtArbitraryPosition();
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp (281371 => 281372)
--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp 2021-08-21 13:02:32 UTC (rev 281371)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.cpp 2021-08-21 13:42:48 UTC (rev 281372)
@@ -84,7 +84,7 @@
return std::isnan(width) ? 0.0f : std::isinf(width) ? maxInlineLayoutUnit() : width;
}
-TextUtil::MidWorkdBreak TextUtil::midWorkdBreak(const InlineTextItem& inlineTextItem, InlineLayoutUnit textWidth, InlineLayoutUnit availableWidth, InlineLayoutUnit contentLogicalLeft)
+TextUtil::MidWordBreak TextUtil::midWordBreak(const InlineTextItem& inlineTextItem, InlineLayoutUnit textWidth, InlineLayoutUnit availableWidth, InlineLayoutUnit contentLogicalLeft)
{
ASSERT(availableWidth >= 0);
auto startPosition = inlineTextItem.start();
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h (281371 => 281372)
--- trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h 2021-08-21 13:02:32 UTC (rev 281371)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/text/TextUtil.h 2021-08-21 13:42:48 UTC (rev 281372)
@@ -46,12 +46,12 @@
static InlineLayoutUnit width(const InlineTextItem&, unsigned from, unsigned to, InlineLayoutUnit contentLogicalLeft);
static InlineLayoutUnit width(const InlineTextBox&, unsigned from, unsigned to, InlineLayoutUnit contentLogicalLeft);
- struct MidWorkdBreak {
+ struct MidWordBreak {
size_t start { 0 };
size_t length { 0 };
InlineLayoutUnit logicalWidth { 0 };
};
- static MidWorkdBreak midWorkdBreak(const InlineTextItem&, InlineLayoutUnit textWidth, InlineLayoutUnit availableWidth, InlineLayoutUnit contentLogicalLeft);
+ static MidWordBreak midWordBreak(const InlineTextItem&, InlineLayoutUnit textWidth, InlineLayoutUnit availableWidth, InlineLayoutUnit contentLogicalLeft);
static unsigned findNextBreakablePosition(LazyLineBreakIterator&, unsigned startPosition, const RenderStyle&);
static LineBreakIteratorMode lineBreakIteratorMode(LineBreak);
