Rename enums/functions that collide in chromium style in platform/

third_party/WebKit/Source/platform/JSONValues.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 151 matching lines @@
     output->append('\n');
 }
 
 void JSONValue::prettyWriteJSONInternal(StringBuilder* output, int depth) const
 {
     writeJSON(output);
 }
 
 bool JSONBasicValue::asBoolean(bool* output) const
 {
-    if (type() != TypeBoolean)
+    if (getType() != TypeBoolean)
         return false;
     *output = m_boolValue;
     return true;
 }
 
 bool JSONBasicValue::asNumber(double* output) const
 {
-    if (type() != TypeNumber)
+    if (getType() != TypeNumber)
         return false;
     *output = m_doubleValue;
     return true;
 }
 
 bool JSONBasicValue::asNumber(long* output) const
 {
-    if (type() != TypeNumber)
+    if (getType() != TypeNumber)
         return false;
     *output = static_cast<long>(m_doubleValue);
     return true;
 }
 
 bool JSONBasicValue::asNumber(int* output) const
 {
-    if (type() != TypeNumber)
+    if (getType() != TypeNumber)
         return false;
     *output = static_cast<int>(m_doubleValue);
     return true;
 }
 
 bool JSONBasicValue::asNumber(unsigned long* output) const
 {
-    if (type() != TypeNumber)
+    if (getType() != TypeNumber)
         return false;
     *output = static_cast<unsigned long>(m_doubleValue);
     return true;
 }
 
 bool JSONBasicValue::asNumber(unsigned* output) const
 {
-    if (type() != TypeNumber)
+    if (getType() != TypeNumber)
         return false;
     *output = static_cast<unsigned>(m_doubleValue);
     return true;
 }
 
 void JSONBasicValue::writeJSON(StringBuilder* output) const
 {
-    ASSERT(type() == TypeBoolean || type() == TypeNumber);
-    if (type() == TypeBoolean) {
+    ASSERT(getType() == TypeBoolean || getType() == TypeNumber);
+    if (getType() == TypeBoolean) {
         if (m_boolValue)
             output->append(trueString, 4);
         else
             output->append(falseString, 5);
-    } else if (type() == TypeNumber) {
+    } else if (getType() == TypeNumber) {
         if (!std::isfinite(m_doubleValue)) {
             output->append(nullString, 4);
             return;
         }
         output->append(Decimal::fromDouble(m_doubleValue).toString());
     }
 }
 
 bool JSONString::asString(String* output) const
 {
     *output = m_stringValue;
     return true;
 }
 
 void JSONString::writeJSON(StringBuilder* output) const
 {
-    ASSERT(type() == TypeString);
+    ASSERT(getType() == TypeString);
     doubleQuoteStringForJSON(m_stringValue, output);
 }
 
 JSONObject::~JSONObject()
 {
 }
 
 void JSONObject::setBoolean(const String& name, bool value)
 {
     setValue(name, JSONBasicValue::create(value));
@@ skipping 145 matching lines @@
         (*it)->writeJSON(output);
     }
     output->append(']');
 }
 
 void JSONArray::prettyWriteJSONInternal(StringBuilder* output, int depth) const
 {
     output->append('[');
     bool lastInsertedNewLine = false;
     for (Vector<RefPtr<JSONValue>>::const_iterator it = m_data.begin(); it != m_data.end(); ++it) {
-        bool insertNewLine = (*it)->type() == JSONValue::TypeObject || (*it)->type() == JSONValue::TypeArray || (*it)->type() == JSONValue::TypeString;
+        bool insertNewLine = (*it)->getType() == JSONValue::TypeObject || (*it)->getType() == JSONValue::TypeArray || (*it)->getType() == JSONValue::TypeString;
         if (it == m_data.begin()) {
             if (insertNewLine) {
                 output->append('\n');
                 writeIndent(depth + 1, output);
             }
         } else {
             output->append(',');
             if (lastInsertedNewLine) {
                 output->append('\n');
                 writeIndent(depth + 1, output);
@@ skipping 55 matching lines @@
     m_data.append(value);
 }
 
 PassRefPtr<JSONValue> JSONArray::get(size_t index)
 {
     ASSERT_WITH_SECURITY_IMPLICATION(index < m_data.size());
     return m_data[index];
 }
 
 } // namespace blink