Title: [289589] trunk/Source/WebCore
- Revision
- 289589
- Author
- [email protected]
- Date
- 2022-02-10 15:42:48 -0800 (Thu, 10 Feb 2022)
Log Message
[LFC][IFC] Adjust asserts in InlineDisplayContentBuilder::processBidiContent to support vertical writing mode
https://bugs.webkit.org/show_bug.cgi?id=236418
Reviewed by Antti Koivisto.
This is in preparation for adding vertical writing mode support.
* layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
(WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (289588 => 289589)
--- trunk/Source/WebCore/ChangeLog 2022-02-10 23:36:55 UTC (rev 289588)
+++ trunk/Source/WebCore/ChangeLog 2022-02-10 23:42:48 UTC (rev 289589)
@@ -1,3 +1,15 @@
+2022-02-10 Alan Bujtas <[email protected]>
+
+ [LFC][IFC] Adjust asserts in InlineDisplayContentBuilder::processBidiContent to support vertical writing mode
+ https://bugs.webkit.org/show_bug.cgi?id=236418
+
+ Reviewed by Antti Koivisto.
+
+ This is in preparation for adding vertical writing mode support.
+
+ * layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp:
+ (WebCore::Layout::InlineDisplayContentBuilder::processBidiContent):
+
2022-02-10 Matt Woodrow <[email protected]>
Use Ref<> for getBackground/MaskShorthandValue
Modified: trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp (289588 => 289589)
--- trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp 2022-02-10 23:36:55 UTC (rev 289588)
+++ trunk/Source/WebCore/layout/formattingContexts/inline/display/InlineDisplayContentBuilder.cpp 2022-02-10 23:42:48 UTC (rev 289589)
@@ -587,14 +587,16 @@
continue;
}
if (lineRun.isSoftLineBreak()) {
- ASSERT(!visualRectRelativeToRoot(lineBox.logicalRectForTextRun(lineRun)).width());
- appendSoftLineBreakDisplayBox(lineRun, visualRectRelativeToRoot(lineBox.logicalRectForTextRun(lineRun)), boxes);
+ auto visualRect = visualRectRelativeToRoot(lineBox.logicalRectForTextRun(lineRun));
+ ASSERT((isHorizontalWritingMode && !visualRect.width()) || (!isHorizontalWritingMode && !visualRect.height()));
+ appendSoftLineBreakDisplayBox(lineRun, visualRect, boxes);
displayBoxTree.append(parentDisplayBoxNodeIndex, boxes.size() - 1);
continue;
}
if (lineRun.isHardLineBreak()) {
- ASSERT(!visualRectRelativeToRoot(lineBox.logicalRectForLineBreakBox(layoutBox)).width());
- appendHardLineBreakDisplayBox(lineRun, visualRectRelativeToRoot(lineBox.logicalRectForLineBreakBox(layoutBox)), boxes);
+ auto visualRect = visualRectRelativeToRoot(lineBox.logicalRectForLineBreakBox(layoutBox));
+ ASSERT((isHorizontalWritingMode && !visualRect.width()) || (!isHorizontalWritingMode && !visualRect.height()));
+ appendHardLineBreakDisplayBox(lineRun, visualRect, boxes);
displayBoxTree.append(parentDisplayBoxNodeIndex, boxes.size() - 1);
continue;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
