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 17 matching lines...) Expand all Loading... |
28 | 28 |
29 #include "HTMLNames.h" | 29 #include "HTMLNames.h" |
30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
31 #include "core/dom/Text.h" | 31 #include "core/dom/Text.h" |
32 #include "core/editing/EditingStyle.h" | 32 #include "core/editing/EditingStyle.h" |
33 #include "core/editing/FrameSelection.h" | 33 #include "core/editing/FrameSelection.h" |
34 #include "core/editing/VisiblePosition.h" | 34 #include "core/editing/VisiblePosition.h" |
35 #include "core/editing/VisibleUnits.h" | 35 #include "core/editing/VisibleUnits.h" |
36 #include "core/editing/htmlediting.h" | 36 #include "core/editing/htmlediting.h" |
37 #include "core/html/HTMLElement.h" | 37 #include "core/html/HTMLElement.h" |
| 38 #include "core/html/HTMLTableElement.h" |
38 #include "core/page/Frame.h" | 39 #include "core/page/Frame.h" |
39 #include "core/rendering/RenderObject.h" | 40 #include "core/rendering/RenderObject.h" |
40 | 41 |
41 namespace WebCore { | 42 namespace WebCore { |
42 | 43 |
43 using namespace HTMLNames; | 44 using namespace HTMLNames; |
44 | 45 |
45 InsertLineBreakCommand::InsertLineBreakCommand(Document* document) | 46 InsertLineBreakCommand::InsertLineBreakCommand(Document* document) |
46 : CompositeEditCommand(document) | 47 : CompositeEditCommand(document) |
47 { | 48 { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 | 106 |
106 pos = positionOutsideTabSpan(pos); | 107 pos = positionOutsideTabSpan(pos); |
107 | 108 |
108 RefPtr<Node> nodeToInsert; | 109 RefPtr<Node> nodeToInsert; |
109 if (shouldUseBreakElement(pos)) | 110 if (shouldUseBreakElement(pos)) |
110 nodeToInsert = createBreakElement(document()); | 111 nodeToInsert = createBreakElement(document()); |
111 else | 112 else |
112 nodeToInsert = document()->createTextNode("\n"); | 113 nodeToInsert = document()->createTextNode("\n"); |
113 | 114 |
114 // 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. |
115 | 116 |
116 if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) { | 117 if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) { |
117 bool needExtraLineBreak = !pos.deprecatedNode()->hasTagName(hrTag) && !p
os.deprecatedNode()->hasTagName(tableTag); | 118 bool needExtraLineBreak = !pos.deprecatedNode()->hasTagName(hrTag) && !i
sHTMLTableElement(pos.deprecatedNode()); |
118 | 119 |
119 insertNodeAt(nodeToInsert.get(), pos); | 120 insertNodeAt(nodeToInsert.get(), pos); |
120 | 121 |
121 if (needExtraLineBreak) | 122 if (needExtraLineBreak) |
122 insertNodeBefore(nodeToInsert->cloneNode(false), nodeToInsert); | 123 insertNodeBefore(nodeToInsert->cloneNode(false), nodeToInsert); |
123 | 124 |
124 VisiblePosition endingPosition(positionBeforeNode(nodeToInsert.get())); | 125 VisiblePosition endingPosition(positionBeforeNode(nodeToInsert.get())); |
125 setEndingSelection(VisibleSelection(endingPosition, endingSelection().is
Directional())); | 126 setEndingSelection(VisibleSelection(endingPosition, endingSelection().is
Directional())); |
126 } else if (pos.deprecatedEditingOffset() <= caretMinOffset(pos.deprecatedNod
e())) { | 127 } else if (pos.deprecatedEditingOffset() <= caretMinOffset(pos.deprecatedNod
e())) { |
127 insertNodeAt(nodeToInsert.get(), pos); | 128 insertNodeAt(nodeToInsert.get(), pos); |
128 | 129 |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 // 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). |
180 // 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 |
181 // 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. |
182 setEndingSelection(endingSelection().visibleEnd()); | 183 setEndingSelection(endingSelection().visibleEnd()); |
183 } | 184 } |
184 | 185 |
185 rebalanceWhitespace(); | 186 rebalanceWhitespace(); |
186 } | 187 } |
187 | 188 |
188 } | 189 } |
OLD | NEW |