Merge WebKit at r65615 : UTF8String() becomes utf8().

This was changed for JSC strings in http://trac.webkit.org/changeset/65305,
but the V8 implementation was not updated.

Fix upstream in WebKit -- see https://bugs.webkit.org/show_bug.cgi?id=44419

Change-Id: Icaf70d9f8a3120613ab3e80b69d4ce0c7af89d46

5 files changed, 7 insertions, 7 deletions

diff --git a/WebCore/bridge/jni/v8/JNIBridgeV8.cpp b/WebCore/bridge/jni/v8/JNIBridgeV8.cpp
index 9fb1bf3..35775dc 100644
--- a/WebCore/bridge/jni/v8/JNIBridgeV8.cpp
+++ b/WebCore/bridge/jni/v8/JNIBridgeV8.cpp
@@ -34,7 +34,7 @@ JavaField::JavaField(JNIEnv* env, jobject aField)
     jobject fieldType = callJNIMethod<jobject>(aField, "getType", "()Ljava/lang/Class;");
     jstring fieldTypeName = static_cast<jstring>(callJNIMethod<jobject>(fieldType, "getName", "()Ljava/lang/String;"));
     m_type = JavaString(env, fieldTypeName);
-    m_JNIType = JNITypeFromClassName(m_type.UTF8String());
+    m_JNIType = JNITypeFromClassName(m_type.utf8());
 
     // Get field name
     jstring fieldName = static_cast<jstring>(callJNIMethod<jobject>(aField, "getName", "()Ljava/lang/String;"));
diff --git a/WebCore/bridge/jni/v8/JNIBridgeV8.h b/WebCore/bridge/jni/v8/JNIBridgeV8.h
index 23989ce..46cbd56 100644
--- a/WebCore/bridge/jni/v8/JNIBridgeV8.h
+++ b/WebCore/bridge/jni/v8/JNIBridgeV8.h
@@ -38,7 +38,7 @@ public:
     JavaField(JNIEnv*, jobject aField);
 
     const JavaString& name() const { return m_name; }
-    const char* type() const { return m_type.UTF8String(); }
+    const char* type() const { return m_type.utf8(); }
 
     JNIType getJNIType() const { return m_JNIType; }
 
diff --git a/WebCore/bridge/jni/v8/JavaClassV8.cpp b/WebCore/bridge/jni/v8/JavaClassV8.cpp
index 02a57ea..04f8822 100644
--- a/WebCore/bridge/jni/v8/JavaClassV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaClassV8.cpp
@@ -53,7 +53,7 @@ JavaClass::JavaClass(jobject anInstance)
         jobject aJField = env->GetObjectArrayElement(static_cast<jobjectArray>(fields), i);
         JavaField* aField = new JavaField(env, aJField); // deleted in the JavaClass destructor
         {
-            m_fields.set(aField->name().UTF8String(), aField);
+            m_fields.set(aField->name().utf8(), aField);
         }
         env->DeleteLocalRef(aJField);
     }
@@ -66,10 +66,10 @@ JavaClass::JavaClass(jobject anInstance)
         JavaMethod* aMethod = new JavaMethod(env, aJMethod); // deleted in the JavaClass destructor
         MethodList* methodList;
         {
-            methodList = m_methods.get(aMethod->name().UTF8String());
+            methodList = m_methods.get(aMethod->name().utf8());
             if (!methodList) {
                 methodList = new MethodList();
-                m_methods.set(aMethod->name().UTF8String(), methodList);
+                m_methods.set(aMethod->name().utf8(), methodList);
             }
         }
         methodList->append(aMethod);
diff --git a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
index 88e28d4..7aa55b5 100644
--- a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -165,7 +165,7 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant*
     // will fail.
     jvalue value = getJNIField(instance->javaInstance(),
                                field->getJNIType(),
-                               field->name().UTF8String(),
+                               field->name().utf8(),
                                field->type());
 #endif
     convertJValueToNPVariant(value, field->getJNIType(), field->type(), result);
diff --git a/WebCore/bridge/jni/v8/JavaStringV8.h b/WebCore/bridge/jni/v8/JavaStringV8.h
index 21420b7..827d9f5 100644
--- a/WebCore/bridge/jni/v8/JavaStringV8.h
+++ b/WebCore/bridge/jni/v8/JavaStringV8.h
@@ -46,7 +46,7 @@ public:
         releaseCharactersForJStringInEnv(e, s, cs);
     }
 
-    const char* UTF8String() const { return m_utf8String.data(); }
+    const char* utf8() const { return m_utf8String.data(); }
     const jchar* uchars() const { return 0; } // Not implemented
     int length() const { return m_utf8String.length(); }