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

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

Issue 8437036: Merge 98796 - Potential crash in ReplaceNodeWithSpanCommand (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/
Patch Set: Created 9 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 | « 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 : SimpleEditCommand(element->document()) 45 : SimpleEditCommand(element->document())
46 , m_elementToReplace(element) 46 , m_elementToReplace(element)
47 { 47 {
48 ASSERT(m_elementToReplace); 48 ASSERT(m_elementToReplace);
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 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 RefPtr<Node> nextChild;
60 for (Node* child = nodeToReplace->firstChild(); child; child = nextChild.get ()) { 60 for (Node* child = nodeToReplace->firstChild(); child; child = nextChild.get ()) {
61 nextChild = child->nextSibling(); 61 nextChild = child->nextSibling();
62 newNode->appendChild(child, ec); 62 newNode->appendChild(child, ec);
63 ASSERT(!ec); 63 ASSERT(!ec);
64 } 64 }
65 65
(...skipping 13 matching lines...) Expand all
79 } 79 }
80 80
81 void ReplaceNodeWithSpanCommand::doUnapply() 81 void ReplaceNodeWithSpanCommand::doUnapply()
82 { 82 {
83 if (!m_spanElement->inDocument()) 83 if (!m_spanElement->inDocument())
84 return; 84 return;
85 swapInNodePreservingAttributesAndChildren(m_elementToReplace.get(), m_spanEl ement.get()); 85 swapInNodePreservingAttributesAndChildren(m_elementToReplace.get(), m_spanEl ement.get());
86 } 86 }
87 87
88 } // namespace WebCore 88 } // 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