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

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

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/FrameSelection.cpp ('k') | Source/core/editing/SplitElementCommand.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) 2005, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2005, 2008 Apple 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 { 64 {
65 ASSERT(m_element1); 65 ASSERT(m_element1);
66 ASSERT(m_element2); 66 ASSERT(m_element2);
67 67
68 RefPtr<Node> atChild = m_atChild.release(); 68 RefPtr<Node> atChild = m_atChild.release();
69 69
70 ContainerNode* parent = m_element2->parentNode(); 70 ContainerNode* parent = m_element2->parentNode();
71 if (!parent || !parent->rendererIsEditable()) 71 if (!parent || !parent->rendererIsEditable())
72 return; 72 return;
73 73
74 TrackExceptionState es; 74 TrackExceptionState exceptionState;
75 75
76 parent->insertBefore(m_element1.get(), m_element2.get(), es); 76 parent->insertBefore(m_element1.get(), m_element2.get(), exceptionState);
77 if (es.hadException()) 77 if (exceptionState.hadException())
78 return; 78 return;
79 79
80 Vector<RefPtr<Node> > children; 80 Vector<RefPtr<Node> > children;
81 for (Node* child = m_element2->firstChild(); child && child != atChild; chil d = child->nextSibling()) 81 for (Node* child = m_element2->firstChild(); child && child != atChild; chil d = child->nextSibling())
82 children.append(child); 82 children.append(child);
83 83
84 size_t size = children.size(); 84 size_t size = children.size();
85 for (size_t i = 0; i < size; ++i) 85 for (size_t i = 0; i < size; ++i)
86 m_element1->appendChild(children[i].release(), es); 86 m_element1->appendChild(children[i].release(), exceptionState);
87 } 87 }
88 88
89 } // namespace WebCore 89 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/FrameSelection.cpp ('k') | Source/core/editing/SplitElementCommand.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698