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

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

Issue 196683003: Use new is*Element() helper functions more in editing code (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/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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 149 }
150 return blockTags.contains(tagName); 150 return blockTags.contains(tagName);
151 } 151 }
152 152
153 Node* enclosingBlockToSplitTreeTo(Node* startNode) 153 Node* enclosingBlockToSplitTreeTo(Node* startNode)
154 { 154 {
155 Node* lastBlock = startNode; 155 Node* lastBlock = startNode;
156 for (Node* n = startNode; n; n = n->parentNode()) { 156 for (Node* n = startNode; n; n = n->parentNode()) {
157 if (!n->rendererIsEditable()) 157 if (!n->rendererIsEditable())
158 return lastBlock; 158 return lastBlock;
159 if (isTableCell(n) || n->hasTagName(bodyTag) || !n->parentNode() || !n-> parentNode()->rendererIsEditable() || isElementForFormatBlock(n)) 159 if (isTableCell(n) || isHTMLBodyElement(*n) || !n->parentNode() || !n->p arentNode()->rendererIsEditable() || isElementForFormatBlock(n))
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/Editor.cpp ('k') | Source/core/editing/FrameSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698