| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 } | 52 } |
| 53 | 53 |
| 54 void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection
, const VisiblePosition& endOfSelection) | 54 void FormatBlockCommand::formatSelection(const VisiblePosition& startOfSelection
, const VisiblePosition& endOfSelection) |
| 55 { | 55 { |
| 56 if (!isElementForFormatBlock(tagName())) | 56 if (!isElementForFormatBlock(tagName())) |
| 57 return; | 57 return; |
| 58 ApplyBlockElementCommand::formatSelection(startOfSelection, endOfSelection); | 58 ApplyBlockElementCommand::formatSelection(startOfSelection, endOfSelection); |
| 59 m_didApply = true; | 59 m_didApply = true; |
| 60 } | 60 } |
| 61 | 61 |
| 62 void FormatBlockCommand::formatRange(const Position& start, const Position& end,
const Position& endOfSelection, RefPtrWillBeRawPtr<Element>& blockNode) | 62 void FormatBlockCommand::formatRange(const Position& start, const Position& end,
const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>& blockNode) |
| 63 { | 63 { |
| 64 Element* refNode = enclosingBlockFlowElement(VisiblePosition(end)); | 64 Element* refNode = enclosingBlockFlowElement(VisiblePosition(end)); |
| 65 Element* root = editableRootForPosition(start); | 65 Element* root = editableRootForPosition(start); |
| 66 // Root is null for elements with contenteditable=false. | 66 // Root is null for elements with contenteditable=false. |
| 67 if (!root || !refNode) | 67 if (!root || !refNode) |
| 68 return; | 68 return; |
| 69 | 69 |
| 70 Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.deprecatedNode()); | 70 Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.deprecatedNode()); |
| 71 RefPtrWillBeRawPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplit
To) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSpl
itTo).get(); | 71 RefPtrWillBeRawPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplit
To) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSpl
itTo).get(); |
| 72 RefPtrWillBeRawPtr<Node> nodeAfterInsertionPosition = outerBlock; | 72 RefPtrWillBeRawPtr<Node> nodeAfterInsertionPosition = outerBlock; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 return n; | 160 return n; |
| 161 if (isBlock(n)) | 161 if (isBlock(n)) |
| 162 lastBlock = n; | 162 lastBlock = n; |
| 163 if (isListElement(n)) | 163 if (isListElement(n)) |
| 164 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n; | 164 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n; |
| 165 } | 165 } |
| 166 return lastBlock; | 166 return lastBlock; |
| 167 } | 167 } |
| 168 | 168 |
| 169 } | 169 } |
| OLD | NEW |