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

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

Issue 67473002: Have ElementTraversal / NodeTraversal's next() methods take a reference (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase on master Created 7 years, 1 month 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
« no previous file with comments | « Source/core/editing/ReplaceSelectionCommand.cpp ('k') | Source/core/editing/SpellChecker.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) 2012 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2012 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 30 matching lines...) Expand all
41 41
42 void SimplifyMarkupCommand::doApply() 42 void SimplifyMarkupCommand::doApply()
43 { 43 {
44 Node* rootNode = m_firstNode->parentNode(); 44 Node* rootNode = m_firstNode->parentNode();
45 Vector<RefPtr<Node> > nodesToRemove; 45 Vector<RefPtr<Node> > nodesToRemove;
46 46
47 // Walk through the inserted nodes, to see if there are elements that could be removed 47 // Walk through the inserted nodes, to see if there are elements that could be removed
48 // without affecting the style. The goal is to produce leaner markup even wh en starting 48 // without affecting the style. The goal is to produce leaner markup even wh en starting
49 // from a verbose fragment. 49 // from a verbose fragment.
50 // We look at inline elements as well as non top level divs that don't have attributes. 50 // We look at inline elements as well as non top level divs that don't have attributes.
51 for (Node* node = m_firstNode.get(); node && node != m_nodeAfterLast; node = NodeTraversal::next(node)) { 51 for (Node* node = m_firstNode.get(); node && node != m_nodeAfterLast; node = NodeTraversal::next(*node)) {
52 if (node->firstChild() || (node->isTextNode() && node->nextSibling())) 52 if (node->firstChild() || (node->isTextNode() && node->nextSibling()))
53 continue; 53 continue;
54 54
55 Node* startingNode = node->parentNode(); 55 Node* startingNode = node->parentNode();
56 if (!startingNode) 56 if (!startingNode)
57 continue; 57 continue;
58 RenderStyle* startingStyle = startingNode->renderStyle(); 58 RenderStyle* startingStyle = startingNode->renderStyle();
59 if (!startingStyle) 59 if (!startingStyle)
60 continue; 60 continue;
61 Node* currentNode = startingNode; 61 Node* currentNode = startingNode;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 return 0; 116 return 0;
117 117
118 removeNode(nodesToRemove[startNodeIndex], AssumeContentIsAlwaysEditable); 118 removeNode(nodesToRemove[startNodeIndex], AssumeContentIsAlwaysEditable);
119 insertNodeBefore(nodesToRemove[startNodeIndex], highestAncestorToRemove, Ass umeContentIsAlwaysEditable); 119 insertNodeBefore(nodesToRemove[startNodeIndex], highestAncestorToRemove, Ass umeContentIsAlwaysEditable);
120 removeNode(highestAncestorToRemove, AssumeContentIsAlwaysEditable); 120 removeNode(highestAncestorToRemove, AssumeContentIsAlwaysEditable);
121 121
122 return pastLastNodeToRemove - startNodeIndex - 1; 122 return pastLastNodeToRemove - startNodeIndex - 1;
123 } 123 }
124 124
125 } // namespace WebCore 125 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/ReplaceSelectionCommand.cpp ('k') | Source/core/editing/SpellChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698