Title: [105089] trunk/Source/WebCore
- Revision
- 105089
- Author
- [email protected]
- Date
- 2012-01-16 13:53:39 -0800 (Mon, 16 Jan 2012)
Log Message
Fix assertion failure in mappedAttributesEquivalent().
<http://webkit.org/b/76393>
Rubber-stamped by Antti Koivisto.
The assertion that two mapped attributes with matching name/value will always
have the exact same decl() was wrong, so make it a proper check once again.
* css/CSSStyleSelector.cpp:
(WebCore::mappedAttributesEquivalent):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105088 => 105089)
--- trunk/Source/WebCore/ChangeLog 2012-01-16 21:31:03 UTC (rev 105088)
+++ trunk/Source/WebCore/ChangeLog 2012-01-16 21:53:39 UTC (rev 105089)
@@ -1,3 +1,16 @@
+2012-01-16 Andreas Kling <[email protected]>
+
+ Fix assertion failure in mappedAttributesEquivalent().
+ <http://webkit.org/b/76393>
+
+ Rubber-stamped by Antti Koivisto.
+
+ The assertion that two mapped attributes with matching name/value will always
+ have the exact same decl() was wrong, so make it a proper check once again.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::mappedAttributesEquivalent):
+
2012-01-16 Jon Lee <[email protected]>
Remove HTML notifications support on Mac
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (105088 => 105089)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-01-16 21:31:03 UTC (rev 105088)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2012-01-16 21:53:39 UTC (rev 105089)
@@ -1064,9 +1064,8 @@
continue;
ASSERT(attribute->isMappedAttribute());
Attribute* otherAttribute = b->getAttributeItem(attribute->name());
- if (!otherAttribute || attribute->value() != otherAttribute->value())
+ if (!otherAttribute || attribute->value() != otherAttribute->value() || attribute->decl() != otherAttribute->decl())
return false;
- ASSERT(attribute->decl() == otherAttribute->decl());
}
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
