third_party/WebKit/Source/core/dom/Text.cpp - Issue 1958093002: CONTINUED Make FrameSelection to hold non-canonicalized positions

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/dom/Text.cpp

Issue 1958093002: CONTINUED Make FrameSelection to hold non-canonicalized positions Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 2017-01-16T20:04:35 Created 3 years, 11 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/dom/SynchronousMutationObserver.cpp ('k') | third_party/WebKit/Source/core/dom/TreeScopeAdopter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Text.cpp

diff --git a/third_party/WebKit/Source/core/dom/Text.cpp b/third_party/WebKit/Source/core/dom/Text.cpp

index a105811975803ddc44edf75f845d6386a3f5d22c..325cfb89ccaee816c99dae94a775edcd4f68b27c 100644

--- a/third_party/WebKit/Source/core/dom/Text.cpp

+++ b/third_party/WebKit/Source/core/dom/Text.cpp

@@ -82,12 +82,12 @@ Node* Text::mergeNextSiblingNodesIfPossible() {

setDataWithoutUpdate(data() + nextTextData);

updateTextLayoutObject(oldTextData.length(), 0);

+ document().didMergeTextNodes(*this, *nextText, offset);

// Empty nextText for layout update.

nextText->setDataWithoutUpdate(emptyString());

nextText->updateTextLayoutObject(0, nextTextData.length());

- document().didMergeTextNodes(*nextText, offset);

// Restore nextText for mutation event.

nextText->setDataWithoutUpdate(nextTextData);

nextText->updateTextLayoutObject(0, 0);