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

Side by Side Diff: Source/WebCore/editing/ReplaceNodeWithSpanCommand.cpp

Issue 10421016: Merge 116717 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | no next file » | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (c) 2009 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 } 49 }
50 50
51 static void swapInNodePreservingAttributesAndChildren(HTMLElement* newNode, HTML Element* nodeToReplace) 51 static void swapInNodePreservingAttributesAndChildren(HTMLElement* newNode, HTML Element* nodeToReplace)
52 { 52 {
53 ASSERT(nodeToReplace->inDocument()); 53 ASSERT(nodeToReplace->inDocument());
54 ExceptionCode ec = 0; 54 ExceptionCode ec = 0;
55 RefPtr<ContainerNode> parentNode = nodeToReplace->parentNode(); 55 RefPtr<ContainerNode> parentNode = nodeToReplace->parentNode();
56 parentNode->insertBefore(newNode, nodeToReplace, ec); 56 parentNode->insertBefore(newNode, nodeToReplace, ec);
57 ASSERT(!ec); 57 ASSERT(!ec);
58 58
59 RefPtr<Node> nextChild; 59 NodeVector children;
60 for (Node* child = nodeToReplace->firstChild(); child; child = nextChild.get ()) { 60 getChildNodes(nodeToReplace, children);
61 nextChild = child->nextSibling(); 61 for (size_t i = 0; i < children.size(); ++i) {
62 newNode->appendChild(child, ec); 62 newNode->appendChild(children[i], ec);
63 ASSERT(!ec); 63 ASSERT(!ec);
64 } 64 }
65 65
66 // FIXME: Fix this to send the proper MutationRecords when MutationObservers are present. 66 // FIXME: Fix this to send the proper MutationRecords when MutationObservers are present.
67 newNode->setAttributesFromElement(*nodeToReplace); 67 newNode->setAttributesFromElement(*nodeToReplace);
68 68
69 parentNode->removeChild(nodeToReplace, ec); 69 parentNode->removeChild(nodeToReplace, ec);
70 ASSERT(!ec); 70 ASSERT(!ec);
71 } 71 }
72 72
(...skipping 15 matching lines...) Expand all
88 88
89 #ifndef NDEBUG 89 #ifndef NDEBUG
90 void ReplaceNodeWithSpanCommand::getNodesInCommand(HashSet<Node*>& nodes) 90 void ReplaceNodeWithSpanCommand::getNodesInCommand(HashSet<Node*>& nodes)
91 { 91 {
92 addNodeAndDescendants(m_elementToReplace.get(), nodes); 92 addNodeAndDescendants(m_elementToReplace.get(), nodes);
93 addNodeAndDescendants(m_spanElement.get(), nodes); 93 addNodeAndDescendants(m_spanElement.get(), nodes);
94 } 94 }
95 #endif 95 #endif
96 96
97 } // namespace WebCore 97 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698