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

Side by Side Diff: Source/core/editing/InsertLineBreakCommand.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
OLDNEW
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 return true; 54 return true;
55 } 55 }
56 56
57 // Whether we should insert a break element or a '\n'. 57 // Whether we should insert a break element or a '\n'.
58 bool InsertLineBreakCommand::shouldUseBreakElement(const Position& insertionPos) 58 bool InsertLineBreakCommand::shouldUseBreakElement(const Position& insertionPos)
59 { 59 {
60 // An editing position like [input, 0] actually refers to the position befor e 60 // An editing position like [input, 0] actually refers to the position befor e
61 // the input element, and in that case we need to check the input element's 61 // the input element, and in that case we need to check the input element's
62 // parent's layoutObject. 62 // parent's layoutObject.
63 Position p(insertionPos.parentAnchoredEquivalent()); 63 Position p(insertionPos.parentAnchoredEquivalent());
64 return p.deprecatedNode()->layoutObject() && !p.deprecatedNode()->layoutObje ct()->style()->preserveNewline(); 64 return p.anchorNode()->layoutObject() && !p.anchorNode()->layoutObject()->st yle()->preserveNewline();
65 } 65 }
66 66
67 void InsertLineBreakCommand::doApply() 67 void InsertLineBreakCommand::doApply()
68 { 68 {
69 deleteSelection(); 69 deleteSelection();
70 VisibleSelection selection = endingSelection(); 70 VisibleSelection selection = endingSelection();
71 if (!selection.isNonOrphanedCaretOrRange()) 71 if (!selection.isNonOrphanedCaretOrRange())
72 return; 72 return;
73 73
74 VisiblePosition caret(selection.visibleStart()); 74 VisiblePosition caret(selection.visibleStart());
(...skipping 10 matching lines...) Expand all
85 85
86 RefPtrWillBeRawPtr<Node> nodeToInsert = nullptr; 86 RefPtrWillBeRawPtr<Node> nodeToInsert = nullptr;
87 if (shouldUseBreakElement(pos)) 87 if (shouldUseBreakElement(pos))
88 nodeToInsert = createBreakElement(document()); 88 nodeToInsert = createBreakElement(document());
89 else 89 else
90 nodeToInsert = document().createTextNode("\n"); 90 nodeToInsert = document().createTextNode("\n");
91 91
92 // FIXME: Need to merge text nodes when inserting just after or before text. 92 // FIXME: Need to merge text nodes when inserting just after or before text.
93 93
94 if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) { 94 if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) {
95 bool needExtraLineBreak = !isHTMLHRElement(*pos.deprecatedNode()) && !is HTMLTableElement(*pos.deprecatedNode()); 95 bool needExtraLineBreak = !isHTMLHRElement(*pos.anchorNode()) && !isHTML TableElement(*pos.anchorNode());
96 96
97 insertNodeAt(nodeToInsert.get(), pos); 97 insertNodeAt(nodeToInsert.get(), pos);
98 98
99 if (needExtraLineBreak) 99 if (needExtraLineBreak)
100 insertNodeBefore(nodeToInsert->cloneNode(false), nodeToInsert); 100 insertNodeBefore(nodeToInsert->cloneNode(false), nodeToInsert);
101 101
102 VisiblePosition endingPosition(positionBeforeNode(nodeToInsert.get())); 102 VisiblePosition endingPosition(positionBeforeNode(nodeToInsert.get()));
103 setEndingSelection(VisibleSelection(endingPosition, endingSelection().is Directional())); 103 setEndingSelection(VisibleSelection(endingPosition, endingSelection().is Directional()));
104 } else if (pos.deprecatedEditingOffset() <= caretMinOffset(pos.deprecatedNod e())) { 104 } else if (pos.deprecatedEditingOffset() <= caretMinOffset(pos.anchorNode()) ) {
105 insertNodeAt(nodeToInsert.get(), pos); 105 insertNodeAt(nodeToInsert.get(), pos);
106 106
107 // Insert an extra br or '\n' if the just inserted one collapsed. 107 // Insert an extra br or '\n' if the just inserted one collapsed.
108 if (!isStartOfParagraph(VisiblePosition(positionBeforeNode(nodeToInsert. get())))) 108 if (!isStartOfParagraph(VisiblePosition(positionBeforeNode(nodeToInsert. get()))))
109 insertNodeBefore(nodeToInsert->cloneNode(false).get(), nodeToInsert. get()); 109 insertNodeBefore(nodeToInsert->cloneNode(false).get(), nodeToInsert. get());
110 110
111 setEndingSelection(VisibleSelection(positionInParentAfterNode(*nodeToIns ert), DOWNSTREAM, endingSelection().isDirectional())); 111 setEndingSelection(VisibleSelection(positionInParentAfterNode(*nodeToIns ert), DOWNSTREAM, endingSelection().isDirectional()));
112 // If we're inserting after all of the rendered text in a text node, or into a non-text node, 112 // If we're inserting after all of the rendered text in a text node, or into a non-text node,
113 // a simple insertion is sufficient. 113 // a simple insertion is sufficient.
114 } else if (pos.deprecatedEditingOffset() >= caretMaxOffset(pos.deprecatedNod e()) || !pos.deprecatedNode()->isTextNode()) { 114 } else if (pos.deprecatedEditingOffset() >= caretMaxOffset(pos.anchorNode()) || !pos.anchorNode()->isTextNode()) {
115 insertNodeAt(nodeToInsert.get(), pos); 115 insertNodeAt(nodeToInsert.get(), pos);
116 setEndingSelection(VisibleSelection(positionInParentAfterNode(*nodeToIns ert), DOWNSTREAM, endingSelection().isDirectional())); 116 setEndingSelection(VisibleSelection(positionInParentAfterNode(*nodeToIns ert), DOWNSTREAM, endingSelection().isDirectional()));
117 } else if (pos.deprecatedNode()->isTextNode()) { 117 } else if (pos.anchorNode()->isTextNode()) {
118 // Split a text node 118 // Split a text node
119 Text* textNode = toText(pos.deprecatedNode()); 119 Text* textNode = toText(pos.anchorNode());
120 splitTextNode(textNode, pos.deprecatedEditingOffset()); 120 splitTextNode(textNode, pos.deprecatedEditingOffset());
121 insertNodeBefore(nodeToInsert, textNode); 121 insertNodeBefore(nodeToInsert, textNode);
122 Position endingPosition = firstPositionInNode(textNode); 122 Position endingPosition = firstPositionInNode(textNode);
123 123
124 // Handle whitespace that occurs after the split 124 // Handle whitespace that occurs after the split
125 document().updateLayoutIgnorePendingStylesheets(); 125 document().updateLayoutIgnorePendingStylesheets();
126 if (!endingPosition.isRenderedCharacter()) { 126 if (!endingPosition.isRenderedCharacter()) {
127 Position positionBeforeTextNode(positionInParentBeforeNode(*textNode )); 127 Position positionBeforeTextNode(positionInParentBeforeNode(*textNode ));
128 // Clear out all whitespace and insert one non-breaking space 128 // Clear out all whitespace and insert one non-breaking space
129 deleteInsignificantTextDownstream(endingPosition); 129 deleteInsignificantTextDownstream(endingPosition);
(...skipping 27 matching lines...) Expand all
157 // before the line break (if the line break is at the end of a block it isn't selectable). 157 // before the line break (if the line break is at the end of a block it isn't selectable).
158 // So, this next call sets the endingSelection() to a caret just after t he line break 158 // So, this next call sets the endingSelection() to a caret just after t he line break
159 // that we inserted, or just before it if it's at the end of a block. 159 // that we inserted, or just before it if it's at the end of a block.
160 setEndingSelection(endingSelection().visibleEnd()); 160 setEndingSelection(endingSelection().visibleEnd());
161 } 161 }
162 162
163 rebalanceWhitespace(); 163 rebalanceWhitespace();
164 } 164 }
165 165
166 } 166 }
OLDNEW
« no previous file with comments | « Source/core/editing/InputMethodController.cpp ('k') | Source/core/editing/InsertListCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698