Title: [269197] branches/safari-611.1.4-branch/Source/WebCore
- Revision
- 269197
- Author
- [email protected]
- Date
- 2020-10-30 10:42:36 -0700 (Fri, 30 Oct 2020)
Log Message
Cherry-pick r269110. rdar://problem/70831200
[LFC][IFC] horizontalAlignmentOffset should check for empty run list
https://bugs.webkit.org/show_bug.cgi?id=218285
<rdar://problem/70730722>
Reviewed by Antti Koivisto.
LineBoxBuilder functions check for empty run list except this static helper.
* layout/inlineformatting/InlineFormattingContextGeometry.cpp:
(WebCore::Layout::horizontalAlignmentOffset):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269110 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-611.1.4-branch/Source/WebCore/ChangeLog (269196 => 269197)
--- branches/safari-611.1.4-branch/Source/WebCore/ChangeLog 2020-10-30 17:42:34 UTC (rev 269196)
+++ branches/safari-611.1.4-branch/Source/WebCore/ChangeLog 2020-10-30 17:42:36 UTC (rev 269197)
@@ -1,5 +1,36 @@
2020-10-29 Alan Coon <[email protected]>
+ Cherry-pick r269110. rdar://problem/70831200
+
+ [LFC][IFC] horizontalAlignmentOffset should check for empty run list
+ https://bugs.webkit.org/show_bug.cgi?id=218285
+ <rdar://problem/70730722>
+
+ Reviewed by Antti Koivisto.
+
+ LineBoxBuilder functions check for empty run list except this static helper.
+
+ * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+ (WebCore::Layout::horizontalAlignmentOffset):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269110 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-10-28 Zalan Bujtas <[email protected]>
+
+ [LFC][IFC] horizontalAlignmentOffset should check for empty run list
+ https://bugs.webkit.org/show_bug.cgi?id=218285
+ <rdar://problem/70730722>
+
+ Reviewed by Antti Koivisto.
+
+ LineBoxBuilder functions check for empty run list except this static helper.
+
+ * layout/inlineformatting/InlineFormattingContextGeometry.cpp:
+ (WebCore::Layout::horizontalAlignmentOffset):
+
+2020-10-29 Alan Coon <[email protected]>
+
Cherry-pick r269078. rdar://problem/70831181
Remove leftover DiagnosticLoggingKey after r268458
Modified: branches/safari-611.1.4-branch/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp (269196 => 269197)
--- branches/safari-611.1.4-branch/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2020-10-30 17:42:34 UTC (rev 269196)
+++ branches/safari-611.1.4-branch/Source/WebCore/layout/inlineformatting/InlineFormattingContextGeometry.cpp 2020-10-30 17:42:36 UTC (rev 269197)
@@ -115,7 +115,7 @@
// Text is justified according to the method specified by the text-justify property,
// in order to exactly fill the line box. Unless otherwise specified by text-align-last,
// the last line before a forced break or the end of the block is start-aligned.
- if (runs.last().isLineBreak() || isLastLine)
+ if (isLastLine || (!runs.isEmpty() && runs.last().isLineBreak()))
return TextAlignMode::Start;
return TextAlignMode::Justify;
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
