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

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

Issue 22417002: Rename ASSERT_NO_EXCEPTION_STATE and IGNORE_EXCEPTION_STATE (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/VisibleUnits.cpp ('k') | Source/core/editing/htmlediting.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 29 matching lines...) Expand all
40 } 40 }
41 41
42 void WrapContentsInDummySpanCommand::executeApply() 42 void WrapContentsInDummySpanCommand::executeApply()
43 { 43 {
44 Vector<RefPtr<Node> > children; 44 Vector<RefPtr<Node> > children;
45 for (Node* child = m_element->firstChild(); child; child = child->nextSiblin g()) 45 for (Node* child = m_element->firstChild(); child; child = child->nextSiblin g())
46 children.append(child); 46 children.append(child);
47 47
48 size_t size = children.size(); 48 size_t size = children.size();
49 for (size_t i = 0; i < size; ++i) 49 for (size_t i = 0; i < size; ++i)
50 m_dummySpan->appendChild(children[i].release(), IGNORE_EXCEPTION_STATE); 50 m_dummySpan->appendChild(children[i].release(), IGNORE_EXCEPTION);
51 51
52 m_element->appendChild(m_dummySpan.get(), IGNORE_EXCEPTION_STATE); 52 m_element->appendChild(m_dummySpan.get(), IGNORE_EXCEPTION);
53 } 53 }
54 54
55 void WrapContentsInDummySpanCommand::doApply() 55 void WrapContentsInDummySpanCommand::doApply()
56 { 56 {
57 m_dummySpan = createStyleSpanElement(document()); 57 m_dummySpan = createStyleSpanElement(document());
58 58
59 executeApply(); 59 executeApply();
60 } 60 }
61 61
62 void WrapContentsInDummySpanCommand::doUnapply() 62 void WrapContentsInDummySpanCommand::doUnapply()
63 { 63 {
64 ASSERT(m_element); 64 ASSERT(m_element);
65 65
66 if (!m_dummySpan || !m_element->rendererIsEditable()) 66 if (!m_dummySpan || !m_element->rendererIsEditable())
67 return; 67 return;
68 68
69 Vector<RefPtr<Node> > children; 69 Vector<RefPtr<Node> > children;
70 for (Node* child = m_dummySpan->firstChild(); child; child = child->nextSibl ing()) 70 for (Node* child = m_dummySpan->firstChild(); child; child = child->nextSibl ing())
71 children.append(child); 71 children.append(child);
72 72
73 size_t size = children.size(); 73 size_t size = children.size();
74 for (size_t i = 0; i < size; ++i) 74 for (size_t i = 0; i < size; ++i)
75 m_element->appendChild(children[i].release(), IGNORE_EXCEPTION_STATE); 75 m_element->appendChild(children[i].release(), IGNORE_EXCEPTION);
76 76
77 m_dummySpan->remove(IGNORE_EXCEPTION_STATE); 77 m_dummySpan->remove(IGNORE_EXCEPTION);
78 } 78 }
79 79
80 void WrapContentsInDummySpanCommand::doReapply() 80 void WrapContentsInDummySpanCommand::doReapply()
81 { 81 {
82 ASSERT(m_element); 82 ASSERT(m_element);
83 83
84 if (!m_dummySpan || !m_element->rendererIsEditable()) 84 if (!m_dummySpan || !m_element->rendererIsEditable())
85 return; 85 return;
86 86
87 executeApply(); 87 executeApply();
88 } 88 }
89 89
90 #ifndef NDEBUG 90 #ifndef NDEBUG
91 void WrapContentsInDummySpanCommand::getNodesInCommand(HashSet<Node*>& nodes) 91 void WrapContentsInDummySpanCommand::getNodesInCommand(HashSet<Node*>& nodes)
92 { 92 {
93 addNodeAndDescendants(m_element.get(), nodes); 93 addNodeAndDescendants(m_element.get(), nodes);
94 addNodeAndDescendants(m_dummySpan.get(), nodes); 94 addNodeAndDescendants(m_dummySpan.get(), nodes);
95 } 95 }
96 #endif 96 #endif
97 97
98 } // namespace WebCore 98 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/VisibleUnits.cpp ('k') | Source/core/editing/htmlediting.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698