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

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

Issue 2958483003: Make VisiblePosition::BeforeNode() to take const Node& instead of Node* (Closed)
Patch Set: 017-06-23T18:57:25 Created 3 years, 6 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/ReplaceSelectionCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
index e44d9d4fae83b50789b5c167af7cf7b97b8a819c..7a6123b936026a9bdde19929b783e84ba58ccdda 100644
--- a/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/ReplaceSelectionCommand.cpp
@@ -934,7 +934,7 @@ void ReplaceSelectionCommand::MergeEndIfNeeded(EditingState* editing_state) {
// needs to be audited. See http://crbug.com/590369 for more details.
GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
- destination = VisiblePosition::BeforeNode(placeholder);
+ destination = VisiblePosition::BeforeNode(*placeholder);
start_of_paragraph_to_move = CreateVisiblePosition(
start_of_paragraph_to_move.ToPositionWithAffinity());
}
@@ -1184,9 +1184,10 @@ void ReplaceSelectionCommand::DoApply(EditingState* editing_state) {
MostForwardCaretPosition(insertion_pos).AnchorNode())
: 0;
VisiblePosition original_vis_pos_before_end_br;
- if (end_br)
+ if (end_br) {
original_vis_pos_before_end_br =
- PreviousPositionOf(VisiblePosition::BeforeNode(end_br));
+ PreviousPositionOf(VisiblePosition::BeforeNode(*end_br));
+ }
Element* enclosing_block_of_insertion_pos =
EnclosingBlock(insertion_pos.AnchorNode());
@@ -1597,7 +1598,7 @@ bool ReplaceSelectionCommand::ShouldRemoveEndBR(
if (!end_br || !end_br->isConnected())
return false;
- VisiblePosition visible_pos = VisiblePosition::BeforeNode(end_br);
+ VisiblePosition visible_pos = VisiblePosition::BeforeNode(*end_br);
// Don't remove the br if nothing was inserted.
if (PreviousPositionOf(visible_pos).DeepEquivalent() ==
@@ -1980,7 +1981,7 @@ bool ReplaceSelectionCommand::PerformTrivialReplace(
isHTMLBRElement(*node_after_insertion_pos) &&
ShouldRemoveEndBR(
toHTMLBRElement(node_after_insertion_pos),
- VisiblePosition::BeforeNode(node_after_insertion_pos))) {
+ VisiblePosition::BeforeNode(*node_after_insertion_pos))) {
RemoveNodeAndPruneAncestors(node_after_insertion_pos, editing_state);
if (editing_state->IsAborted())
return false;

Powered by Google App Engine
This is Rietveld 408576698