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

Unified Diff: third_party/WebKit/Source/core/css/CSSRuleList.h

Issue 2329463004: ABANDONED CL: Changes needed to make things compile after running rewrite_to_chrome_style tool. (Closed)
Patch Set: Rebasing the fixes... Created 3 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
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;
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSProperties.json5 ('k') | third_party/WebKit/Source/core/css/CSSValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698