Log Message
Simple line layout: Move setCollapedWhitespaceWidth call to updateLineConstrains. https://bugs.webkit.org/show_bug.cgi?id=172178
Reviewed by Antti Koivisto. No change in functionality. * rendering/SimpleLineLayout.cpp: (WebCore::SimpleLineLayout::updateLineConstrains): (WebCore::SimpleLineLayout::createLineRuns):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (216939 => 216940)
--- trunk/Source/WebCore/ChangeLog 2017-05-16 18:43:58 UTC (rev 216939)
+++ trunk/Source/WebCore/ChangeLog 2017-05-16 19:01:15 UTC (rev 216940)
@@ -1,3 +1,16 @@
+2017-05-16 Zalan Bujtas <za...@apple.com>
+
+ Simple line layout: Move setCollapedWhitespaceWidth call to updateLineConstrains.
+ https://bugs.webkit.org/show_bug.cgi?id=172178
+
+ Reviewed by Antti Koivisto.
+
+ No change in functionality.
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::updateLineConstrains):
+ (WebCore::SimpleLineLayout::createLineRuns):
+
2017-05-16 Eric Carlson <eric.carl...@apple.com>
[MediaStream] Return default device list until user gives permission to capture
Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (216939 => 216940)
--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-05-16 18:43:58 UTC (rev 216939)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2017-05-16 19:01:15 UTC (rev 216940)
@@ -608,7 +608,7 @@
numberOfPrecedingLinesWithHyphen = (previousLine.isEmpty() || !previousLine.lastFragment().hasHyphen()) ? 0 : numberOfPrecedingLinesWithHyphen + 1;
if (style.hyphenLimitLines && numberOfPrecedingLinesWithHyphen >= *style.hyphenLimitLines)
line.setHyphenationDisabled();
-
+ line.setCollapedWhitespaceWidth(style.font.spaceWidth() + style.wordSpacing);
}
struct SplitFragmentData {
@@ -781,7 +781,6 @@
static bool createLineRuns(LineState& line, const LineState& previousLine, Layout::RunVector& runs, TextFragmentIterator& textFragmentIterator)
{
const auto& style = textFragmentIterator.style();
- line.setCollapedWhitespaceWidth(style.font.spaceWidth() + style.wordSpacing);
bool lineCanBeWrapped = style.wrapLines || style.breakFirstWordOnOverflow || style.breakAnyWordOnOverflow;
auto fragment = firstFragment(textFragmentIterator, line, previousLine, runs);
while (fragment.type() != TextFragmentIterator::TextFragment::ContentEnd) {
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
