Source/core/editing/FrameSelection.cpp - Issue 1325563002: Avoid style clobbering in setCompositionFromExistingText. (2nd land)

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/editing/FrameSelection.cpp

Issue 1325563002: Avoid style clobbering in setCompositionFromExistingText. (2nd land) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Delete CompositionUnderlinesRangeFilter (it's now dead code) Created 5 years, 3 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 | « Source/core/editing/CompositionUnderlineRangeFilterTest.cpp ('k') | Source/core/editing/InputMethodController.h » ('j') | Source/core/editing/InputMethodController.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/editing/FrameSelection.cpp

diff --git a/Source/core/editing/FrameSelection.cpp b/Source/core/editing/FrameSelection.cpp

index 2969141df7194bf5aff4338d959ad7d23ab325dd..f60ecb7d607182f32bb3e02dcd95eccebb71848a 100644

--- a/Source/core/editing/FrameSelection.cpp

+++ b/Source/core/editing/FrameSelection.cpp

@@ -314,8 +314,10 @@ void FrameSelection::setSelection(const VisibleSelection& newSelection, SetSelec

// boundary, selection for the DOM tree is shrunk while that for the

// composed tree is not. Additionally, this case occurs in some edge cases.

// See also: editing/pasteboard/4076267-3.html

- if (VisibleSelection::InDOMTree::equalSelections(oldSelection, m_selection))

+ if (VisibleSelection::InDOMTree::equalSelections(oldSelection, m_selection)) {

+ m_frame->inputMethodController().cancelCompositionIfSelectionIsInvalid();

return;

+ }

m_frame->editor().respondToChangedSelection(oldSelection, options);

if (userTriggered == UserTriggered) {

ScrollAlignment alignment;