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

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

Issue 1320573003: Rename isBlock() to isEnclosingBlock() in EditingUtilities (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-26T21:48:03 Rebase Created 5 years, 3 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) 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 } 159 }
160 160
161 Node* enclosingBlockToSplitTreeTo(Node* startNode) 161 Node* enclosingBlockToSplitTreeTo(Node* startNode)
162 { 162 {
163 Node* lastBlock = startNode; 163 Node* lastBlock = startNode;
164 for (Node* n = startNode; n; n = n->parentNode()) { 164 for (Node* n = startNode; n; n = n->parentNode()) {
165 if (!n->hasEditableStyle()) 165 if (!n->hasEditableStyle())
166 return lastBlock; 166 return lastBlock;
167 if (isTableCell(n) || isHTMLBodyElement(*n) || !n->parentNode() || !n->p arentNode()->hasEditableStyle() || isElementForFormatBlock(n)) 167 if (isTableCell(n) || isHTMLBodyElement(*n) || !n->parentNode() || !n->p arentNode()->hasEditableStyle() || isElementForFormatBlock(n))
168 return n; 168 return n;
169 if (isBlock(n)) 169 if (isEnclosingBlock(n))
170 lastBlock = n; 170 lastBlock = n;
171 if (isHTMLListElement(n)) 171 if (isHTMLListElement(n))
172 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n; 172 return n->parentNode()->hasEditableStyle() ? n->parentNode() : n;
173 } 173 }
174 return lastBlock; 174 return lastBlock;
175 } 175 }
176 176
177 } 177 }
OLDNEW
« no previous file with comments | « Source/core/editing/commands/DeleteSelectionCommand.cpp ('k') | Source/core/editing/commands/InsertListCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698