Source/core/editing/commands/EditorCommand.cpp - Issue 1293593004: Introduce enum class TextAffinity as replacement of enum EAffinity

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/commands/EditorCommand.cpp

Issue 1293593004: Introduce enum class TextAffinity as replacement of enum EAffinity (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 2015-08-19T18:09:55 Created 5 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

« Source/core/editing/TextAffinity.h ('K') | « Source/core/editing/commands/DeleteSelectionCommand.cpp ('k') | Source/core/editing/commands/IndentOutdentCommand.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/editing/commands/EditorCommand.cpp

diff --git a/Source/core/editing/commands/EditorCommand.cpp b/Source/core/editing/commands/EditorCommand.cpp

index 72808fd31595b85de24e661ade71cbff5f1e4c56..546c0dabfb9d5008efae0e4428648de28f9ba2ae 100644

--- a/Source/core/editing/commands/EditorCommand.cpp

+++ b/Source/core/editing/commands/EditorCommand.cpp

@@ -220,7 +220,7 @@ static bool expandSelectionToGranularity(LocalFrame& frame, TextGranularity gran

return false;

if (newRange.isCollapsed())

return false;

- EAffinity affinity = frame.selection().affinity();

+ TextAffinity affinity = frame.selection().affinity();

frame.selection().setSelectedRange(newRange, affinity, FrameSelection::NonDirectional, FrameSelection::CloseTyping);

return true;

}

@@ -398,7 +398,7 @@ static bool executeDeleteToMark(LocalFrame& frame, Event*, EditorCommandSource,

// |VisibleSelection::toNormalizedRange()|.

RefPtrWillBeRawPtr<Range> mark = frame.editor().mark().toNormalizedRange();

if (mark) {

- bool selected = frame.selection().setSelectedRange(unionEphemeralRanges(EphemeralRange(mark.get()), frame.editor().selectedRange()), DOWNSTREAM, FrameSelection::NonDirectional, FrameSelection::CloseTyping);

+ bool selected = frame.selection().setSelectedRange(unionEphemeralRanges(EphemeralRange(mark.get()), frame.editor().selectedRange()), TextAffinity::Downstream, FrameSelection::NonDirectional, FrameSelection::CloseTyping);

ASSERT(selected);

if (!selected)

return false;

@@ -1048,7 +1048,7 @@ static bool executeSelectToMark(LocalFrame& frame, Event*, EditorCommandSource,

EphemeralRange selection = frame.editor().selectedRange();

if (!mark || selection.isNull())

return false;

- frame.selection().setSelectedRange(unionEphemeralRanges(EphemeralRange(mark.get()), selection), DOWNSTREAM, FrameSelection::NonDirectional, FrameSelection::CloseTyping);

+ frame.selection().setSelectedRange(unionEphemeralRanges(EphemeralRange(mark.get()), selection), TextAffinity::Downstream, FrameSelection::NonDirectional, FrameSelection::CloseTyping);

return true;

}