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 16 matching lines...) Expand all Loading... |
27 #include "core/editing/InsertParagraphSeparatorCommand.h" | 27 #include "core/editing/InsertParagraphSeparatorCommand.h" |
28 | 28 |
29 #include "core/HTMLNames.h" | 29 #include "core/HTMLNames.h" |
30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
31 #include "core/dom/NodeTraversal.h" | 31 #include "core/dom/NodeTraversal.h" |
32 #include "core/dom/Text.h" | 32 #include "core/dom/Text.h" |
33 #include "core/editing/EditingStyle.h" | 33 #include "core/editing/EditingStyle.h" |
34 #include "core/editing/InsertLineBreakCommand.h" | 34 #include "core/editing/InsertLineBreakCommand.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/HTMLBRElement.h" |
37 #include "core/html/HTMLElement.h" | 38 #include "core/html/HTMLElement.h" |
38 #include "core/rendering/RenderObject.h" | 39 #include "core/rendering/RenderObject.h" |
39 | 40 |
40 namespace blink { | 41 namespace blink { |
41 | 42 |
42 using namespace HTMLNames; | 43 using namespace HTMLNames; |
43 | 44 |
44 // When inserting a new line, we want to avoid nesting empty divs if we can. Ot
herwise, when | 45 // When inserting a new line, we want to avoid nesting empty divs if we can. Ot
herwise, when |
45 // pasting, it's easy to have each new line be a div deeper than the previous.
E.g., in the case | 46 // pasting, it's easy to have each new line be a div deeper than the previous.
E.g., in the case |
46 // below, we want to insert at ^ instead of |. | 47 // below, we want to insert at ^ instead of |. |
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 } | 305 } |
305 | 306 |
306 //--------------------------------------------------------------------- | 307 //--------------------------------------------------------------------- |
307 // Handle the (more complicated) general case, | 308 // Handle the (more complicated) general case, |
308 | 309 |
309 // All of the content in the current block after visiblePos is | 310 // All of the content in the current block after visiblePos is |
310 // about to be wrapped in a new paragraph element. Add a br before | 311 // about to be wrapped in a new paragraph element. Add a br before |
311 // it if visiblePos is at the start of a paragraph so that the | 312 // it if visiblePos is at the start of a paragraph so that the |
312 // content will move down a line. | 313 // content will move down a line. |
313 if (isStartOfParagraph(visiblePos)) { | 314 if (isStartOfParagraph(visiblePos)) { |
314 RefPtrWillBeRawPtr<Element> br = createBreakElement(document()); | 315 RefPtrWillBeRawPtr<HTMLBRElement> br = createBreakElement(document()); |
315 insertNodeAt(br.get(), insertionPosition); | 316 insertNodeAt(br.get(), insertionPosition); |
316 insertionPosition = positionInParentAfterNode(*br); | 317 insertionPosition = positionInParentAfterNode(*br); |
317 // If the insertion point is a break element, there is nothing else | 318 // If the insertion point is a break element, there is nothing else |
318 // we need to do. | 319 // we need to do. |
319 if (visiblePos.deepEquivalent().anchorNode()->renderer()->isBR()) { | 320 if (visiblePos.deepEquivalent().anchorNode()->renderer()->isBR()) { |
320 setEndingSelection(VisibleSelection(insertionPosition, DOWNSTREAM, e
ndingSelection().isDirectional())); | 321 setEndingSelection(VisibleSelection(insertionPosition, DOWNSTREAM, e
ndingSelection().isDirectional())); |
321 return; | 322 return; |
322 } | 323 } |
323 } | 324 } |
324 | 325 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 } | 427 } |
427 | 428 |
428 void InsertParagraphSeparatorCommand::trace(Visitor *visitor) | 429 void InsertParagraphSeparatorCommand::trace(Visitor *visitor) |
429 { | 430 { |
430 visitor->trace(m_style); | 431 visitor->trace(m_style); |
431 CompositeEditCommand::trace(visitor); | 432 CompositeEditCommand::trace(visitor); |
432 } | 433 } |
433 | 434 |
434 | 435 |
435 } // namespace blink | 436 } // namespace blink |
OLD | NEW |