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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.
deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSplitTo); | 71 RefPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplitTo) ? start.
deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSplitTo); |
72 RefPtr<Node> nodeAfterInsertionPosition = outerBlock; | 72 RefPtr<Node> nodeAfterInsertionPosition = outerBlock; |
73 RefPtr<Range> range = Range::create(document(), start, endOfSelection); | 73 RefPtrWillBeRawPtr<Range> range = Range::create(document(), start, endOfSele
ction); |
74 | 74 |
75 if (isElementForFormatBlock(refNode->tagQName()) && VisiblePosition(start) =
= startOfBlock(VisiblePosition(start)) | 75 if (isElementForFormatBlock(refNode->tagQName()) && VisiblePosition(start) =
= startOfBlock(VisiblePosition(start)) |
76 && (VisiblePosition(end) == endOfBlock(VisiblePosition(end)) || isNodeVi
siblyContainedWithin(*refNode, *range)) | 76 && (VisiblePosition(end) == endOfBlock(VisiblePosition(end)) || isNodeVi
siblyContainedWithin(*refNode, *range)) |
77 && refNode != root && !root->isDescendantOf(refNode)) { | 77 && refNode != root && !root->isDescendantOf(refNode)) { |
78 // Already in a block element that only contains the current paragraph | 78 // Already in a block element that only contains the current paragraph |
79 if (refNode->hasTagName(tagName())) | 79 if (refNode->hasTagName(tagName())) |
80 return; | 80 return; |
81 nodeAfterInsertionPosition = refNode; | 81 nodeAfterInsertionPosition = refNode; |
82 } | 82 } |
83 | 83 |
(...skipping 76 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()->rendererIsEditable() ? n->parentNode() : n; | 164 return n->parentNode()->rendererIsEditable() ? n->parentNode() : n; |
165 } | 165 } |
166 return lastBlock; | 166 return lastBlock; |
167 } | 167 } |
168 | 168 |
169 } | 169 } |
OLD | NEW |