| Index: third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp b/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp
|
| index fbe0e469e29c4b129c88cfe4e0879bbfe58d7dad..af1f918bab885435f2e7a00d4a28128e725c3a53 100644
|
| --- a/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/commands/MergeIdenticalElementsCommand.cpp
|
| @@ -31,7 +31,7 @@
|
|
|
| namespace blink {
|
|
|
| -MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(PassRefPtrWillBeRawPtr<Element> first, PassRefPtrWillBeRawPtr<Element> second)
|
| +MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(RawPtr<Element> first, RawPtr<Element> second)
|
| : SimpleEditCommand(first->document())
|
| , m_element1(first)
|
| , m_element2(second)
|
| @@ -62,7 +62,7 @@ void MergeIdenticalElementsCommand::doUnapply()
|
| ASSERT(m_element1);
|
| ASSERT(m_element2);
|
|
|
| - RefPtrWillBeRawPtr<Node> atChild = m_atChild.release();
|
| + RawPtr<Node> atChild = m_atChild.release();
|
|
|
| ContainerNode* parent = m_element2->parentNode();
|
| if (!parent || !parent->hasEditableStyle())
|
| @@ -74,7 +74,7 @@ void MergeIdenticalElementsCommand::doUnapply()
|
| if (exceptionState.hadException())
|
| return;
|
|
|
| - WillBeHeapVector<RefPtrWillBeMember<Node>> children;
|
| + HeapVector<Member<Node>> children;
|
| for (Node* child = m_element2->firstChild(); child && child != atChild; child = child->nextSibling())
|
| children.append(child);
|
|
|
|
|