| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2005, 2006 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 return; | 101 return; |
| 102 | 102 |
| 103 Position pos(caret.deepEquivalent()); | 103 Position pos(caret.deepEquivalent()); |
| 104 | 104 |
| 105 pos = positionAvoidingSpecialElementBoundary(pos); | 105 pos = positionAvoidingSpecialElementBoundary(pos); |
| 106 | 106 |
| 107 pos = positionOutsideTabSpan(pos); | 107 pos = positionOutsideTabSpan(pos); |
| 108 | 108 |
| 109 RefPtr<Node> nodeToInsert; | 109 RefPtr<Node> nodeToInsert; |
| 110 if (shouldUseBreakElement(pos)) | 110 if (shouldUseBreakElement(pos)) |
| 111 nodeToInsert = createBreakElement(&document()); | 111 nodeToInsert = createBreakElement(document()); |
| 112 else | 112 else |
| 113 nodeToInsert = document().createTextNode("\n"); | 113 nodeToInsert = document().createTextNode("\n"); |
| 114 | 114 |
| 115 // FIXME: Need to merge text nodes when inserting just after or before text. | 115 // FIXME: Need to merge text nodes when inserting just after or before text. |
| 116 | 116 |
| 117 if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) { | 117 if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) { |
| 118 bool needExtraLineBreak = !pos.deprecatedNode()->hasTagName(hrTag) && !i
sHTMLTableElement(pos.deprecatedNode()); | 118 bool needExtraLineBreak = !pos.deprecatedNode()->hasTagName(hrTag) && !i
sHTMLTableElement(pos.deprecatedNode()); |
| 119 | 119 |
| 120 insertNodeAt(nodeToInsert.get(), pos); | 120 insertNodeAt(nodeToInsert.get(), pos); |
| 121 | 121 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 180 // before the line break (if the line break is at the end of a block it
isn't selectable). | 180 // before the line break (if the line break is at the end of a block it
isn't selectable). |
| 181 // So, this next call sets the endingSelection() to a caret just after t
he line break | 181 // So, this next call sets the endingSelection() to a caret just after t
he line break |
| 182 // that we inserted, or just before it if it's at the end of a block. | 182 // that we inserted, or just before it if it's at the end of a block. |
| 183 setEndingSelection(endingSelection().visibleEnd()); | 183 setEndingSelection(endingSelection().visibleEnd()); |
| 184 } | 184 } |
| 185 | 185 |
| 186 rebalanceWhitespace(); | 186 rebalanceWhitespace(); |
| 187 } | 187 } |
| 188 | 188 |
| 189 } | 189 } |
| OLD | NEW |