Changeset 53680 in webkit

Timestamp:

Jan 21, 2010 10:53:14 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-21 Tony Chang <​tony@chromium.org>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=25501
Remove empty font tags when applying a style to a content editable
region.

• editing/execCommand/change-font.html: Added.
• editing/execCommand/change-font-expected.txt: Added.

2010-01-21 Tony Chang <​tony@chromium.org>

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=25501
Remove empty font tags when applying a style to a content editable
region.

Test: editing/execCommand/change-font.html

• editing/ApplyStyleCommand.cpp: (WebCore::isEmptyFontTag):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/change-font-expected.txt (added)
• LayoutTests/editing/execCommand/change-font.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/editing/ApplyStyleCommand.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-01-21  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25501
+        Remove empty font tags when applying a style to a content editable
+        region.
+
+        * editing/execCommand/change-font.html: Added.
+        * editing/execCommand/change-font-expected.txt: Added.
+
 2010-01-21  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-21  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=25501
+        Remove empty font tags when applying a style to a content editable
+        region.
+
+        Test: editing/execCommand/change-font.html
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::isEmptyFontTag):
+
 2010-01-21  Joe Mason  <jmason@rim.com>
 

trunk/WebCore/editing/ApplyStyleCommand.cpp

@@ -303 +303 @@
     const Element *elem = static_cast<const Element *>(node);
     NamedNodeMap *map = elem->attributes(true); // true for read-only
-    return (!map || map->length() == 1) && elem->getAttribute(classAttr) == styleSpanClassString();
+    if (!map)
+        return true;
+    return map->isEmpty() || (map->length() == 1 && elem->getAttribute(classAttr) == styleSpanClassString());
 }