Changeset 101575 in webkit

Timestamp:

Nov 30, 2011 5:16:13 PM (12 years ago)

Author:

enrica@apple.com

Message:

Source/WebCore: Copy/paste of the same content produces increasingly nested markup
​https://bugs.webkit.org/show_bug.cgi?id=73497
<rdar://problem/10208605>

When pasting a fragment over a selection, we perfom a DeleteSelection command
followed by a ReplaceSelection command. Delete selection preserves the style
of the selection start, leaving all the blocks containing the insertion point.
This patch eliminates all the nested divs that don't provide additional style,
avoiding the proliferation of nested divs.

Reviewed by Darin Adler.

Tests: editing/deleting/delete-and-cleanup.html

editing/pasteboard/paste-without-nesting.html

• editing/DeleteSelectionCommand.cpp:

(WebCore::DeleteSelectionCommand::removeRedundantBlocks):
(WebCore::DeleteSelectionCommand::doApply):

• editing/DeleteSelectionCommand.h:

LayoutTests: Copy/paste of the same content produces increasingly nested markup
​https://bugs.webkit.org/show_bug.cgi?id=73497
<rdar://problem/10208605>

Reviewed by Darin Adler.

• editing/deleting/delete-and-cleanup-expected.txt: Added.
• editing/deleting/delete-and-cleanup.html: Added.
• editing/pasteboard/paste-without-nesting-expected.txt: Added.
• editing/pasteboard/paste-without-nesting.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/deleting/delete-and-cleanup-expected.txt (added)
• LayoutTests/editing/deleting/delete-and-cleanup.html (added)
• LayoutTests/editing/pasteboard/paste-without-nesting-expected.txt (added)
• LayoutTests/editing/pasteboard/paste-without-nesting.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/DeleteSelectionCommand.cpp (modified) (2 diffs)
• Source/WebCore/editing/DeleteSelectionCommand.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-30  Enrica Casucci  <enrica@apple.com>
+
+        Copy/paste of the same content produces increasingly nested markup
+        https://bugs.webkit.org/show_bug.cgi?id=73497
+        <rdar://problem/10208605>
+
+        Reviewed by Darin Adler.
+
+        * editing/deleting/delete-and-cleanup-expected.txt: Added.
+        * editing/deleting/delete-and-cleanup.html: Added.
+        * editing/pasteboard/paste-without-nesting-expected.txt: Added.
+        * editing/pasteboard/paste-without-nesting.html: Added.
+
 2011-11-30  Chris Fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-30  Enrica Casucci  <enrica@apple.com>
+
+        Copy/paste of the same content produces increasingly nested markup
+        https://bugs.webkit.org/show_bug.cgi?id=73497
+        <rdar://problem/10208605>
+        
+        When pasting a fragment over a selection, we perfom a DeleteSelection command
+        followed by a ReplaceSelection command. Delete selection preserves the style
+        of the selection start, leaving all the blocks containing the insertion point.
+        This patch eliminates all the nested divs that don't provide additional style,
+        avoiding the proliferation of nested divs. 
+
+        Reviewed by Darin Adler.
+
+        Tests: editing/deleting/delete-and-cleanup.html
+               editing/pasteboard/paste-without-nesting.html
+
+        * editing/DeleteSelectionCommand.cpp:
+        (WebCore::DeleteSelectionCommand::removeRedundantBlocks):
+        (WebCore::DeleteSelectionCommand::doApply):
+        * editing/DeleteSelectionCommand.h:
+
 2011-11-30  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

@@ -747 +747 @@
 }
 
+// This method removes div elements with no attributes that have only one child or no children at all.
+void DeleteSelectionCommand::removeRedundantBlocks()
+{
+    Node* node = m_endingPosition.deprecatedNode();
+    Node* rootNode = node->rootEditableElement();
+   
+    while (node != rootNode) {
+        Node* parentNode = node->parentNode();
+        if ((parentNode && parentNode->firstChild() != parentNode->lastChild()) || !node->hasTagName(divTag)) {
+            node = parentNode;
+            continue;
+        }
+        const NamedNodeMap* attributeMap = node->attributes();
+        if (!attributeMap || attributeMap->isEmpty()) {
+            if (node == m_endingPosition.anchorNode())
+                updatePositionForNodeRemoval(m_endingPosition, node);
+            
+            CompositeEditCommand::removeNodePreservingChildren(node);
+            node = m_endingPosition.anchorNode();
+        } else
+            node = parentNode;
+    }
+}
+
 void DeleteSelectionCommand::doApply()
 {
@@ -811 +835 @@
     RefPtr<Node> placeholder = m_needPlaceholder ? createBreakElement(document()).get() : 0;
     
-    if (placeholder)
+    if (placeholder) {
+        removeRedundantBlocks();
         insertNodeAt(placeholder.get(), m_endingPosition);
+    }
 
     rebalanceWhitespaceAt(m_endingPosition);

trunk/Source/WebCore/editing/DeleteSelectionCommand.h

@@ -68 +68 @@
     virtual void removeNode(PassRefPtr<Node>);
     virtual void deleteTextFromNode(PassRefPtr<Text>, unsigned, unsigned);
+    void removeRedundantBlocks();
 
     // This function provides access to original string after the correction has been deleted.