Source/core/editing/commands/TypingCommand.cpp - Issue 1302353002: Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream}

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

Issue 1302353002: Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: 2015-08-22T04:51:20 Rebase 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

« no previous file with comments | « Source/core/editing/commands/ReplaceSelectionCommand.cpp ('k') | Source/core/editing/serializers/StyledMarkupSerializer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 43e7548afc450f2f8b4bf6bcf6b274291b4d5bef..6b6ba7d510c592e2d6b2f6b3f26cc43f7e92ff71 100644

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

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

@@ -540,13 +540,13 @@ void TypingCommand::forwardDeleteKeyPressed(TextGranularity granularity, bool ki

if (killRing && selection->isCaret() && granularity != CharacterGranularity)

selection->modify(FrameSelection::AlterationExtend, DirectionForward, CharacterGranularity);

- Position downstreamEnd = endingSelection().end().downstream();

+ Position downstreamEnd = mostForwardCaretPosition(endingSelection().end());

VisiblePosition visibleEnd = endingSelection().visibleEnd();

Node* enclosingTableCell = enclosingNodeOfType(visibleEnd.deepEquivalent(), &isTableCell);

if (enclosingTableCell && visibleEnd.deepEquivalent() == VisiblePosition(lastPositionInNode(enclosingTableCell)).deepEquivalent())

return;

if (visibleEnd.deepEquivalent() == endOfParagraph(visibleEnd).deepEquivalent())

- downstreamEnd = visibleEnd.next(CannotCrossEditingBoundary).deepEquivalent().downstream();

+ downstreamEnd = mostForwardCaretPosition(visibleEnd.next(CannotCrossEditingBoundary).deepEquivalent());

// When deleting tables: Select the table first, then perform the deletion

if (isRenderedTableElement(downstreamEnd.computeContainerNode()) && downstreamEnd.computeOffsetInContainerNode() <= caretMinOffset(downstreamEnd.computeContainerNode())) {

setEndingSelection(VisibleSelection(endingSelection().end(), positionAfterNode(downstreamEnd.computeContainerNode()), TextAffinity::Downstream, endingSelection().isDirectional()));