| Index: Source/core/editing/MergeIdenticalElementsCommand.cpp
|
| diff --git a/Source/core/editing/MergeIdenticalElementsCommand.cpp b/Source/core/editing/MergeIdenticalElementsCommand.cpp
|
| index 2ae2dbba89a5f4878ed37b381ddcb0b1b82f3e92..e512319ee524712abe1c4714ee218b1a5f017431 100644
|
| --- a/Source/core/editing/MergeIdenticalElementsCommand.cpp
|
| +++ b/Source/core/editing/MergeIdenticalElementsCommand.cpp
|
| @@ -71,10 +71,10 @@ void MergeIdenticalElementsCommand::doUnapply()
|
| if (!parent || !parent->rendererIsEditable())
|
| return;
|
|
|
| - TrackExceptionState es;
|
| + TrackExceptionState exceptionState;
|
|
|
| - parent->insertBefore(m_element1.get(), m_element2.get(), es);
|
| - if (es.hadException())
|
| + parent->insertBefore(m_element1.get(), m_element2.get(), exceptionState);
|
| + if (exceptionState.hadException())
|
| return;
|
|
|
| Vector<RefPtr<Node> > children;
|
| @@ -83,7 +83,7 @@ void MergeIdenticalElementsCommand::doUnapply()
|
|
|
| size_t size = children.size();
|
| for (size_t i = 0; i < size; ++i)
|
| - m_element1->appendChild(children[i].release(), es);
|
| + m_element1->appendChild(children[i].release(), exceptionState);
|
| }
|
|
|
| } // namespace WebCore
|
|
|