Changeset 87952 in webkit

Timestamp:

Jun 2, 2011 2:35:16 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-06-02 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Enrica Casucci.

ApplyStyleCommand shouldn't call collapseTextDecorationProperties
​https://bugs.webkit.org/show_bug.cgi?id=61887

Removed the call to collapseTextDecorationProperties in ApplyStyleCommand::applyInlineStyle.

No new tests because this is a code refactoring.

• editing/ApplyStyleCommand.cpp: (WebCore::ApplyStyleCommand::applyInlineStyle): No loner calls collapseTextDecorationProperties. (WebCore::ApplyStyleCommand::pushDownInlineStyleAroundNode): Updated comment.
• editing/EditingStyle.cpp: (WebCore::HTMLElementEquivalent::propertyExistsInStyle): Added to check both text-decoration and -webkit-text-decorations-in-effect. (WebCore::HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent): Added a comment. (WebCore::HTMLTextDecorationEquivalent::propertyExistsInStyle): Checks both text-decoration and -webkit-text-decorations-in-effect. (WebCore::HTMLTextDecorationEquivalent::valueIsPresentInStyle): Checks if a text decoration is present in -webkit-text-decorations-in-effect or text-decoration preferring the former. (WebCore::EditingStyle::conflictsWithInlineStyleOfElement): Merged loops for when conflictingProperties is false and true. Added a support for -webkit-text-decorations-in-effect.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/ApplyStyleCommand.cpp (modified) (2 diffs)
• editing/EditingStyle.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-02  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Enrica Casucci.
+
+        ApplyStyleCommand shouldn't call collapseTextDecorationProperties
+        https://bugs.webkit.org/show_bug.cgi?id=61887
+
+        Removed the call to collapseTextDecorationProperties in ApplyStyleCommand::applyInlineStyle.
+
+        No new tests because this is a code refactoring.
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::applyInlineStyle): No loner calls collapseTextDecorationProperties.
+        (WebCore::ApplyStyleCommand::pushDownInlineStyleAroundNode): Updated comment.
+        * editing/EditingStyle.cpp:
+        (WebCore::HTMLElementEquivalent::propertyExistsInStyle): Added to check both text-decoration
+        and -webkit-text-decorations-in-effect.
+        (WebCore::HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent): Added a comment.
+        (WebCore::HTMLTextDecorationEquivalent::propertyExistsInStyle): Checks both text-decoration
+        and -webkit-text-decorations-in-effect.
+        (WebCore::HTMLTextDecorationEquivalent::valueIsPresentInStyle): Checks if a text decoration
+        is present in -webkit-text-decorations-in-effect or text-decoration preferring the former.
+        (WebCore::EditingStyle::conflictsWithInlineStyleOfElement): Merged loops for when conflictingProperties
+        is false and true. Added a support for -webkit-text-decorations-in-effect.
+
 2011-06-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/editing/ApplyStyleCommand.cpp

@@ -532 +532 @@
     Node* endDummySpanAncestor = 0;
 
-    style->collapseTextDecorationProperties();
-
     // update document layout once before removing styles
     // so that we avoid the expense of updating before each and every call
@@ -1007 +1005 @@
             }
 
-            // Apply text decoration to all nodes containing targetNode and their siblings but NOT to targetNode
+            // Apply style to all nodes containing targetNode and their siblings but NOT to targetNode
             // But if we've removed styledElement then go ahead and always apply the style.
             if (child != targetNode || styledElement)

trunk/Source/WebCore/editing/EditingStyle.cpp

@@ -99 +99 @@
     virtual bool matches(Element* element) const { return !m_tagName || element->hasTagName(*m_tagName); }
     virtual bool hasAttribute() const { return false; }
-    bool propertyExistsInStyle(CSSStyleDeclaration* style) const { return style->getPropertyCSSValue(m_propertyID); }
+    virtual bool propertyExistsInStyle(CSSStyleDeclaration* style) const { return style->getPropertyCSSValue(m_propertyID); }
     virtual bool valueIsPresentInStyle(Element*, CSSStyleDeclaration*) const;
     virtual void addToStyle(Element*, EditingStyle*) const;
@@ -149 +149 @@
         return adoptPtr(new HTMLTextDecorationEquivalent(primitiveValue, tagName));
     }
+    virtual bool propertyExistsInStyle(CSSStyleDeclaration*) const;
     virtual bool valueIsPresentInStyle(Element*, CSSStyleDeclaration*) const;
 
@@ -157 +158 @@
 HTMLTextDecorationEquivalent::HTMLTextDecorationEquivalent(int primitiveValue, const QualifiedName& tagName)
     : HTMLElementEquivalent(CSSPropertyTextDecoration, primitiveValue, tagName)
-{
+    // m_propertyID is used in HTMLElementEquivalent::addToStyle
+{
+}
+
+bool HTMLTextDecorationEquivalent::propertyExistsInStyle(CSSStyleDeclaration* style) const
+{
+    return style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect) || style->getPropertyCSSValue(CSSPropertyTextDecoration);
 }
 
 bool HTMLTextDecorationEquivalent::valueIsPresentInStyle(Element* element, CSSStyleDeclaration* style) const
 {
-    RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(m_propertyID);
+    RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
+    if (!styleValue)
+        styleValue = style->getPropertyCSSValue(CSSPropertyTextDecoration);
     return matches(element) && styleValue && styleValue->isValueList() && static_cast<CSSValueList*>(styleValue.get())->hasValue(m_primitiveValue.get());
 }
@@ -584 +593 @@
         return false;
 
-    if (!conflictingProperties) {
-        CSSMutableStyleDeclaration::const_iterator end = m_mutableStyle->end();
-        for (CSSMutableStyleDeclaration::const_iterator it = m_mutableStyle->begin(); it != end; ++it) {
-            CSSPropertyID propertyID = static_cast<CSSPropertyID>(it->id());
-
-            // We don't override whitespace property of a tab span because that would collapse the tab into a space.
-            if (propertyID == CSSPropertyWhiteSpace && isTabSpanNode(element))
-                continue;
-
-            if (inlineStyle->getPropertyCSSValue(propertyID))
-                return true;
-        }
-
-        return false;
-    }
-
     CSSMutableStyleDeclaration::const_iterator end = m_mutableStyle->end();
     for (CSSMutableStyleDeclaration::const_iterator it = m_mutableStyle->begin(); it != end; ++it) {
         CSSPropertyID propertyID = static_cast<CSSPropertyID>(it->id());
-        if ((propertyID == CSSPropertyWhiteSpace && isTabSpanNode(element)) || !inlineStyle->getPropertyCSSValue(propertyID))
+
+        // We don't override whitespace property of a tab span because that would collapse the tab into a space.
+        if (propertyID == CSSPropertyWhiteSpace && isTabSpanNode(element))
             continue;
 
+        if (propertyID == CSSPropertyWebkitTextDecorationsInEffect && inlineStyle->getPropertyCSSValue(CSSPropertyTextDecoration)) {
+            if (!conflictingProperties)
+                return true;
+            conflictingProperties->append(CSSPropertyTextDecoration);
+            if (extractedStyle)
+                extractedStyle->setProperty(CSSPropertyTextDecoration, inlineStyle->getPropertyValue(CSSPropertyTextDecoration), inlineStyle->getPropertyPriority(CSSPropertyTextDecoration));
+            continue;
+        }
+
+        if (!inlineStyle->getPropertyCSSValue(propertyID))
+            continue;
+
         if (propertyID == CSSPropertyUnicodeBidi && inlineStyle->getPropertyCSSValue(CSSPropertyDirection)) {
+            if (!conflictingProperties)
+                return true;
+            conflictingProperties->append(CSSPropertyDirection);
             if (extractedStyle)
                 extractedStyle->setProperty(propertyID, inlineStyle->getPropertyValue(propertyID), inlineStyle->getPropertyPriority(propertyID));
-            conflictingProperties->append(CSSPropertyDirection);
         }
 
+        if (!conflictingProperties)
+            return true;
+
         conflictingProperties->append(propertyID);
+
         if (extractedStyle)
             extractedStyle->setProperty(propertyID, inlineStyle->getPropertyValue(propertyID), inlineStyle->getPropertyPriority(propertyID));
     }
 
-    return !conflictingProperties->isEmpty();
+    return conflictingProperties && !conflictingProperties->isEmpty();
 }