third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp - Issue 2280513004: Restore a collapsed trailing space of text used for line break

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: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

Issue 2280513004: Restore a collapsed trailing space of text used for line break (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add CJK and word-break: break-all cases Created 4 years, 4 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

« third_party/WebKit/LayoutTests/editing/pasteboard/preserve-trailing-space.html ('K') | « third_party/WebKit/LayoutTests/fast/js/post-inc-assign-overwrites-expected.txt ('k') | third_party/WebKit/Source/core/layout/LayoutText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

diff --git a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

index 5cc04a2bce4a99d935bfcbbc1b3fa9d29d1b0319..b8cbe3c5fd33beca75312950dab0c4a827fc240b 100644

--- a/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

+++ b/third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp

@@ -613,9 +613,8 @@ void TextIteratorAlgorithm<Strategy>::handleTextBox()

subrunEnd = runEnd;

// Restore the collapsed space at the end of text for copy & paste.

// See http://crbug.com/318925

- if (str.endsWith(' ') && subrunEnd == str.length() - 1 && str[subrunEnd - 1] != ' ') {

- Node* nextNode = Strategy::nextSibling(*m_node);

- if (nextNode && isInline(nextNode))

+ if (layoutObject->hasLineBreakForTextWrap()) {

+ if (str.endsWith(' ') && str[subrunEnd - 1] != ' ')

++subrunEnd;

}