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

Unified Diff: Source/core/editing/SimplifyMarkupCommand.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/SimplifyMarkupCommand.cpp
diff --git a/Source/core/editing/SimplifyMarkupCommand.cpp b/Source/core/editing/SimplifyMarkupCommand.cpp
deleted file mode 100644
index 11951294b6f42da7bc1990675e6c0e94c3a88239..0000000000000000000000000000000000000000
--- a/Source/core/editing/SimplifyMarkupCommand.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Computer, 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/SimplifyMarkupCommand.h"
-
-#include "core/dom/NodeComputedStyle.h"
-#include "core/dom/NodeTraversal.h"
-#include "core/layout/LayoutInline.h"
-#include "core/layout/LayoutObject.h"
-#include "core/style/ComputedStyle.h"
-
-namespace blink {
-
-SimplifyMarkupCommand::SimplifyMarkupCommand(Document& document, Node* firstNode, Node* nodeAfterLast)
- : CompositeEditCommand(document), m_firstNode(firstNode), m_nodeAfterLast(nodeAfterLast)
-{
-}
-
-void SimplifyMarkupCommand::doApply()
-{
- ContainerNode* rootNode = m_firstNode->parentNode();
- WillBeHeapVector<RefPtrWillBeMember<ContainerNode>> nodesToRemove;
-
- // Walk through the inserted nodes, to see if there are elements that could be removed
- // without affecting the style. The goal is to produce leaner markup even when starting
- // from a verbose fragment.
- // We look at inline elements as well as non top level divs that don't have attributes.
- for (Node* node = m_firstNode.get(); node && node != m_nodeAfterLast; node = NodeTraversal::next(*node)) {
- if (node->hasChildren() || (node->isTextNode() && node->nextSibling()))
- continue;
-
- ContainerNode* startingNode = node->parentNode();
- if (!startingNode)
- continue;
- const ComputedStyle* startingStyle = startingNode->computedStyle();
- if (!startingStyle)
- continue;
- ContainerNode* currentNode = startingNode;
- ContainerNode* topNodeWithStartingStyle = nullptr;
- while (currentNode != rootNode) {
- if (currentNode->parentNode() != rootNode && isRemovableBlock(currentNode))
- nodesToRemove.append(currentNode);
-
- currentNode = currentNode->parentNode();
- if (!currentNode)
- break;
-
- if (!currentNode->layoutObject() || !currentNode->layoutObject()->isLayoutInline() || toLayoutInline(currentNode->layoutObject())->alwaysCreateLineBoxes())
- continue;
-
- if (currentNode->firstChild() != currentNode->lastChild()) {
- topNodeWithStartingStyle = 0;
- break;
- }
-
- if (!currentNode->computedStyle()->visualInvalidationDiff(*startingStyle).hasDifference())
- topNodeWithStartingStyle = currentNode;
-
- }
- if (topNodeWithStartingStyle) {
- for (ContainerNode* node = startingNode; node != topNodeWithStartingStyle; node = node->parentNode())
- nodesToRemove.append(node);
- }
- }
-
- // we perform all the DOM mutations at once.
- for (size_t i = 0; i < nodesToRemove.size(); ++i) {
- // FIXME: We can do better by directly moving children from nodesToRemove[i].
- int numPrunedAncestors = pruneSubsequentAncestorsToRemove(nodesToRemove, i);
- if (numPrunedAncestors < 0)
- continue;
- removeNodePreservingChildren(nodesToRemove[i], AssumeContentIsAlwaysEditable);
- i += numPrunedAncestors;
- }
-}
-
-int SimplifyMarkupCommand::pruneSubsequentAncestorsToRemove(WillBeHeapVector<RefPtrWillBeMember<ContainerNode>>& nodesToRemove, size_t startNodeIndex)
-{
- size_t pastLastNodeToRemove = startNodeIndex + 1;
- for (; pastLastNodeToRemove < nodesToRemove.size(); ++pastLastNodeToRemove) {
- if (nodesToRemove[pastLastNodeToRemove - 1]->parentNode() != nodesToRemove[pastLastNodeToRemove])
- break;
- ASSERT(nodesToRemove[pastLastNodeToRemove]->firstChild() == nodesToRemove[pastLastNodeToRemove]->lastChild());
- }
-
- ContainerNode* highestAncestorToRemove = nodesToRemove[pastLastNodeToRemove - 1].get();
- RefPtrWillBeRawPtr<ContainerNode> parent = highestAncestorToRemove->parentNode();
- if (!parent) // Parent has already been removed.
- return -1;
-
- if (pastLastNodeToRemove == startNodeIndex + 1)
- return 0;
-
- removeNode(nodesToRemove[startNodeIndex], AssumeContentIsAlwaysEditable);
- insertNodeBefore(nodesToRemove[startNodeIndex], highestAncestorToRemove, AssumeContentIsAlwaysEditable);
- removeNode(highestAncestorToRemove, AssumeContentIsAlwaysEditable);
-
- return pastLastNodeToRemove - startNodeIndex - 1;
-}
-
-DEFINE_TRACE(SimplifyMarkupCommand)
-{
- visitor->trace(m_firstNode);
- visitor->trace(m_nodeAfterLast);
- CompositeEditCommand::trace(visitor);
-}
-
-} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698