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

Unified Diff: Source/core/editing/MergeIdenticalElementsCommand.cpp

Issue 1294543005: Move execCommand related files in core/editing/ related files into core/editing/commands/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-18T14:20:58 Rebase for merging code style fixes Created 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/editing/MergeIdenticalElementsCommand.cpp
diff --git a/Source/core/editing/MergeIdenticalElementsCommand.cpp b/Source/core/editing/MergeIdenticalElementsCommand.cpp
deleted file mode 100644
index 32a9918dac60a70aa9ac2642c7c417576d86bbea..0000000000000000000000000000000000000000
--- a/Source/core/editing/MergeIdenticalElementsCommand.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2005, 2008 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "core/editing/MergeIdenticalElementsCommand.h"
-
-#include "bindings/core/v8/ExceptionState.h"
-#include "bindings/core/v8/ExceptionStatePlaceholder.h"
-#include "core/dom/Element.h"
-
-namespace blink {
-
-MergeIdenticalElementsCommand::MergeIdenticalElementsCommand(PassRefPtrWillBeRawPtr<Element> first, PassRefPtrWillBeRawPtr<Element> second)
- : SimpleEditCommand(first->document())
- , m_element1(first)
- , m_element2(second)
-{
- ASSERT(m_element1);
- ASSERT(m_element2);
- ASSERT(m_element1->nextSibling() == m_element2);
-}
-
-void MergeIdenticalElementsCommand::doApply()
-{
- if (m_element1->nextSibling() != m_element2 || !m_element1->hasEditableStyle() || !m_element2->hasEditableStyle())
- return;
-
- m_atChild = m_element2->firstChild();
-
- NodeVector children;
- getChildNodes(*m_element1, children);
-
- for (auto& child : children)
- m_element2->insertBefore(child.release(), m_atChild.get(), IGNORE_EXCEPTION);
-
- m_element1->remove(IGNORE_EXCEPTION);
-}
-
-void MergeIdenticalElementsCommand::doUnapply()
-{
- ASSERT(m_element1);
- ASSERT(m_element2);
-
- RefPtrWillBeRawPtr<Node> atChild = m_atChild.release();
-
- ContainerNode* parent = m_element2->parentNode();
- if (!parent || !parent->hasEditableStyle())
- return;
-
- TrackExceptionState exceptionState;
-
- parent->insertBefore(m_element1.get(), m_element2.get(), exceptionState);
- if (exceptionState.hadException())
- return;
-
- WillBeHeapVector<RefPtrWillBeMember<Node>> children;
- for (Node* child = m_element2->firstChild(); child && child != atChild; child = child->nextSibling())
- children.append(child);
-
- for (auto& child : children)
- m_element1->appendChild(child.release(), exceptionState);
-}
-
-DEFINE_TRACE(MergeIdenticalElementsCommand)
-{
- visitor->trace(m_element1);
- visitor->trace(m_element2);
- visitor->trace(m_atChild);
- SimpleEditCommand::trace(visitor);
-}
-
-} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698