Changeset 117361 in webkit

Timestamp:

May 16, 2012 4:30:16 PM (12 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION(r92823): WebKit strips font-weight: normal from b element when copying
​https://bugs.webkit.org/show_bug.cgi?id=86663

Reviewed by Tony Chang.

The bug was caused by removeStyleFromRulesAndContext incorrectly stripping font-weight property
even when the context had no font-weight property because of a property name mismatch in getPropertiesNotIn.

Fixed the mismatch.

Test: editing/pasteboard/paste-text-with-style-5.html

• editing/EditingStyle.cpp:

(WebCore::getPropertiesNotIn):

Location:

trunk

Files:

• LayoutTests/editing/pasteboard/paste-text-with-style-5-expected.txt (added)
• LayoutTests/editing/pasteboard/paste-text-with-style-5.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/EditingStyle.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-16  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION(r92823): WebKit strips font-weight: normal from b element when copying
+        https://bugs.webkit.org/show_bug.cgi?id=86663
+
+        Reviewed by Tony Chang.
+
+        The bug was caused by removeStyleFromRulesAndContext incorrectly stripping font-weight property
+        even when the context had no font-weight property because of a property name mismatch in getPropertiesNotIn.
+
+        Fixed the mismatch.
+
+        Test: editing/pasteboard/paste-text-with-style-5.html
+
+        * editing/EditingStyle.cpp:
+        (WebCore::getPropertiesNotIn):
+
 2012-05-16  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/editing/EditingStyle.cpp

@@ -1494 +1494 @@
     diffTextDecorations(result.get(), CSSPropertyWebkitTextDecorationsInEffect, baseTextDecorationsInEffect.get());
 
-    if (baseStyle->getPropertyCSSValueInternal(CSSPropertyFontSize) && fontWeightIsBold(result.get()) == fontWeightIsBold(baseStyle))
+    if (baseStyle->getPropertyCSSValueInternal(CSSPropertyFontWeight) && fontWeightIsBold(result.get()) == fontWeightIsBold(baseStyle))
         result->removeProperty(CSSPropertyFontWeight);