Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Unified Diff: Source/core/css/PageRuleCollector.cpp

Issue 181783005: Have Element::ensureMutableInlineStyle() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/css/PropertySetCSSStyleDeclaration.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/PageRuleCollector.cpp
diff --git a/Source/core/css/PageRuleCollector.cpp b/Source/core/css/PageRuleCollector.cpp
index 6021e3184c312c2805b05532c33c422041e16ed5..7d9e4ec2b3f173b1eadded95456078ac07d367de 100644
--- a/Source/core/css/PageRuleCollector.cpp
+++ b/Source/core/css/PageRuleCollector.cpp
@@ -81,7 +81,7 @@ void PageRuleCollector::matchPageRules(RuleSet* rules)
std::stable_sort(matchedPageRules.begin(), matchedPageRules.end(), comparePageRules);
for (unsigned i = 0; i < matchedPageRules.size(); i++)
- m_result.addMatchedProperties(matchedPageRules[i]->properties());
+ m_result.addMatchedProperties(&matchedPageRules[i]->properties());
}
static bool checkPageSelectorComponents(const CSSSelector* selector, bool isLeftPage, bool isFirstPage, const String& pageName)
@@ -113,8 +113,8 @@ void PageRuleCollector::matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMembe
continue;
// If the rule has no properties to apply, then ignore it.
- const StylePropertySet* properties = rule->properties();
- if (!properties || properties->isEmpty())
+ const StylePropertySet& properties = rule->properties();
+ if (properties.isEmpty())
continue;
// Add this rule to our list of matched rules.
« no previous file with comments | « Source/core/css/FontFace.cpp ('k') | Source/core/css/PropertySetCSSStyleDeclaration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698