Changeset 61340 in webkit

Timestamp:

Jun 17, 2010 12:32:04 PM (14 years ago)

Author:

rwlbuis@webkit.org

Message:

2010-06-17 Rob Buis <​rwlbuis@gmail.com>

Reviewed by Dave Hyatt.

CSS3 "Property is declared twice in rule" test fails
​https://bugs.webkit.org/show_bug.cgi?id=36282

Filter out duplicate properties in style declaration.

Test: fast/css/duplicate-property-in-rule.html

• css/CSSMutableStyleDeclaration.cpp: Filter out duplicate properties (WebCore::CSSMutableStyleDeclaration::CSSMutableStyleDeclaration):
• css/CSSParser.cpp: (WebCore::CSSParser::parseValue): Discard negative padding values
• css/CSSStyleSelector.cpp: Remove negative padding check (WebCore::CSSStyleSelector::applyProperty):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/duplicate-property-in-rule-expected.txt (added)
• LayoutTests/fast/css/duplicate-property-in-rule.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSMutableStyleDeclaration.cpp (modified) (1 diff)
• WebCore/css/CSSParser.cpp (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-06-17  Rob Buis  <rwlbuis@gmail.com>
+
+        Reviewed by Dave Hyatt.
+
+        Test for
+        CSS3 "Property is declared twice in rule" test fails
+        https://bugs.webkit.org/show_bug.cgi?id=36282
+
+        * fast/css/duplicate-property-in-rule-expected.txt: Added.
+        * fast/css/duplicate-property-in-rule.html: Added.
+
 2010-06-17  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-17  Rob Buis  <rwlbuis@gmail.com>
+
+        Reviewed by Dave Hyatt.
+
+        CSS3 "Property is declared twice in rule" test fails
+        https://bugs.webkit.org/show_bug.cgi?id=36282
+
+        Filter out duplicate properties in style declaration.
+
+        Test: fast/css/duplicate-property-in-rule.html
+
+        * css/CSSMutableStyleDeclaration.cpp: Filter out duplicate properties
+        (WebCore::CSSMutableStyleDeclaration::CSSMutableStyleDeclaration):
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseValue): Discard negative padding values
+        * css/CSSStyleSelector.cpp: Remove negative padding check
+        (WebCore::CSSStyleSelector::applyProperty):
+
 2010-06-17  Kenneth Russell  <kbr@google.com>
 

trunk/WebCore/css/CSSMutableStyleDeclaration.cpp

@@ -83 +83 @@
 {
     m_properties.reserveInitialCapacity(numProperties);
+    HashSet<int> candidates;
     for (int i = 0; i < numProperties; ++i) {
         ASSERT(properties[i]);
-        m_properties.append(*properties[i]);
         if (properties[i]->value()->isVariableDependentValue())
             m_variableDependentValueCount++;
-    }
-    // FIXME: This allows duplicate properties.
+        else if (candidates.contains(properties[i]->id()))
+            removeProperty(properties[i]->id(), false);
+        m_properties.append(*properties[i]);
+        if (!getPropertyPriority(properties[i]->id()) && !properties[i]->isImportant())
+            candidates.add(properties[i]->id());
+    }
 }
 

trunk/WebCore/css/CSSParser.cpp

@@ -984 +984 @@
     case CSSPropertyPaddingLeft:         ////
     case CSSPropertyWebkitPaddingStart:
-        validPrimitive = (!id && validUnit(value, FLength | FPercent, m_strict));
+        validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg, m_strict));
         break;
 

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -3859 +3859 @@
             else
                 return;
-            if (id == CSSPropertyPaddingLeft || id == CSSPropertyPaddingRight ||
-                id == CSSPropertyPaddingTop || id == CSSPropertyPaddingBottom)
-                // Padding can't be negative
-                apply = !((l.isFixed() || l.isPercent()) && l.calcValue(100) < 0);
-            else
-                apply = true;
+            apply = true;
         }
         if (!apply) return;