Modified: trunk/Source/WebCore/ChangeLog (204454 => 204455)
--- trunk/Source/WebCore/ChangeLog 2016-08-14 21:45:49 UTC (rev 204454)
+++ trunk/Source/WebCore/ChangeLog 2016-08-14 22:38:54 UTC (rev 204455)
@@ -1,3 +1,19 @@
+2016-08-14 Jonathan Bedard <[email protected]>
+
+ Dereferenced NULL pointer in StyleResolver
+ https://bugs.webkit.org/show_bug.cgi?id=160823
+
+ Reviewed by Darin Adler.
+
+ No behavior changed, new tests unneeded.
+
+ This change was initiated by a NULL pointer dereference to provide this unused argument.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::CascadedProperties::addStyleProperties): Removed unused function argument.
+ (WebCore::StyleResolver::CascadedProperties::addMatch): Ditto.
+ * css/StyleResolver.h: Ditto.
+
2016-08-14 Myles C. Maxfield <[email protected]>
Fix GTK Debug bots after r204400
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (204454 => 204455)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-08-14 21:45:49 UTC (rev 204454)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-08-14 22:38:54 UTC (rev 204455)
@@ -2208,7 +2208,7 @@
m_deferredProperties.append(property);
}
-void StyleResolver::CascadedProperties::addStyleProperties(const StyleProperties& properties, StyleRule&, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType, unsigned linkMatchType, CascadeLevel cascadeLevel)
+void StyleResolver::CascadedProperties::addStyleProperties(const StyleProperties& properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType propertyWhitelistType, unsigned linkMatchType, CascadeLevel cascadeLevel)
{
for (unsigned i = 0, count = properties.propertyCount(); i < count; ++i) {
auto current = properties.propertyAt(i);
@@ -2252,7 +2252,7 @@
auto propertyWhitelistType = static_cast<PropertyWhitelistType>(matchedProperties.whitelistType);
auto cascadeLevel = cascadeLevelForIndex(matchResult, index);
- addStyleProperties(*matchedProperties.properties, *matchResult.matchedRules[index], isImportant, inheritedOnly, propertyWhitelistType, matchedProperties.linkMatchType, cascadeLevel);
+ addStyleProperties(*matchedProperties.properties, isImportant, inheritedOnly, propertyWhitelistType, matchedProperties.linkMatchType, cascadeLevel);
}
void StyleResolver::CascadedProperties::addNormalMatches(const MatchResult& matchResult, int startIndex, int endIndex, bool inheritedOnly)
Modified: trunk/Source/WebCore/css/StyleResolver.h (204454 => 204455)
--- trunk/Source/WebCore/css/StyleResolver.h 2016-08-14 21:45:49 UTC (rev 204454)
+++ trunk/Source/WebCore/css/StyleResolver.h 2016-08-14 22:38:54 UTC (rev 204455)
@@ -301,7 +301,7 @@
private:
void addMatch(const MatchResult&, unsigned index, bool isImportant, bool inheritedOnly);
- void addStyleProperties(const StyleProperties&, StyleRule&, bool isImportant, bool inheritedOnly, PropertyWhitelistType, unsigned linkMatchType, CascadeLevel);
+ void addStyleProperties(const StyleProperties&, bool isImportant, bool inheritedOnly, PropertyWhitelistType, unsigned linkMatchType, CascadeLevel);
static void setPropertyInternal(Property&, CSSPropertyID, CSSValue&, unsigned linkMatchType, CascadeLevel);
Property m_properties[numCSSProperties + 2];
