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

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

Issue 1729013002: blink: Rename enums and functions to not collide with chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-3: . Created 4 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 | « third_party/WebKit/Source/core/css/StyleColor.h ('k') | third_party/WebKit/Source/core/css/StyleRule.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/StyleRule.h
diff --git a/third_party/WebKit/Source/core/css/StyleRule.h b/third_party/WebKit/Source/core/css/StyleRule.h
index a631def8ef10ff48d9c2a63e066411b150f6c9f0..4f46bea0e73b8edc55e14015ef3d7a5f4594b254 100644
--- a/third_party/WebKit/Source/core/css/StyleRule.h
+++ b/third_party/WebKit/Source/core/css/StyleRule.h
@@ -37,7 +37,7 @@ class CSSStyleSheet;
class CORE_EXPORT StyleRuleBase : public RefCountedWillBeGarbageCollectedFinalized<StyleRuleBase> {
USING_FAST_MALLOC_WITH_TYPE_NAME_WILL_BE_REMOVED(blink::StyleRuleBase);
public:
- enum Type {
+ enum RuleType {
Charset,
Style,
Import,
@@ -51,7 +51,7 @@ public:
Viewport,
};
- Type type() const { return static_cast<Type>(m_type); }
+ RuleType type() const { return static_cast<RuleType>(m_type); }
bool isCharsetRule() const { return type() == Charset; }
bool isFontFaceRule() const { return type() == FontFace; }
@@ -90,7 +90,7 @@ public:
~StyleRuleBase() { }
protected:
- StyleRuleBase(Type type) : m_type(type) { }
+ StyleRuleBase(RuleType type) : m_type(type) { }
StyleRuleBase(const StyleRuleBase& o) : m_type(o.m_type) { }
private:
@@ -193,7 +193,7 @@ public:
DECLARE_TRACE_AFTER_DISPATCH();
protected:
- StyleRuleGroup(Type, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& adoptRule);
+ StyleRuleGroup(RuleType, WillBeHeapVector<RefPtrWillBeMember<StyleRuleBase>>& adoptRule);
StyleRuleGroup(const StyleRuleGroup&);
private:
« no previous file with comments | « third_party/WebKit/Source/core/css/StyleColor.h ('k') | third_party/WebKit/Source/core/css/StyleRule.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698