OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2008 Apple 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 outdentParagraph(); | 212 outdentParagraph(); |
213 return; | 213 return; |
214 } | 214 } |
215 | 215 |
216 Position originalSelectionEnd = endingSelection().end(); | 216 Position originalSelectionEnd = endingSelection().end(); |
217 VisiblePosition endAfterSelection = endOfParagraph(endOfLastParagraph.next()
); | 217 VisiblePosition endAfterSelection = endOfParagraph(endOfLastParagraph.next()
); |
218 | 218 |
219 while (endOfCurrentParagraph.deepEquivalent() != endAfterSelection.deepEquiv
alent()) { | 219 while (endOfCurrentParagraph.deepEquivalent() != endAfterSelection.deepEquiv
alent()) { |
220 VisiblePosition endOfNextParagraph = endOfParagraph(endOfCurrentParagrap
h.next()); | 220 VisiblePosition endOfNextParagraph = endOfParagraph(endOfCurrentParagrap
h.next()); |
221 if (endOfCurrentParagraph.deepEquivalent() == endOfLastParagraph.deepEqu
ivalent()) | 221 if (endOfCurrentParagraph.deepEquivalent() == endOfLastParagraph.deepEqu
ivalent()) |
222 setEndingSelection(VisibleSelection(originalSelectionEnd, DOWNSTREAM
)); | 222 setEndingSelection(VisibleSelection(originalSelectionEnd, TextAffini
ty::Downstream)); |
223 else | 223 else |
224 setEndingSelection(endOfCurrentParagraph); | 224 setEndingSelection(endOfCurrentParagraph); |
225 | 225 |
226 outdentParagraph(); | 226 outdentParagraph(); |
227 | 227 |
228 // outdentParagraph could move more than one paragraph if the paragraph | 228 // outdentParagraph could move more than one paragraph if the paragraph |
229 // is in a list item. As a result, endAfterSelection and endOfNextParagr
aph | 229 // is in a list item. As a result, endAfterSelection and endOfNextParagr
aph |
230 // could refer to positions no longer in the document. | 230 // could refer to positions no longer in the document. |
231 if (endAfterSelection.isNotNull() && !endAfterSelection.deepEquivalent()
.inDocument()) | 231 if (endAfterSelection.isNotNull() && !endAfterSelection.deepEquivalent()
.inDocument()) |
232 break; | 232 break; |
(...skipping 16 matching lines...) Expand all Loading... |
249 | 249 |
250 void IndentOutdentCommand::formatRange(const Position& start, const Position& en
d, const Position&, RefPtrWillBeRawPtr<HTMLElement>& blockquoteForNextIndent) | 250 void IndentOutdentCommand::formatRange(const Position& start, const Position& en
d, const Position&, RefPtrWillBeRawPtr<HTMLElement>& blockquoteForNextIndent) |
251 { | 251 { |
252 if (tryIndentingAsListItem(start, end)) | 252 if (tryIndentingAsListItem(start, end)) |
253 blockquoteForNextIndent = nullptr; | 253 blockquoteForNextIndent = nullptr; |
254 else | 254 else |
255 indentIntoBlockquote(start, end, blockquoteForNextIndent); | 255 indentIntoBlockquote(start, end, blockquoteForNextIndent); |
256 } | 256 } |
257 | 257 |
258 } | 258 } |
OLD | NEW |