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

Unified Diff: third_party/WebKit/Source/platform/JSONValues.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
Index: third_party/WebKit/Source/platform/JSONValues.h
diff --git a/third_party/WebKit/Source/platform/JSONValues.h b/third_party/WebKit/Source/platform/JSONValues.h
index a6cf1ddbb9f80f60b2b70468c5d7e3e8511d22f7..1789d4225525204b56fd66741fa42c3930c09947 100644
--- a/third_party/WebKit/Source/platform/JSONValues.h
+++ b/third_party/WebKit/Source/platform/JSONValues.h
@@ -72,7 +72,7 @@ public:
TypeArray
} Type;
- Type type() const { return m_type; }
+ Type getType() const { return m_type; }
bool isNull() const { return m_type == TypeNull; }
@@ -179,7 +179,7 @@ public:
static PassRefPtr<JSONObject> cast(PassRefPtr<JSONValue> value)
{
- if (!value || value->type() != TypeObject)
+ if (!value || value->getType() != TypeObject)
return nullptr;
return adoptRef(static_cast<JSONObject*>(value.leakRef()));
}
@@ -242,7 +242,7 @@ public:
static PassRefPtr<JSONArray> cast(PassRefPtr<JSONValue> value)
{
- if (!value || value->type() != TypeArray)
+ if (!value || value->getType() != TypeArray)
return nullptr;
return adoptRef(static_cast<JSONArray*>(value.leakRef()));
}
« no previous file with comments | « third_party/WebKit/Source/platform/DecimalTest.cpp ('k') | third_party/WebKit/Source/platform/JSONValues.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698