| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 3 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 Node* startContainer = range.startPosition().computeContainerNode(); | 249 Node* startContainer = range.startPosition().computeContainerNode(); |
| 250 Node* endContainer = range.endPosition().computeContainerNode(); | 250 Node* endContainer = range.endPosition().computeContainerNode(); |
| 251 if (!startContainer || !endContainer) | 251 if (!startContainer || !endContainer) |
| 252 return false; | 252 return false; |
| 253 | 253 |
| 254 if (!startContainer->hasEditableStyle() || !endContainer->hasEditableStyle()
) | 254 if (!startContainer->hasEditableStyle() || !endContainer->hasEditableStyle()
) |
| 255 return false; | 255 return false; |
| 256 | 256 |
| 257 if (range.isCollapsed()) { | 257 if (range.isCollapsed()) { |
| 258 VisiblePosition start(range.startPosition()); | 258 VisiblePosition start(range.startPosition()); |
| 259 VisiblePosition previous = start.previous(); | 259 VisiblePosition previous = previousPositionOf(start); |
| 260 // FIXME: We sometimes allow deletions at the start of editable roots, l
ike when the caret is in an empty list item. | 260 // FIXME: We sometimes allow deletions at the start of editable roots, l
ike when the caret is in an empty list item. |
| 261 if (previous.isNull() || previous.deepEquivalent().anchorNode()->rootEdi
tableElement() != startContainer->rootEditableElement()) | 261 if (previous.isNull() || previous.deepEquivalent().anchorNode()->rootEdi
tableElement() != startContainer->rootEditableElement()) |
| 262 return false; | 262 return false; |
| 263 } | 263 } |
| 264 return true; | 264 return true; |
| 265 } | 265 } |
| 266 | 266 |
| 267 bool Editor::smartInsertDeleteEnabled() const | 267 bool Editor::smartInsertDeleteEnabled() const |
| 268 { | 268 { |
| 269 if (Settings* settings = frame().settings()) | 269 if (Settings* settings = frame().settings()) |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 if (!canEdit()) | 1017 if (!canEdit()) |
| 1018 return; | 1018 return; |
| 1019 | 1019 |
| 1020 VisibleSelection selection = frame().selection().selection(); | 1020 VisibleSelection selection = frame().selection().selection(); |
| 1021 if (!selection.isCaret()) | 1021 if (!selection.isCaret()) |
| 1022 return; | 1022 return; |
| 1023 | 1023 |
| 1024 // Make a selection that goes back one character and forward two characters. | 1024 // Make a selection that goes back one character and forward two characters. |
| 1025 VisiblePosition caret = selection.visibleStart(); | 1025 VisiblePosition caret = selection.visibleStart(); |
| 1026 VisiblePosition next = isEndOfParagraph(caret) ? caret : caret.next(); | 1026 VisiblePosition next = isEndOfParagraph(caret) ? caret : caret.next(); |
| 1027 VisiblePosition previous = next.previous(); | 1027 VisiblePosition previous = previousPositionOf(next); |
| 1028 if (next.deepEquivalent() == previous.deepEquivalent()) | 1028 if (next.deepEquivalent() == previous.deepEquivalent()) |
| 1029 return; | 1029 return; |
| 1030 previous = previous.previous(); | 1030 previous = previousPositionOf(previous); |
| 1031 if (!inSameParagraph(next, previous)) | 1031 if (!inSameParagraph(next, previous)) |
| 1032 return; | 1032 return; |
| 1033 const EphemeralRange range = makeRange(previous, next); | 1033 const EphemeralRange range = makeRange(previous, next); |
| 1034 if (range.isNull()) | 1034 if (range.isNull()) |
| 1035 return; | 1035 return; |
| 1036 VisibleSelection newSelection(range); | 1036 VisibleSelection newSelection(range); |
| 1037 | 1037 |
| 1038 // Transpose the two characters. | 1038 // Transpose the two characters. |
| 1039 String text = plainText(range); | 1039 String text = plainText(range); |
| 1040 if (text.length() != 2) | 1040 if (text.length() != 2) |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1301 } | 1301 } |
| 1302 | 1302 |
| 1303 DEFINE_TRACE(Editor) | 1303 DEFINE_TRACE(Editor) |
| 1304 { | 1304 { |
| 1305 visitor->trace(m_frame); | 1305 visitor->trace(m_frame); |
| 1306 visitor->trace(m_lastEditCommand); | 1306 visitor->trace(m_lastEditCommand); |
| 1307 visitor->trace(m_mark); | 1307 visitor->trace(m_mark); |
| 1308 } | 1308 } |
| 1309 | 1309 |
| 1310 } // namespace blink | 1310 } // namespace blink |
| OLD | NEW |