| Index: third_party/WebKit/Source/core/css/CSSRuleList.h
|
| diff --git a/third_party/WebKit/Source/core/css/CSSRuleList.h b/third_party/WebKit/Source/core/css/CSSRuleList.h
|
| index 51e6eb79d33ac2d512ef9bec9364ad69072682c8..81c9c94b54a00acbe43768449e9d818344dd1c81 100644
|
| --- a/third_party/WebKit/Source/core/css/CSSRuleList.h
|
| +++ b/third_party/WebKit/Source/core/css/CSSRuleList.h
|
| @@ -86,10 +86,14 @@ class LiveCSSRuleList final : public CSSRuleList {
|
| private:
|
| LiveCSSRuleList(Rule* rule) : m_rule(rule) {}
|
|
|
| - unsigned length() const override { return m_rule->length(); }
|
| - CSSRule* item(unsigned index) const override { return m_rule->item(index); }
|
| - CSSStyleSheet* styleSheet() const override {
|
| - return m_rule->parentStyleSheet();
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |length| in 2 places below (not |GetLength|). */
|
| + unsigned length() const override { return rule_->length(); }
|
| + CSSRule* item(unsigned index) const override { return rule_->Item(index); }
|
| + CSSStyleSheet* GetStyleSheet() const override {
|
| + /* DO NOT SUBMIT - merge conflict marker.
|
| + * Please spell |parentStyleSheet| below (not |ParentStyleSheet|). */
|
| + return rule_->parentStyleSheet();
|
| }
|
|
|
| Member<Rule> m_rule;
|
|
|