Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / JSONValues.h

diff --git a/src/third_party/WebKit/Source/platform/JSONValues.h b/src/third_party/WebKit/Source/platform/JSONValues.h
index b8ba0c4..67864a5 100644 (file)
--- a/src/third_party/WebKit/Source/platform/JSONValues.h
+++ b/src/third_party/WebKit/Source/platform/JSONValues.h
@@ -116,14 +116,14 @@ public:
         return adoptRef(new JSONBasicValue(value));
     }
 
-    virtual bool asBoolean(bool* output) const OVERRIDE;
-    virtual bool asNumber(double* output) const OVERRIDE;
-    virtual bool asNumber(long* output) const OVERRIDE;
-    virtual bool asNumber(int* output) const OVERRIDE;
-    virtual bool asNumber(unsigned long* output) const OVERRIDE;
-    virtual bool asNumber(unsigned* output) const OVERRIDE;
+    virtual bool asBoolean(bool* output) const override;
+    virtual bool asNumber(double* output) const override;
+    virtual bool asNumber(long* output) const override;
+    virtual bool asNumber(int* output) const override;
+    virtual bool asNumber(unsigned long* output) const override;
+    virtual bool asNumber(unsigned* output) const override;
 
-    virtual void writeJSON(StringBuilder* output) const OVERRIDE;
+    virtual void writeJSON(StringBuilder* output) const override;
 
 private:
     explicit JSONBasicValue(bool value) : JSONValue(TypeBoolean), m_boolValue(value) { }
@@ -148,9 +148,9 @@ public:
         return adoptRef(new JSONString(value));
     }
 
-    virtual bool asString(String* output) const OVERRIDE;
+    virtual bool asString(String* output) const override;
 
-    virtual void writeJSON(StringBuilder* output) const OVERRIDE;
+    virtual void writeJSON(StringBuilder* output) const override;
 
 private:
     explicit JSONString(const String& value) : JSONValue(TypeString), m_stringValue(value) { }
@@ -167,15 +167,15 @@ public:
     typedef Dictionary::iterator iterator;
     typedef Dictionary::const_iterator const_iterator;
 
-    virtual PassRefPtr<JSONObject> asObject() OVERRIDE;
+    virtual PassRefPtr<JSONObject> asObject() override;
     JSONObject* openAccessors();
 
-    virtual void writeJSON(StringBuilder* output) const OVERRIDE;
+    virtual void writeJSON(StringBuilder* output) const override;
 
 protected:
     virtual ~JSONObjectBase();
 
-    virtual bool asObject(RefPtr<JSONObject>* output) OVERRIDE;
+    virtual bool asObject(RefPtr<JSONObject>* output) override;
 
     void setBoolean(const String& name, bool);
     void setNumber(const String& name, double);
@@ -201,7 +201,7 @@ protected:
 
     void remove(const String& name);
 
-    virtual void prettyWriteJSONInternal(StringBuilder* output, int depth) const OVERRIDE;
+    virtual void prettyWriteJSONInternal(StringBuilder* output, int depth) const override;
 
     iterator begin() { return m_data.begin(); }
     iterator end() { return m_data.end(); }
@@ -256,16 +256,16 @@ public:
     typedef Vector<RefPtr<JSONValue> >::iterator iterator;
     typedef Vector<RefPtr<JSONValue> >::const_iterator const_iterator;
 
-    virtual PassRefPtr<JSONArray> asArray() OVERRIDE;
+    virtual PassRefPtr<JSONArray> asArray() override;
 
     unsigned length() const { return m_data.size(); }
 
-    virtual void writeJSON(StringBuilder* output) const OVERRIDE;
+    virtual void writeJSON(StringBuilder* output) const override;
 
 protected:
     virtual ~JSONArrayBase();
 
-    virtual bool asArray(RefPtr<JSONArray>* output) OVERRIDE;
+    virtual bool asArray(RefPtr<JSONArray>* output) override;
 
     void pushBoolean(bool);
     void pushInt(int);
@@ -277,7 +277,7 @@ protected:
 
     PassRefPtr<JSONValue> get(size_t index);
 
-    virtual void prettyWriteJSONInternal(StringBuilder* output, int depth) const OVERRIDE;
+    virtual void prettyWriteJSONInternal(StringBuilder* output, int depth) const override;
 
     iterator begin() { return m_data.begin(); }
     iterator end() { return m_data.end(); }