Title: [100909] trunk/Source/WebCore
- Revision
- 100909
- Author
- [email protected]
- Date
- 2011-11-21 06:41:16 -0800 (Mon, 21 Nov 2011)
Log Message
Remove CSSStyleSelector::m_additionalAttributeStyleDecls field
https://bugs.webkit.org/show_bug.cgi?id=72876
Reviewed by Andreas Kling.
There is no reason for this temporary to be a field.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::matchAllRules):
* css/CSSStyleSelector.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100908 => 100909)
--- trunk/Source/WebCore/ChangeLog 2011-11-21 14:37:22 UTC (rev 100908)
+++ trunk/Source/WebCore/ChangeLog 2011-11-21 14:41:16 UTC (rev 100909)
@@ -1,3 +1,16 @@
+2011-11-21 Antti Koivisto <[email protected]>
+
+ Remove CSSStyleSelector::m_additionalAttributeStyleDecls field
+ https://bugs.webkit.org/show_bug.cgi?id=72876
+
+ Reviewed by Andreas Kling.
+
+ There is no reason for this temporary to be a field.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::matchAllRules):
+ * css/CSSStyleSelector.h:
+
2011-11-21 Pavel Feldman <[email protected]>
Web Inspector: [REGRESSION] Assertion failed in ScriptsPanel.js
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (100908 => 100909)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-11-21 14:37:22 UTC (rev 100908)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-11-21 14:41:16 UTC (rev 100909)
@@ -795,15 +795,15 @@
// Tables and table cells share an additional mapped rule that must be applied
// after all attributes, since their mapped style depends on the values of multiple attributes.
if (m_styledElement->canHaveAdditionalAttributeStyleDecls()) {
- m_additionalAttributeStyleDecls.clear();
- m_styledElement->additionalAttributeStyleDecls(m_additionalAttributeStyleDecls);
- if (!m_additionalAttributeStyleDecls.isEmpty()) {
- unsigned additionalDeclsSize = m_additionalAttributeStyleDecls.size();
+ Vector<CSSMutableStyleDeclaration*> additionalAttributeStyleDecls;
+ m_styledElement->additionalAttributeStyleDecls(additionalAttributeStyleDecls);
+ if (!additionalAttributeStyleDecls.isEmpty()) {
+ unsigned additionalDeclsSize = additionalAttributeStyleDecls.size();
if (result.firstAuthorRule == -1)
result.firstAuthorRule = m_matchedDecls.size();
result.lastAuthorRule = m_matchedDecls.size() + additionalDeclsSize - 1;
for (unsigned i = 0; i < additionalDeclsSize; ++i)
- addMatchedDeclaration(m_additionalAttributeStyleDecls[i]);
+ addMatchedDeclaration(additionalAttributeStyleDecls[i]);
result.isCacheable = false;
}
}
Modified: trunk/Source/WebCore/css/CSSStyleSelector.h (100908 => 100909)
--- trunk/Source/WebCore/css/CSSStyleSelector.h 2011-11-21 14:37:22 UTC (rev 100908)
+++ trunk/Source/WebCore/css/CSSStyleSelector.h 2011-11-21 14:41:16 UTC (rev 100909)
@@ -397,7 +397,6 @@
bool m_sameOriginOnly;
RefPtr<CSSFontSelector> m_fontSelector;
- Vector<CSSMutableStyleDeclaration*> m_additionalAttributeStyleDecls;
Vector<MediaQueryResult*> m_viewportDependentMediaQueryResults;
bool m_applyPropertyToRegularStyle;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
