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

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

Issue 252783002: Make Range.detach() a no-op (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 7 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/EditorCommand.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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 if (wasEndOfParagraph && !isEndOfParagraph(VisiblePosition(lastParagraphInBl ockNode)) && !isStartOfParagraph(VisiblePosition(lastParagraphInBlockNode))) 100 if (wasEndOfParagraph && !isEndOfParagraph(VisiblePosition(lastParagraphInBl ockNode)) && !isStartOfParagraph(VisiblePosition(lastParagraphInBlockNode)))
101 insertBlockPlaceholder(lastParagraphInBlockNode); 101 insertBlockPlaceholder(lastParagraphInBlockNode);
102 } 102 }
103 103
104 Element* FormatBlockCommand::elementForFormatBlockCommand(Range* range) 104 Element* FormatBlockCommand::elementForFormatBlockCommand(Range* range)
105 { 105 {
106 if (!range) 106 if (!range)
107 return 0; 107 return 0;
108 108
109 Node* commonAncestor = range->commonAncestorContainer(IGNORE_EXCEPTION); 109 Node* commonAncestor = range->commonAncestorContainer();
110 while (commonAncestor && !isElementForFormatBlock(commonAncestor)) 110 while (commonAncestor && !isElementForFormatBlock(commonAncestor))
111 commonAncestor = commonAncestor->parentNode(); 111 commonAncestor = commonAncestor->parentNode();
112 112
113 if (!commonAncestor) 113 if (!commonAncestor)
114 return 0; 114 return 0;
115 115
116 Element* rootEditableElement = range->startContainer()->rootEditableElement( ); 116 Element* rootEditableElement = range->startContainer()->rootEditableElement( );
117 if (!rootEditableElement || commonAncestor->contains(rootEditableElement)) 117 if (!rootEditableElement || commonAncestor->contains(rootEditableElement))
118 return 0; 118 return 0;
119 119
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 }
OLDNEW
« no previous file with comments | « Source/core/editing/EditorCommand.cpp ('k') | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698