third_party/WebKit/Source/core/editing/iterators/TextIteratorTextNodeHandler.cpp - Issue 2919433006: Stop using TextIteratorBehavior in TextIteratorTextState

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/TextIteratorTextNodeHandler.cpp

Issue 2919433006: Stop using TextIteratorBehavior in TextIteratorTextState (Closed)

Patch Set: Sun Jun 4 22:44:20 PDT 2017 Created 3 years, 6 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

« no previous file with comments | « third_party/WebKit/Source/core/editing/iterators/TextIterator.cpp ('k') | third_party/WebKit/Source/core/editing/iterators/TextIteratorTextState.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d4656e6ed0f046f541236b2e0d5486c4a0933e11..10d340b977448843fabff0bbf4e62664593e10a2 100644

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

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

@@ -450,9 +450,10 @@ void TextIteratorTextNodeHandler::EmitText(Node* text_node,

LayoutText* layout_object,

int text_start_offset,

int text_end_offset) {

- const String& string = behavior_.EmitsOriginalText()

- ? layout_object->OriginalText()

- : layout_object->GetText();

+ String string = behavior_.EmitsOriginalText() ? layout_object->OriginalText()

+ : layout_object->GetText();

+ if (behavior_.EmitsSpaceForNbsp())

+ string.Replace(kNoBreakSpaceCharacter, kSpaceCharacter);

text_state_->EmitText(text_node,

text_start_offset + layout_object->TextStartOffset(),

text_end_offset + layout_object->TextStartOffset(),