Title: [104442] trunk/Source/WebCore
Revision
104442
Author
[email protected]
Date
2012-01-09 01:09:18 -0800 (Mon, 09 Jan 2012)

Log Message

CSSMutableStyleDeclaration: Remove propertiesEqual().
<http://webkit.org/b/75829>

Reviewed by Antti Koivisto.

Remove propertiesEqual() since it was wrong (it only compared CSSValue pointers,
not the actual values.)

Skip comparing the style declarations in NamedNodeMap::mappedMapsEquivalent()
and just compare pointers instead. This is possible because the declarations
all come from the mapped attribute/declaration table.

* css/CSSMutableStyleDeclaration.h:
* dom/NamedNodeMap.cpp:
(WebCore::NamedNodeMap::mappedMapsEquivalent):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (104441 => 104442)


--- trunk/Source/WebCore/ChangeLog	2012-01-09 08:53:36 UTC (rev 104441)
+++ trunk/Source/WebCore/ChangeLog	2012-01-09 09:09:18 UTC (rev 104442)
@@ -1,3 +1,21 @@
+2012-01-09  Andreas Kling  <[email protected]>
+
+        CSSMutableStyleDeclaration: Remove propertiesEqual().
+        <http://webkit.org/b/75829>
+
+        Reviewed by Antti Koivisto.
+
+        Remove propertiesEqual() since it was wrong (it only compared CSSValue pointers,
+        not the actual values.)
+
+        Skip comparing the style declarations in NamedNodeMap::mappedMapsEquivalent()
+        and just compare pointers instead. This is possible because the declarations
+        all come from the mapped attribute/declaration table.
+
+        * css/CSSMutableStyleDeclaration.h:
+        * dom/NamedNodeMap.cpp:
+        (WebCore::NamedNodeMap::mappedMapsEquivalent):
+
 2012-01-09  Adam Barth  <[email protected]>
 
         insertAdjacentHTML doesn't play nice with DocumentFragment

Modified: trunk/Source/WebCore/css/CSSMutableStyleDeclaration.h (104441 => 104442)


--- trunk/Source/WebCore/css/CSSMutableStyleDeclaration.h	2012-01-09 08:53:36 UTC (rev 104441)
+++ trunk/Source/WebCore/css/CSSMutableStyleDeclaration.h	2012-01-09 09:09:18 UTC (rev 104442)
@@ -127,8 +127,6 @@
 
     void addSubresourceStyleURLs(ListHashSet<KURL>&);
 
-    bool propertiesEqual(const CSSMutableStyleDeclaration* o) const { return m_properties == o->m_properties; }
-
 protected:
     CSSMutableStyleDeclaration(CSSRule* parentRule);
     CSSMutableStyleDeclaration();

Modified: trunk/Source/WebCore/dom/NamedNodeMap.cpp (104441 => 104442)


--- trunk/Source/WebCore/dom/NamedNodeMap.cpp	2012-01-09 08:53:36 UTC (rev 104441)
+++ trunk/Source/WebCore/dom/NamedNodeMap.cpp	2012-01-09 09:09:18 UTC (rev 104442)
@@ -344,10 +344,8 @@
             ASSERT(attr->isMappedAttribute());
 
             Attribute* otherAttr = otherMap->getAttributeItem(attr->name());
-            if (!otherAttr || !otherAttr->decl() || attr->value() != otherAttr->value())
+            if (!otherAttr || attr->decl() != otherAttr->decl() || attr->value() != otherAttr->value())
                 return false;
-            if (!attr->decl()->propertiesEqual(otherAttr->decl()))
-                return false;
         }
     }
     return true;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to