Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Side by Side Diff: Source/core/editing/FormatBlockCommand.cpp

Issue 1245843003: [CodeHealth] Use Position::anchorNode instead of deprecatedNode. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/editing/Editor.cpp ('k') | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>& blockElement) 63 void FormatBlockCommand::formatRange(const Position& start, const Position& end, const Position& endOfSelection, RefPtrWillBeRawPtr<HTMLElement>& blockElement)
64 { 64 {
65 Element* refElement = enclosingBlockFlowElement(VisiblePosition(end)); 65 Element* refElement = enclosingBlockFlowElement(VisiblePosition(end));
66 Element* root = editableRootForPosition(start); 66 Element* root = editableRootForPosition(start);
67 // Root is null for elements with contenteditable=false. 67 // Root is null for elements with contenteditable=false.
68 if (!root || !refElement) 68 if (!root || !refElement)
69 return; 69 return;
70 70
71 Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.deprecatedNode()); 71 Node* nodeToSplitTo = enclosingBlockToSplitTreeTo(start.anchorNode());
72 RefPtrWillBeRawPtr<Node> outerBlock = (start.deprecatedNode() == nodeToSplit To) ? start.deprecatedNode() : splitTreeToNode(start.deprecatedNode(), nodeToSpl itTo).get(); 72 RefPtrWillBeRawPtr<Node> outerBlock = (start.anchorNode() == nodeToSplitTo) ? start.anchorNode() : splitTreeToNode(start.anchorNode(), nodeToSplitTo).get();
73 RefPtrWillBeRawPtr<Node> nodeAfterInsertionPosition = outerBlock; 73 RefPtrWillBeRawPtr<Node> nodeAfterInsertionPosition = outerBlock;
74 RefPtrWillBeRawPtr<Range> range = Range::create(document(), start, endOfSele ction); 74 RefPtrWillBeRawPtr<Range> range = Range::create(document(), start, endOfSele ction);
75 75
76 if (isElementForFormatBlock(refElement->tagQName()) && VisiblePosition(start ) == startOfBlock(VisiblePosition(start)) 76 if (isElementForFormatBlock(refElement->tagQName()) && VisiblePosition(start ) == startOfBlock(VisiblePosition(start))
77 && (VisiblePosition(end) == endOfBlock(VisiblePosition(end)) || isNodeVi siblyContainedWithin(*refElement, *range)) 77 && (VisiblePosition(end) == endOfBlock(VisiblePosition(end)) || isNodeVi siblyContainedWithin(*refElement, *range))
78 && refElement != root && !root->isDescendantOf(refElement)) { 78 && refElement != root && !root->isDescendantOf(refElement)) {
79 // Already in a block element that only contains the current paragraph 79 // Already in a block element that only contains the current paragraph
80 if (refElement->hasTagName(tagName())) 80 if (refElement->hasTagName(tagName()))
81 return; 81 return;
82 nodeAfterInsertionPosition = refElement; 82 nodeAfterInsertionPosition = refElement;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 return n; 161 return n;
162 if (isBlock(n)) 162 if (isBlock(n))
163 lastBlock = n; 163 lastBlock = n;
164 if (isHTMLListElement(n)) 164 if (isHTMLListElement(n))
165 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n; 165 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n;
166 } 166 }
167 return lastBlock; 167 return lastBlock;
168 } 168 }
169 169
170 } 170 }
OLDNEW
« no previous file with comments | « Source/core/editing/Editor.cpp ('k') | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698