Changeset 125955 in webkit

Timestamp:

Aug 17, 2012 5:31:00 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Preserve styling elements in DeleteSelectionCommand
<rdar://problem/12040676>
​https://bugs.webkit.org/show_bug.cgi?id=93643

Patch by Alice Cheng <​alice_cheng@apple.com> on 2012-08-17
Reviewed by Ryosuke Niwa.

Source/WebCore:

Styling elements (<link> and <style>) can appear inside editable content. To
prevent accidental deletion, we move styling elements to rootEditableElement in
DeleteSelectionCommand undoably.

Test: editing/execCommand/delete-selection-has-style.html

• editing/DeleteSelectionCommand.cpp:

(WebCore::DeleteSelectionCommand::makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss): Added to preserve styling elements during the command
(WebCore::DeleteSelectionCommand::handleGeneralDelete): Modified to preserve styling elements during the command

• editing/DeleteSelectionCommand.h:

(DeleteSelectionCommand):

LayoutTests:

Test if delete selection command does move styling elements to
rootEditableElement, when the selection contains some. Also test command's
undoness.

• editing/execCommand/delete-selection-has-style-expected.txt: Added.
• editing/execCommand/delete-selection-has-style.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/delete-selection-has-style-expected.txt (added)
• LayoutTests/editing/execCommand/delete-selection-has-style.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 @@
+2012-08-17  Alice Cheng  <alice_cheng@apple.com>
+
+        Preserve styling elements in DeleteSelectionCommand
+        <rdar://problem/12040676>
+        https://bugs.webkit.org/show_bug.cgi?id=93643
+
+        Reviewed by Ryosuke Niwa.
+
+        Test if delete selection command does move styling elements to
+        rootEditableElement, when the selection contains some. Also test command's
+        undoness.
+
+        * editing/execCommand/delete-selection-has-style-expected.txt: Added.
+        * editing/execCommand/delete-selection-has-style.html: Added.
+
 2012-08-17  Sukolsak Sakshuwong  <sukolsak@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-17  Alice Cheng  <alice_cheng@apple.com>
+
+        Preserve styling elements in DeleteSelectionCommand
+        <rdar://problem/12040676>
+        https://bugs.webkit.org/show_bug.cgi?id=93643
+
+        Reviewed by Ryosuke Niwa.
+
+        Styling elements (<link> and <style>) can appear inside editable content. To 
+        prevent accidental deletion, we move styling elements to rootEditableElement in
+        DeleteSelectionCommand undoably.
+
+        Test: editing/execCommand/delete-selection-has-style.html
+
+        * editing/DeleteSelectionCommand.cpp:
+        (WebCore::DeleteSelectionCommand::makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss): Added to preserve styling elements during the command
+        (WebCore::DeleteSelectionCommand::handleGeneralDelete):  Modified to preserve styling elements during the command
+        * editing/DeleteSelectionCommand.h:
+        (DeleteSelectionCommand):
+
 2012-08-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp

@@ -417 +417 @@
 }
 
+void DeleteSelectionCommand::makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss()
+{
+    RefPtr<Range> range = m_selectionToDelete.toNormalizedRange();
+    RefPtr<Node> node = range->firstNode();
+    while (node && node != range->pastLastNode()) {
+        RefPtr<Node> nextNode = node->traverseNextNode();
+        if ((node->hasTagName(styleTag) && !(toElement(node.get())->hasAttribute(scopedAttr))) || node->hasTagName(linkTag)) {
+            nextNode = node->traverseNextSibling();
+            RefPtr<ContainerNode> rootEditableElement = node->rootEditableElement();
+            removeNode(node);
+            appendNode(node, rootEditableElement);
+        }
+        node = nextNode;
+    }
+}
+
 void DeleteSelectionCommand::handleGeneralDelete()
 {
@@ -424 +440 @@
     int startOffset = m_upstreamStart.deprecatedEditingOffset();
     Node* startNode = m_upstreamStart.deprecatedNode();
+    
+    makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss();
 
     // Never remove the start block unless it's a table, in which case we won't merge content in.

trunk/Source/WebCore/editing/DeleteSelectionCommand.h

@@ -66 +66 @@
     void calculateTypingStyleAfterDelete();
     void clearTransientState();
+    void makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss();
     virtual void removeNode(PassRefPtr<Node>);
     virtual void deleteTextFromNode(PassRefPtr<Text>, unsigned, unsigned);