Changeset 46373 in webkit

Timestamp:

Jul 24, 2009 2:12:07 PM (15 years ago)

Author:

rniwa@webkit.org

Message:

WebCore:

2009-07-24 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Justin Garcia.

execCommand('underline') can modify DOM outside of the contentEditable area
​https://bugs.webkit.org/show_bug.cgi?id=24333

highestAncestorWithTextDecoration stops at the closest unsplittable element so that if text-decoration is applied
outside of it, we don't accidently modify the style attribute.

Tests: editing/style/textdecoration-outside-of-rooteditable.html

editing/style/textdecoration-outside-of-unsplittable-element.html

• editing/ApplyStyleCommand.cpp: (WebCore::StyleChange::init): (WebCore::highestAncestorWithTextDecoration):

LayoutTests:

2009-07-24 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Justin Garcia.

execCommand('underline') can modify DOM outside of the contentEditable area
​https://bugs.webkit.org/show_bug.cgi?id=24333

Tests to make sure we are not removing underline applied outside of root editable node or unsplittable element.

• editing/style/textdecoration-outside-of-rooteditable-expected.txt: Added.
• editing/style/textdecoration-outside-of-rooteditable.html: Added.
• editing/style/textdecoration-outside-of-unsplittable-element-expected.txt: Added.
• editing/style/textdecoration-outside-of-unsplittable-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/style/textdecoration-outside-of-rooteditable-expected.txt (added)
• LayoutTests/editing/style/textdecoration-outside-of-rooteditable.html (added)
• LayoutTests/editing/style/textdecoration-outside-of-unsplittable-element-expected.txt (added)
• LayoutTests/editing/style/textdecoration-outside-of-unsplittable-element.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/ApplyStyleCommand.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-07-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Justin Garcia.
+
+        execCommand('underline') can modify DOM outside of the contentEditable area
+        https://bugs.webkit.org/show_bug.cgi?id=24333
+
+        Tests to make sure we are not removing underline applied outside of root editable node or unsplittable element.
+
+        * editing/style/textdecoration-outside-of-rooteditable-expected.txt: Added.
+        * editing/style/textdecoration-outside-of-rooteditable.html: Added.
+        * editing/style/textdecoration-outside-of-unsplittable-element-expected.txt: Added.
+        * editing/style/textdecoration-outside-of-unsplittable-element.html: Added.
+
 2009-07-24  Daniel Bates  <dbates@intudata.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-07-24  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Justin Garcia.
+
+        execCommand('underline') can modify DOM outside of the contentEditable area
+        https://bugs.webkit.org/show_bug.cgi?id=24333
+
+        highestAncestorWithTextDecoration stops at the closest unsplittable element so that if text-decoration is applied
+        outside of it, we don't accidently modify the style attribute.
+
+        Tests: editing/style/textdecoration-outside-of-rooteditable.html
+               editing/style/textdecoration-outside-of-unsplittable-element.html
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::StyleChange::init):
+        (WebCore::highestAncestorWithTextDecoration):
+
 2009-07-24  Daniel Bates  <dbates@intudata.com>
 

trunk/WebCore/editing/ApplyStyleCommand.cpp

@@ -134 +134 @@
             CSSProperty alteredProperty(CSSPropertyTextDecoration, property->value(), property->isImportant());
             // We don't add "text-decoration: none" because it doesn't override the existing text decorations; i.e. redundant
-            if (alteredProperty.cssText() != "none")
+            if (!equalIgnoringCase(alteredProperty.value()->cssText(), "none"))
                 styleText += alteredProperty.cssText();
         } else
@@ -1094 +1094 @@
 static Node* highestAncestorWithTextDecoration(Node *node)
 {
-    Node *result = NULL;
+    ASSERT(node);
+    Node* result = 0;
+    Node* unsplittableElement = unsplittableElementForPosition(Position(node, 0));
 
     for (Node *n = node; n; n = n->parentNode()) {
         if (hasTextDecorationProperty(n))
             result = n;
+        // Should stop at the editable root (cannot cross editing boundary) and
+        // also stop at the unsplittable element to be consistent with other UAs
+        if (n == unsplittableElement)
+            break;
     }