Title: [123006] trunk/Source/WebCore
- Revision
- 123006
- Author
- [email protected]
- Date
- 2012-07-18 13:09:57 -0700 (Wed, 18 Jul 2012)
Log Message
Fix up old name in RuleSet::addRulesFromSheet
https://bugs.webkit.org/show_bug.cgi?id=91646
Reviewed by Andreas Kling.
Simple parameter rename, no change in functionality.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::collectMatchingRulesForList): Renamed styleSelector to resolver to reflect recent rename of the parameter type.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123005 => 123006)
--- trunk/Source/WebCore/ChangeLog 2012-07-18 20:06:12 UTC (rev 123005)
+++ trunk/Source/WebCore/ChangeLog 2012-07-18 20:09:57 UTC (rev 123006)
@@ -1,3 +1,15 @@
+2012-07-18 Dimitri Glazkov <[email protected]>
+
+ Fix up old name in RuleSet::addRulesFromSheet
+ https://bugs.webkit.org/show_bug.cgi?id=91646
+
+ Reviewed by Andreas Kling.
+
+ Simple parameter rename, no change in functionality.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::collectMatchingRulesForList): Renamed styleSelector to resolver to reflect recent rename of the parameter type.
+
2012-07-18 Vincent Scheib <[email protected]>
Unify allowfullscreen logic in Document::webkitFullScreenEnabled and fullScreenIsAllowedForElement.
Modified: trunk/Source/WebCore/css/StyleResolver.cpp (123005 => 123006)
--- trunk/Source/WebCore/css/StyleResolver.cpp 2012-07-18 20:06:12 UTC (rev 123005)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2012-07-18 20:09:57 UTC (rev 123006)
@@ -2607,17 +2607,17 @@
m_regionSelectorsAndRuleSets.append(RuleSetSelectorPair(regionRule->selectorList().first(), regionRuleSet.release()));
}
-void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, const MediaQueryEvaluator& medium, StyleResolver* styleSelector, const ContainerNode* scope)
+void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, const MediaQueryEvaluator& medium, StyleResolver* resolver, const ContainerNode* scope)
{
ASSERT(sheet);
const Vector<RefPtr<StyleRuleImport> >& importRules = sheet->importRules();
for (unsigned i = 0; i < importRules.size(); ++i) {
StyleRuleImport* importRule = importRules[i].get();
- if (importRule->styleSheet() && (!importRule->mediaQueries() || medium.eval(importRule->mediaQueries(), styleSelector)))
- addRulesFromSheet(importRule->styleSheet(), medium, styleSelector, scope);
+ if (importRule->styleSheet() && (!importRule->mediaQueries() || medium.eval(importRule->mediaQueries(), resolver)))
+ addRulesFromSheet(importRule->styleSheet(), medium, resolver, scope);
}
- bool hasDocumentSecurityOrigin = styleSelector && styleSelector->document()->securityOrigin()->canRequest(sheet->baseURL());
+ bool hasDocumentSecurityOrigin = resolver && resolver->document()->securityOrigin()->canRequest(sheet->baseURL());
const Vector<RefPtr<StyleRuleBase> >& rules = sheet->childRules();
for (unsigned i = 0; i < rules.size(); ++i) {
@@ -2631,7 +2631,7 @@
else if (rule->isMediaRule()) {
StyleRuleMedia* mediaRule = static_cast<StyleRuleMedia*>(rule);
- if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueries(), styleSelector))) {
+ if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueries(), resolver))) {
// Traverse child elements of the @media rule.
const Vector<RefPtr<StyleRuleBase> >& childRules = mediaRule->childRules();
for (unsigned j = 0; j < childRules.size(); ++j) {
@@ -2640,39 +2640,39 @@
addStyleRule(static_cast<StyleRule*>(childRule), hasDocumentSecurityOrigin, !scope);
else if (childRule->isPageRule())
addPageRule(static_cast<StyleRulePage*>(childRule));
- else if (childRule->isFontFaceRule() && styleSelector) {
+ else if (childRule->isFontFaceRule() && resolver) {
// Add this font face to our set.
// FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
if (scope)
continue;
const StyleRuleFontFace* fontFaceRule = static_cast<StyleRuleFontFace*>(childRule);
- styleSelector->fontSelector()->addFontFaceRule(fontFaceRule);
- styleSelector->invalidateMatchedPropertiesCache();
- } else if (childRule->isKeyframesRule() && styleSelector) {
+ resolver->fontSelector()->addFontFaceRule(fontFaceRule);
+ resolver->invalidateMatchedPropertiesCache();
+ } else if (childRule->isKeyframesRule() && resolver) {
// Add this keyframe rule to our set.
// FIXME(BUG 72462): We don't add @keyframe rules of scoped style sheets for the moment.
if (scope)
continue;
- styleSelector->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(childRule));
+ resolver->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(childRule));
}
} // for rules
} // if rules
- } else if (rule->isFontFaceRule() && styleSelector) {
+ } else if (rule->isFontFaceRule() && resolver) {
// Add this font face to our set.
// FIXME(BUG 72461): We don't add @font-face rules of scoped style sheets for the moment.
if (scope)
continue;
const StyleRuleFontFace* fontFaceRule = static_cast<StyleRuleFontFace*>(rule);
- styleSelector->fontSelector()->addFontFaceRule(fontFaceRule);
- styleSelector->invalidateMatchedPropertiesCache();
- } else if (rule->isKeyframesRule() && styleSelector) {
+ resolver->fontSelector()->addFontFaceRule(fontFaceRule);
+ resolver->invalidateMatchedPropertiesCache();
+ } else if (rule->isKeyframesRule() && resolver) {
// FIXME (BUG 72462): We don't add @keyframe rules of scoped style sheets for the moment.
if (scope)
continue;
- styleSelector->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(rule));
+ resolver->addKeyframeStyle(static_cast<StyleRuleKeyframes*>(rule));
}
#if ENABLE(CSS_REGIONS)
- else if (rule->isRegionRule() && styleSelector) {
+ else if (rule->isRegionRule() && resolver) {
// FIXME (BUG 72472): We don't add @-webkit-region rules of scoped style sheets for the moment.
if (scope)
continue;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
