Diff
Modified: trunk/Source/WebCore/ChangeLog (286540 => 286541)
--- trunk/Source/WebCore/ChangeLog 2021-12-06 08:13:05 UTC (rev 286540)
+++ trunk/Source/WebCore/ChangeLog 2021-12-06 08:13:26 UTC (rev 286541)
@@ -1,3 +1,48 @@
+2021-12-06 Antti Koivisto <an...@apple.com>
+
+ [LFC][Integration] Use end bits in text box iterator
+ https://bugs.webkit.org/show_bug.cgi?id=233858
+
+ Reviewed by Alan Bujtas.
+
+ Make text box traversal work correctly in bidi context where encountering a different
+ layout box does not necessarily mean there are no further text boxes for the layout box.
+
+ * layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp:
+ (WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
+ (WebCore::Layout::InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent):
+
+ Set the bits for all box types.
+
+ * layout/formattingContexts/inline/display/InlineDisplayBox.h:
+ (WebCore::InlineDisplay::Box::Box):
+ (WebCore::InlineDisplay::Box::isTextOrSoftLineBreak const):
+ (WebCore::InlineDisplay::Box::isFirstForLayoutBox const):
+ (WebCore::InlineDisplay::Box::isLastForLayoutBox const):
+ (WebCore::InlineDisplay::Box::setIsFirstForLayoutBox):
+ (WebCore::InlineDisplay::Box::setIsLastForLayoutBox):
+ (WebCore::InlineDisplay::Box::isFirstBox const): Deleted.
+ (WebCore::InlineDisplay::Box::isLastBox const): Deleted.
+ (WebCore::InlineDisplay::Box::setIsLastBox): Deleted.
+ (WebCore::InlineDisplay::Box::setIsFirstBox): Deleted.
+
+ Renamed for clarity and correctness.
+
+ * layout/integration/InlineIteratorBoxModernPath.h:
+ (WebCore::InlineIterator::BoxModernPath::isText const):
+ (WebCore::InlineIterator::BoxModernPath::traverseNextTextBox):
+
+ Use the isLastForLayoutBox bit to end the traversal.
+
+ (WebCore::InlineIterator::BoxModernPath::traverseNextInlineBox):
+ (WebCore::InlineIterator::BoxModernPath::traversePreviousInlineBox):
+ (WebCore::InlineIterator::BoxModernPath::traverseNextWithSameLayoutBox):
+ (WebCore::InlineIterator::BoxModernPath::traversePreviousWithSameLayoutBox):
+
+ Factor into helpers.
+
+ * layout/integration/InlineIteratorTextBox.h:
+
2021-12-05 Said Abou-Hallawa <s...@apple.com>
[GPU Process] Add the encoding/decoding for Filter and FilterEffect
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp (286540 => 286541)
--- trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp 2021-12-06 08:13:05 UTC (rev 286540)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/InlineDisplayContentBuilder.cpp 2021-12-06 08:13:26 UTC (rev 286541)
@@ -478,7 +478,7 @@
auto lastDisplayBoxForInlineBoxIndex = inlineBoxDisplayBoxMap.take(inlineBox);
auto isFirstFragment = !lastDisplayBoxForInlineBoxIndex;
if (!isFirstFragment)
- boxes[lastDisplayBoxForInlineBoxIndex].setIsLastBox(false);
+ boxes[lastDisplayBoxForInlineBoxIndex].setIsLastForLayoutBox(false);
inlineBoxDisplayBoxMap.set(inlineBox, index);
auto& boxGeometry = formattingState().boxGeometry(*inlineBox);
@@ -534,13 +534,13 @@
auto& boxGeometry = formattingState().boxGeometry(inlineBoxDisplayBox.layoutBox());
auto contentRight = displayBox.logicalRight();
- if (inlineBoxDisplayBox.isLastBox()) {
+ if (inlineBoxDisplayBox.isLastForLayoutBox()) {
accumulatedOffset += boxGeometry.borderAndPaddingEnd() + boxGeometry.marginEnd();
inlineBoxDisplayBox.setLogicalRight(contentRight + boxGeometry.borderAndPaddingEnd());
} else
inlineBoxDisplayBox.setLogicalRight(contentRight);
}
- if (displayBox.isNonRootInlineBox() && displayBox.isFirstBox()) {
+ if (displayBox.isNonRootInlineBox() && displayBox.isFirstForLayoutBox()) {
auto& layoutBox = displayBox.layoutBox();
auto& boxGeometry = formattingState().boxGeometry(layoutBox);
@@ -556,7 +556,7 @@
ASSERT(!inlineBoxRangeList.isEmpty());
for (auto& inlineBoxRange : inlineBoxRangeList) {
auto& inlineBoxDisplayBox = boxes[inlineBoxRange.begin()];
- setInlineBoxGeometry(inlineBoxDisplayBox.layoutBox(), inlineBoxDisplayBox.logicalRect(), inlineBoxDisplayBox.isFirstBox());
+ setInlineBoxGeometry(inlineBoxDisplayBox.layoutBox(), inlineBoxDisplayBox.logicalRect(), inlineBoxDisplayBox.isFirstForLayoutBox());
}
};
if (needsNonRootInlineBoxDisplayBox)
@@ -653,20 +653,26 @@
void InlineDisplayContentBuilder::computeIsFirstIsLastBoxForInlineContent(DisplayBoxes& boxes)
{
- HashMap<const Box*, size_t> lastDisplayBoxForInlineTextBoxIndexes;
+ HashMap<const Box*, size_t> lastDisplayBoxForLayoutBoxIndexes;
+
ASSERT(boxes[0].isRootInlineBox());
+ boxes[0].setIsFirstForLayoutBox(true);
+ size_t lastRootInlineBoxIndex = 0;
+
for (size_t index = 1; index < boxes.size(); ++index) {
auto& displayBox = boxes[index];
- // FIXME: Transition the inline box isFirst/isLast computation here as well.
- if (!displayBox.isText())
+ if (displayBox.isRootInlineBox()) {
+ lastRootInlineBoxIndex = index;
continue;
+ }
auto& layoutBox = displayBox.layoutBox();
- if (!lastDisplayBoxForInlineTextBoxIndexes.contains(&layoutBox))
- displayBox.setIsFirstBox(true);
- lastDisplayBoxForInlineTextBoxIndexes.set(&layoutBox, index);
+ if (lastDisplayBoxForLayoutBoxIndexes.set(&layoutBox, index).isNewEntry)
+ displayBox.setIsFirstForLayoutBox(true);
}
- for (auto lastDisplayBoxForInlineTextBoxIndex : lastDisplayBoxForInlineTextBoxIndexes)
- boxes[lastDisplayBoxForInlineTextBoxIndex.value].setIsLastBox(true);
+ for (auto index : lastDisplayBoxForLayoutBoxIndexes.values())
+ boxes[index].setIsLastForLayoutBox(true);
+
+ boxes[lastRootInlineBoxIndex].setIsLastForLayoutBox(true);
}
}
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayBox.h (286540 => 286541)
--- trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayBox.h 2021-12-06 08:13:05 UTC (rev 286540)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayBox.h 2021-12-06 08:13:26 UTC (rev 286541)
@@ -74,11 +74,12 @@
First = 1 << 0,
Last = 1 << 1
};
- Box(size_t lineIndex, Type, const Layout::Box&, UBiDiLevel, const Layout::InlineRect&, const Layout::InlineRect& inkOverflow, Expansion, std::optional<Text> = std::nullopt, bool hasContent = true, OptionSet<PositionWithinInlineLevelBox> = { PositionWithinInlineLevelBox::First, PositionWithinInlineLevelBox::Last });
+ Box(size_t lineIndex, Type, const Layout::Box&, UBiDiLevel, const Layout::InlineRect&, const Layout::InlineRect& inkOverflow, Expansion, std::optional<Text> = std::nullopt, bool hasContent = true, OptionSet<PositionWithinInlineLevelBox> = { });
bool isText() const { return m_type == Type::Text; }
bool isEllipsis() const { return m_type == Type::Ellipsis; }
bool isSoftLineBreak() const { return m_type == Type::SoftLineBreak; }
+ bool isTextOrSoftLineBreak() const { return isText() || isSoftLineBreak(); }
bool isLineBreakBox() const { return m_type == Type::LineBreakBox; }
bool isLineBreak() const { return isSoftLineBreak() || isLineBreakBox(); }
bool isAtomicInlineLevelBox() const { return m_type == Type::AtomicInlineLevelBox; }
@@ -105,8 +106,16 @@
Layout::InlineLayoutUnit logicalWidth() const { return logicalRect().width(); }
Layout::InlineLayoutUnit logicalHeight() const { return logicalRect().height(); }
- void moveVertically(Layout::InlineLayoutUnit offset) { m_logicalRect.moveVertically(offset); }
- void moveHorizontally(Layout::InlineLayoutUnit offset) { m_logicalRect.moveHorizontally(offset); }
+ void moveVertically(Layout::InlineLayoutUnit offset)
+ {
+ m_logicalRect.moveVertically(offset);
+ m_inkOverflow.moveVertically(offset);
+ }
+ void moveHorizontally(Layout::InlineLayoutUnit offset)
+ {
+ m_logicalRect.moveHorizontally(offset);
+ m_inkOverflow.moveHorizontally(offset);
+ }
void adjustInkOverflow(const Layout::InlineRect& childBorderBox) { return m_inkOverflow.expandToContain(childBorderBox); }
void truncate(Layout::InlineLayoutUnit truncatedwidth = 0.f);
void setLogicalRight(Layout::InlineLayoutUnit right) { m_logicalRect.setRight(right); }
@@ -126,11 +135,11 @@
size_t lineIndex() const { return m_lineIndex; }
// These functions tell you whether this display box is the first/last for the associated inline level box (Layout::Box) and not whether it's the first/last box on the line.
// (e.g. always true for atomic boxes, but inline boxes spanning over multiple lines can produce individual first/last boxes).
- bool isFirstBox() const { return m_isFirstWithinInlineLevelBox; }
- bool isLastBox() const { return m_isLastWithinInlineLevelBox; }
+ bool isFirstForLayoutBox() const { return m_isFirstForLayoutBox; }
+ bool isLastForLayoutBox() const { return m_isLastForLayoutBox; }
- void setIsLastBox(bool isLastBox) { m_isLastWithinInlineLevelBox = isLastBox; }
- void setIsFirstBox(bool isFirstBox) { m_isFirstWithinInlineLevelBox = isFirstBox; }
+ void setIsFirstForLayoutBox(bool isFirstBox) { m_isFirstForLayoutBox = isFirstBox; }
+ void setIsLastForLayoutBox(bool isLastBox) { m_isLastForLayoutBox = isLastBox; }
private:
const size_t m_lineIndex { 0 };
@@ -140,8 +149,8 @@
Layout::InlineRect m_logicalRect;
Layout::InlineRect m_inkOverflow;
bool m_hasContent : 1;
- bool m_isFirstWithinInlineLevelBox : 1;
- bool m_isLastWithinInlineLevelBox : 1;
+ bool m_isFirstForLayoutBox : 1;
+ bool m_isLastForLayoutBox : 1;
Expansion m_expansion;
std::optional<Text> m_text;
};
@@ -154,8 +163,8 @@
, m_logicalRect(logicalRect)
, m_inkOverflow(inkOverflow)
, m_hasContent(hasContent)
- , m_isFirstWithinInlineLevelBox(positionWithinInlineLevelBox.contains(PositionWithinInlineLevelBox::First))
- , m_isLastWithinInlineLevelBox(positionWithinInlineLevelBox.contains(PositionWithinInlineLevelBox::Last))
+ , m_isFirstForLayoutBox(positionWithinInlineLevelBox.contains(PositionWithinInlineLevelBox::First))
+ , m_isLastForLayoutBox(positionWithinInlineLevelBox.contains(PositionWithinInlineLevelBox::Last))
, m_expansion(expansion)
, m_text(text)
{
Modified: trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h (286540 => 286541)
--- trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h 2021-12-06 08:13:05 UTC (rev 286540)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorBoxModernPath.h 2021-12-06 08:13:26 UTC (rev 286541)
@@ -48,7 +48,7 @@
{
}
- bool isText() const { return !!box().text(); }
+ bool isText() const { return box().isTextOrSoftLineBreak(); }
bool isInlineBox() const { return box().isInlineBox(); }
bool isRootInlineBox() const { return box().isRootInlineBox(); }
@@ -106,16 +106,16 @@
void traverseNextTextBox()
{
ASSERT(!atEnd());
- ASSERT(box().text());
+ ASSERT(box().isTextOrSoftLineBreak());
- auto& layoutBox = box().layoutBox();
+ if (box().isLastForLayoutBox()) {
+ setAtEnd();
+ return;
+ }
- traverseNextLeaf();
+ traverseNextWithSameLayoutBox();
- if (!atEnd() && &layoutBox != &box().layoutBox())
- setAtEnd();
-
- ASSERT(atEnd() || box().text());
+ ASSERT(box().isTextOrSoftLineBreak());
}
void traverseNextOnLine()
@@ -144,36 +144,32 @@
void traverseNextInlineBox()
{
+ ASSERT(!atEnd());
ASSERT(box().isInlineBox());
- if (box().isLastBox()) {
+ if (box().isLastForLayoutBox()) {
setAtEnd();
return;
}
- auto& layoutBox = box().layoutBox();
- do {
- traverseNextBox();
- } while (!atEnd() && &box().layoutBox() != &layoutBox);
+ traverseNextWithSameLayoutBox();
- ASSERT(atEnd() || box().isInlineBox());
+ ASSERT(box().isInlineBox());
}
void traversePreviousInlineBox()
{
+ ASSERT(!atEnd());
ASSERT(box().isInlineBox());
- if (box().isFirstBox()) {
+ if (box().isFirstForLayoutBox()) {
setAtEnd();
return;
}
- auto& layoutBox = box().layoutBox();
- do {
- traversePreviousBox();
- } while (!atEnd() && &box().layoutBox() != &layoutBox);
+ traversePreviousWithSameLayoutBox();
- ASSERT(atEnd() || box().isInlineBox());
+ ASSERT(box().isInlineBox());
}
BoxModernPath firstLeafBoxForInlineBox() const
@@ -249,6 +245,22 @@
} while (!atEnd() && box().isInlineBox());
}
+ void traverseNextWithSameLayoutBox()
+ {
+ auto& layoutBox = box().layoutBox();
+ do {
+ traverseNextBox();
+ } while (!atEnd() && &box().layoutBox() != &layoutBox);
+ }
+
+ void traversePreviousWithSameLayoutBox()
+ {
+ auto& layoutBox = box().layoutBox();
+ do {
+ traversePreviousBox();
+ } while (!atEnd() && &box().layoutBox() != &layoutBox);
+ }
+
void setAtEnd() { m_boxIndex = boxes().size(); }
const LayoutIntegration::InlineContent::Boxes& boxes() const { return m_inlineContent->boxes; }
Modified: trunk/Source/WebCore/layout/integration/InlineIteratorTextBox.h (286540 => 286541)
--- trunk/Source/WebCore/layout/integration/InlineIteratorTextBox.h 2021-12-06 08:13:05 UTC (rev 286540)
+++ trunk/Source/WebCore/layout/integration/InlineIteratorTextBox.h 2021-12-06 08:13:26 UTC (rev 286541)
@@ -59,8 +59,8 @@
// FIXME: Remove. For intermediate porting steps only.
const LegacyInlineTextBox* legacyInlineBox() const { return downcast<LegacyInlineTextBox>(Box::legacyInlineBox()); }
+ // This returns the next text box generated for the same RenderText/Layout::InlineTextBox.
TextBoxIterator nextTextBox() const;
- TextBoxIterator previousTextBox() const;
};
class TextBoxIterator : public LeafBoxIterator {
@@ -74,6 +74,7 @@
const TextBox& operator*() const { return get(); }
const TextBox* operator->() const { return &get(); }
+ // This traverses to the next text box generated for the same RenderText/Layout::InlineTextBox.
TextBoxIterator& traverseNextTextBox();
private:
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp (286540 => 286541)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp 2021-12-06 08:13:05 UTC (rev 286540)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationPagination.cpp 2021-12-06 08:13:26 UTC (rev 286541)
@@ -142,16 +142,9 @@
auto adjustedBox = [&](const InlineDisplay::Box& box, float offset)
{
- return InlineDisplay::Box {
- box.lineIndex(),
- box.type(),
- box.layoutBox(),
- box.bidiLevel(),
- moveVertically(box.logicalRect(), offset),
- moveVertically(box.inkOverflow(), offset),
- box.expansion(),
- box.text()
- };
+ auto adjustedBox = box;
+ adjustedBox.moveVertically(offset);
+ return adjustedBox;
};
auto adjustedContent = InlineContent::create(inlineContent.lineLayout());
