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

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

Issue 2450213002: Utilize EditCommand::setEndingSelection() taking SelectionInDOMTree (Closed)
Patch Set: 2016-10-28T14:44:14 Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 if (editingState->isAborted()) 1100 if (editingState->isAborted())
1101 return; 1101 return;
1102 if (brResult) { 1102 if (brResult) {
1103 calculateTypingStyleAfterDelete(); 1103 calculateTypingStyleAfterDelete();
1104 document().updateStyleAndLayoutIgnorePendingStylesheets(); 1104 document().updateStyleAndLayoutIgnorePendingStylesheets();
1105 SelectionInDOMTree::Builder builder; 1105 SelectionInDOMTree::Builder builder;
1106 builder.setAffinity(affinity); 1106 builder.setAffinity(affinity);
1107 builder.setIsDirectional(endingSelection().isDirectional()); 1107 builder.setIsDirectional(endingSelection().isDirectional());
1108 if (m_endingPosition.isNotNull()) 1108 if (m_endingPosition.isNotNull())
1109 builder.collapse(m_endingPosition); 1109 builder.collapse(m_endingPosition);
1110 setEndingSelection(createVisibleSelection(builder.build())); 1110 setEndingSelection(builder.build());
1111 clearTransientState(); 1111 clearTransientState();
1112 rebalanceWhitespace(); 1112 rebalanceWhitespace();
1113 return; 1113 return;
1114 } 1114 }
1115 1115
1116 document().updateStyleAndLayoutIgnorePendingStylesheets(); 1116 document().updateStyleAndLayoutIgnorePendingStylesheets();
1117 1117
1118 handleGeneralDelete(editingState); 1118 handleGeneralDelete(editingState);
1119 if (editingState->isAborted()) 1119 if (editingState->isAborted())
1120 return; 1120 return;
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
1161 1161
1162 calculateTypingStyleAfterDelete(); 1162 calculateTypingStyleAfterDelete();
1163 1163
1164 document().updateStyleAndLayoutIgnorePendingStylesheets(); 1164 document().updateStyleAndLayoutIgnorePendingStylesheets();
1165 1165
1166 SelectionInDOMTree::Builder builder; 1166 SelectionInDOMTree::Builder builder;
1167 builder.setAffinity(affinity); 1167 builder.setAffinity(affinity);
1168 builder.setIsDirectional(endingSelection().isDirectional()); 1168 builder.setIsDirectional(endingSelection().isDirectional());
1169 if (m_endingPosition.isNotNull()) 1169 if (m_endingPosition.isNotNull())
1170 builder.collapse(m_endingPosition); 1170 builder.collapse(m_endingPosition);
1171 setEndingSelection(createVisibleSelection(builder.build())); 1171 setEndingSelection(builder.build());
1172 1172
1173 if (relocatableReferencePosition.position().isNull()) { 1173 if (relocatableReferencePosition.position().isNull()) {
1174 clearTransientState(); 1174 clearTransientState();
1175 return; 1175 return;
1176 } 1176 }
1177 1177
1178 // This deletion command is part of a move operation, we need to cleanup after 1178 // This deletion command is part of a move operation, we need to cleanup after
1179 // deletion. 1179 // deletion.
1180 m_referenceMovePosition = relocatableReferencePosition.position(); 1180 m_referenceMovePosition = relocatableReferencePosition.position();
1181 // If the node for the destination has been removed as a result of the 1181 // If the node for the destination has been removed as a result of the
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1227 visitor->trace(m_deleteIntoBlockquoteStyle); 1227 visitor->trace(m_deleteIntoBlockquoteStyle);
1228 visitor->trace(m_startRoot); 1228 visitor->trace(m_startRoot);
1229 visitor->trace(m_endRoot); 1229 visitor->trace(m_endRoot);
1230 visitor->trace(m_startTableRow); 1230 visitor->trace(m_startTableRow);
1231 visitor->trace(m_endTableRow); 1231 visitor->trace(m_endTableRow);
1232 visitor->trace(m_temporaryPlaceholder); 1232 visitor->trace(m_temporaryPlaceholder);
1233 CompositeEditCommand::trace(visitor); 1233 CompositeEditCommand::trace(visitor);
1234 } 1234 }
1235 1235
1236 } // namespace blink 1236 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698