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

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

Issue 189773005: Revert of Have Position deal with more references (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/ApplyStyleCommand.cpp ('k') | Source/core/editing/CompositeEditCommand.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) 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
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), DOWN STREAM, endingSelection().isDirectional())); 82 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()), DOWNSTREAM, endingSelection().isDirectional()));
83 rebalanceWhitespace(); 83 rebalanceWhitespace();
84 return; 84 return;
85 } 85 }
86 86
87 // Insert a break after the top blockquote. 87 // Insert a break after the top blockquote.
88 insertNodeAfter(breakNode.get(), topBlockquote); 88 insertNodeAfter(breakNode.get(), topBlockquote);
89 89
90 // If we're inserting the break at the end of the quoted content, we don't n eed to break the quote. 90 // If we're inserting the break at the end of the quoted content, we don't n eed to break the quote.
91 if (isLastVisPosInNode) { 91 if (isLastVisPosInNode) {
92 setEndingSelection(VisibleSelection(positionBeforeNode(*breakNode), DOWN STREAM, endingSelection().isDirectional())); 92 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()), DOWNSTREAM, endingSelection().isDirectional()));
93 rebalanceWhitespace(); 93 rebalanceWhitespace();
94 return; 94 return;
95 } 95 }
96 96
97 // Don't move a line break just after the caret. Doing so would create an e xtra, empty paragraph 97 // Don't move a line break just after the caret. Doing so would create an e xtra, empty paragraph
98 // in the new blockquote. 98 // in the new blockquote.
99 if (lineBreakExistsAtVisiblePosition(visiblePos)) 99 if (lineBreakExistsAtVisiblePosition(visiblePos))
100 pos = pos.next(); 100 pos = pos.next();
101 101
102 // Adjust the position so we don't split at the beginning of a quote. 102 // Adjust the position so we don't split at the beginning of a quote.
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 // If the startNode's original parent is now empty, remove it 175 // If the startNode's original parent is now empty, remove it
176 Node* originalParent = ancestors.first().get(); 176 Node* originalParent = ancestors.first().get();
177 if (!originalParent->hasChildren()) 177 if (!originalParent->hasChildren())
178 removeNode(originalParent); 178 removeNode(originalParent);
179 } 179 }
180 180
181 // Make sure the cloned block quote renders. 181 // Make sure the cloned block quote renders.
182 addBlockPlaceholderIfNeeded(clonedBlockquote.get()); 182 addBlockPlaceholderIfNeeded(clonedBlockquote.get());
183 183
184 // Put the selection right before the break. 184 // Put the selection right before the break.
185 setEndingSelection(VisibleSelection(positionBeforeNode(*breakNode), DOWNSTRE AM, endingSelection().isDirectional())); 185 setEndingSelection(VisibleSelection(positionBeforeNode(breakNode.get()), DOW NSTREAM, endingSelection().isDirectional()));
186 rebalanceWhitespace(); 186 rebalanceWhitespace();
187 } 187 }
188 188
189 } // namespace WebCore 189 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/ApplyStyleCommand.cpp ('k') | Source/core/editing/CompositeEditCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698