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

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

Issue 2920733002: Rename VisibleSelection::end() to End() (Closed)
Patch Set: 2017-06-01T18:31:38 Created 3 years, 7 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/DeleteSelectionCommand.cpp
diff --git a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
index 7cb0b53545e866f197a4dcbe8312615db5eb1c9f..29da94949285fd8043c0812f0b7723914d8804a7 100644
--- a/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
+++ b/third_party/WebKit/Source/core/editing/commands/DeleteSelectionCommand.cpp
@@ -121,7 +121,7 @@ void DeleteSelectionCommand::InitializeStartEnd(Position& start,
HTMLElement* end_special_container = nullptr;
start = selection_to_delete_.Start();
- end = selection_to_delete_.end();
+ end = selection_to_delete_.End();
// For HRs, we'll get a position at (HR,1) when hitting delete from the
// beginning of the previous line, or (HR,0) when forward deleting, but in
@@ -394,11 +394,12 @@ void DeleteSelectionCommand::SaveTypingStyleState() {
// of start(). We'll use this later in computeTypingStyleAfterDelete if we end
// up outside of a Mail blockquote
if (EnclosingNodeOfType(selection_to_delete_.Start(),
- IsMailHTMLBlockquoteElement))
+ IsMailHTMLBlockquoteElement)) {
yosin_UTC9 2017/06/01 09:42:50 For pass PRESUBMIT
delete_into_blockquote_style_ =
- EditingStyle::Create(selection_to_delete_.end());
- else
- delete_into_blockquote_style_ = nullptr;
+ EditingStyle::Create(selection_to_delete_.End());
+ return;
+ }
+ delete_into_blockquote_style_ = nullptr;
}
bool DeleteSelectionCommand::HandleSpecialCaseBRDelete(
@@ -1073,7 +1074,7 @@ void DeleteSelectionCommand::DoApply(EditingState* editing_state) {
GetDocument().UpdateStyleAndLayoutIgnorePendingStylesheets();
Position downstream_end =
- MostForwardCaretPosition(selection_to_delete_.end());
+ MostForwardCaretPosition(selection_to_delete_.End());
bool root_will_stay_open_without_placeholder =
downstream_end.ComputeContainerNode() ==
RootEditableElement(*downstream_end.ComputeContainerNode()) ||
@@ -1094,7 +1095,7 @@ void DeleteSelectionCommand::DoApply(EditingState* editing_state) {
// open empty cells, but that's handled elsewhere).
if (Element* table =
TableElementJustAfter(selection_to_delete_.VisibleStart())) {
- if (selection_to_delete_.end().AnchorNode()->IsDescendantOf(table))
+ if (selection_to_delete_.End().AnchorNode()->IsDescendantOf(table))
need_placeholder_ = false;
}
}

Powered by Google App Engine
This is Rietveld 408576698