| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2005 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2005 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 20 matching lines...) Expand all Loading... |
| 31 #include "core/dom/Text.h" | 31 #include "core/dom/Text.h" |
| 32 #include "core/editing/VisiblePosition.h" | 32 #include "core/editing/VisiblePosition.h" |
| 33 #include "core/editing/htmlediting.h" | 33 #include "core/editing/htmlediting.h" |
| 34 #include "core/html/HTMLElement.h" | 34 #include "core/html/HTMLElement.h" |
| 35 #include "core/rendering/RenderListItem.h" | 35 #include "core/rendering/RenderListItem.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 using namespace HTMLNames; | 39 using namespace HTMLNames; |
| 40 | 40 |
| 41 BreakBlockquoteCommand::BreakBlockquoteCommand(Document *document) | 41 BreakBlockquoteCommand::BreakBlockquoteCommand(Document& document) |
| 42 : CompositeEditCommand(document) | 42 : CompositeEditCommand(document) |
| 43 { | 43 { |
| 44 } | 44 } |
| 45 | 45 |
| 46 void BreakBlockquoteCommand::doApply() | 46 void BreakBlockquoteCommand::doApply() |
| 47 { | 47 { |
| 48 if (endingSelection().isNone()) | 48 if (endingSelection().isNone()) |
| 49 return; | 49 return; |
| 50 | 50 |
| 51 // Delete the current selection. | 51 // Delete the current selection. |
| (...skipping 12 matching lines...) Expand all Loading... |
| 64 | 64 |
| 65 // pos is a position equivalent to the caret. We use downstream() so that p
os will | 65 // pos is a position equivalent to the caret. We use downstream() so that p
os will |
| 66 // be in the first node that we need to move (there are a few exceptions to
this, see below). | 66 // be in the first node that we need to move (there are a few exceptions to
this, see below). |
| 67 Position pos = endingSelection().start().downstream(); | 67 Position pos = endingSelection().start().downstream(); |
| 68 | 68 |
| 69 // Find the top-most blockquote from the start. | 69 // Find the top-most blockquote from the start. |
| 70 Node* topBlockquote = highestEnclosingNodeOfType(pos, isMailBlockquote); | 70 Node* topBlockquote = highestEnclosingNodeOfType(pos, isMailBlockquote); |
| 71 if (!topBlockquote || !topBlockquote->parentNode() || !topBlockquote->isElem
entNode()) | 71 if (!topBlockquote || !topBlockquote->parentNode() || !topBlockquote->isElem
entNode()) |
| 72 return; | 72 return; |
| 73 | 73 |
| 74 RefPtr<Element> breakNode = createBreakElement(document()); | 74 RefPtr<Element> breakNode = createBreakElement(&document()); |
| 75 | 75 |
| 76 bool isLastVisPosInNode = isLastVisiblePositionInNode(visiblePos, topBlockqu
ote); | 76 bool isLastVisPosInNode = isLastVisiblePositionInNode(visiblePos, topBlockqu
ote); |
| 77 | 77 |
| 78 // If the position is at the beginning of the top quoted content, we don't n
eed to break the quote. | 78 // If the position is at the beginning of the top quoted content, we don't n
eed to break the quote. |
| 79 // Instead, insert the break before the blockquote, unless the position is a
s the end of the the quoted content. | 79 // Instead, insert the break before the blockquote, unless the position is a
s the end of the the quoted content. |
| 80 if (isFirstVisiblePositionInNode(visiblePos, topBlockquote) && !isLastVisPos
InNode) { | 80 if (isFirstVisiblePositionInNode(visiblePos, topBlockquote) && !isLastVisPos
InNode) { |
| 81 insertNodeBefore(breakNode.get(), topBlockquote); | 81 insertNodeBefore(breakNode.get(), topBlockquote); |
| 82 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()),
DOWNSTREAM, endingSelection().isDirectional())); | 82 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()),
DOWNSTREAM, endingSelection().isDirectional())); |
| 83 rebalanceWhitespace(); | 83 rebalanceWhitespace(); |
| 84 return; | 84 return; |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 | 179 |
| 180 // Make sure the cloned block quote renders. | 180 // Make sure the cloned block quote renders. |
| 181 addBlockPlaceholderIfNeeded(clonedBlockquote.get()); | 181 addBlockPlaceholderIfNeeded(clonedBlockquote.get()); |
| 182 | 182 |
| 183 // Put the selection right before the break. | 183 // Put the selection right before the break. |
| 184 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()), DOW
NSTREAM, endingSelection().isDirectional())); | 184 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()), DOW
NSTREAM, endingSelection().isDirectional())); |
| 185 rebalanceWhitespace(); | 185 rebalanceWhitespace(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 } // namespace WebCore | 188 } // namespace WebCore |
| OLD | NEW |