Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(266)

Unified Diff: third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp

Issue 2442673002: Get rid of createVisibleSelection() taking one Position (Closed)
Patch Set: 2016-10-24T17:42:38 Created 4 years, 2 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
Index: third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp b/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp
index 0afb7544e81428624bf1378cfe1aa7e6dfe5b905..af4bf7e888fefc1a85d61bbcec4bfe5ebd39112b 100644
--- a/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/InsertParagraphSeparatorCommand.cpp
@@ -325,8 +325,10 @@ void InsertParagraphSeparatorCommand::doApply(EditingState* editingState) {
document().updateStyleAndLayoutIgnorePendingStylesheets();
setEndingSelection(createVisibleSelection(
- Position::firstPositionInNode(parent), TextAffinity::Downstream,
- endingSelection().isDirectional()));
+ SelectionInDOMTree::Builder()
+ .collapse(Position::firstPositionInNode(parent))
+ .setIsDirectional(endingSelection().isDirectional())
+ .build()));
return;
}
@@ -393,9 +395,11 @@ void InsertParagraphSeparatorCommand::doApply(EditingState* editingState) {
// In this case, we need to set the new ending selection.
document().updateStyleAndLayoutIgnorePendingStylesheets();
- setEndingSelection(
- createVisibleSelection(insertionPosition, TextAffinity::Downstream,
- endingSelection().isDirectional()));
+ setEndingSelection(createVisibleSelection(
+ SelectionInDOMTree::Builder()
+ .collapse(insertionPosition)
+ .setIsDirectional(endingSelection().isDirectional())
+ .build()));
return;
}
@@ -418,9 +422,11 @@ void InsertParagraphSeparatorCommand::doApply(EditingState* editingState) {
// If the insertion point is a break element, there is nothing else
// we need to do.
if (visiblePos.deepEquivalent().anchorNode()->layoutObject()->isBR()) {
- setEndingSelection(
- createVisibleSelection(insertionPosition, TextAffinity::Downstream,
- endingSelection().isDirectional()));
+ setEndingSelection(createVisibleSelection(
+ SelectionInDOMTree::Builder()
+ .collapse(insertionPosition)
+ .setIsDirectional(endingSelection().isDirectional())
+ .build()));
return;
}
}
@@ -569,8 +575,10 @@ void InsertParagraphSeparatorCommand::doApply(EditingState* editingState) {
document().updateStyleAndLayoutIgnorePendingStylesheets();
setEndingSelection(createVisibleSelection(
- Position::firstPositionInNode(blockToInsert), TextAffinity::Downstream,
- endingSelection().isDirectional()));
+ SelectionInDOMTree::Builder()
+ .collapse(Position::firstPositionInNode(blockToInsert))
+ .setIsDirectional(endingSelection().isDirectional())
+ .build()));
applyStyleAfterInsertion(startBlock, editingState);
}

Powered by Google App Engine
This is Rietveld 408576698