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

Unified Diff: third_party/WebKit/Source/platform/PODRedBlackTree.h

Issue 1746283002: Rename enums/functions that collide in chromium style in platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: get-names-13-platform: . 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/platform/Length.cpp ('k') | third_party/WebKit/Source/platform/PlatformEvent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/platform/PODRedBlackTree.h
diff --git a/third_party/WebKit/Source/platform/PODRedBlackTree.h b/third_party/WebKit/Source/platform/PODRedBlackTree.h
index e791558beffa6df5c6fadf22fcff2c26e72267d2..c17b08bbac72d143e6d4f8f01f9de51102590d91 100644
--- a/third_party/WebKit/Source/platform/PODRedBlackTree.h
+++ b/third_party/WebKit/Source/platform/PODRedBlackTree.h
@@ -245,7 +245,7 @@ public:
}
#endif
- enum Color {
+ enum NodeColor {
Red = 1,
Black
};
@@ -269,8 +269,8 @@ public:
virtual ~Node() { }
- Color color() const { return m_color; }
- void setColor(Color color) { m_color = color; }
+ NodeColor color() const { return m_color; }
+ void setColor(NodeColor color) { m_color = color; }
// Fetches the user data.
T& data() { return m_data; }
@@ -296,7 +296,7 @@ public:
Node* m_left;
Node* m_right;
Node* m_parent;
- Color m_color;
+ NodeColor m_color;
T m_data;
};
« no previous file with comments | « third_party/WebKit/Source/platform/Length.cpp ('k') | third_party/WebKit/Source/platform/PlatformEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698