Source/core/layout/line/BreakingContextInlineHeaders.h - Issue 1094863007: Implement "word-break: keep-all" in CSS3 Text

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/layout/line/BreakingContextInlineHeaders.h

Issue 1094863007: Implement "word-break: keep-all" in CSS3 Text (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix layout test failure on mac Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« LayoutTests/fast/css3-text/css3-word-break/css3-word-break-keep-all.html ('K') | « Source/core/layout/LayoutText.cpp ('k') | Source/core/style/ComputedStyleConstants.h » ('j') | Source/platform/text/TextBreakIterator.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/layout/line/BreakingContextInlineHeaders.h

diff --git a/Source/core/layout/line/BreakingContextInlineHeaders.h b/Source/core/layout/line/BreakingContextInlineHeaders.h

index c255a686f1bfb6fa1167ee0c8492729ee58eb15c..8bcfd519b7fa1bfd48b2c87c2a68cf4733677571 100644

--- a/Source/core/layout/line/BreakingContextInlineHeaders.h

+++ b/Source/core/layout/line/BreakingContextInlineHeaders.h

@@ -552,12 +552,14 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool

bool breakWords = m_currentStyle->breakWords() && ((m_autoWrap && !m_width.committedWidth()) || m_currWS == PRE);

bool midWordBreak = false;

bool breakAll = m_currentStyle->wordBreak() == BreakAllWordBreak && m_autoWrap;

+ bool keepAll = m_currentStyle->wordBreak() == KeepAllWordBreak && m_autoWrap;

bool prohibitBreakInside = m_currentStyle->hasTextCombine() && layoutText->isCombineText() && toLayoutTextCombine(layoutText)->isCombined();

float hyphenWidth = 0;

if (isSVGText) {

breakWords = false;

breakAll = false;

+ keepAll = false;

}

if (layoutText->isWordBreak()) {

@@ -606,7 +608,7 @@ inline bool BreakingContext::handleText(WordMeasurements& wordMeasurements, bool

}

int nextBreakablePosition = m_current.nextBreakablePosition();

- bool betweenWords = c == '\n' || (m_currWS != PRE && !m_atStart && m_renderTextInfo.m_lineBreakIterator.isBreakable(m_current.offset(), nextBreakablePosition, breakAll ? LineBreakType::BreakAll : LineBreakType::Normal));

+ bool betweenWords = c == '\n' || (m_currWS != PRE && !m_atStart && m_renderTextInfo.m_lineBreakIterator.isBreakable(m_current.offset(), nextBreakablePosition, breakAll ? LineBreakType::BreakAll : keepAll ? LineBreakType::KeepAll : LineBreakType::Normal));

m_current.setNextBreakablePosition(nextBreakablePosition);

if (betweenWords || midWordBreak) {