Changeset 65833 in webkit

Timestamp:

Aug 23, 2010 2:52:03 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-23 Iain Merrick <​husky@google.com>

Reviewed by Steve Block.

Update JNI bridge for V8 after renaming of JavaString::utf8().
​https://bugs.webkit.org/show_bug.cgi?id=44419

This fixes the build on Android. No new functionality, so no new tests.

• bridge/jni/v8/JNIBridgeV8.cpp: (JavaField::JavaField):
• bridge/jni/v8/JNIBridgeV8.h: (JSC::Bindings::JavaField::type):
• bridge/jni/v8/JavaClassV8.cpp: (JavaClass::JavaClass):
• bridge/jni/v8/JavaNPObjectV8.cpp: (JSC::Bindings::JavaNPObjectGetProperty):
• bridge/jni/v8/JavaStringV8.h: (JSC::Bindings::JavaStringImpl::utf8):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/jni/v8/JNIBridgeV8.cpp (modified) (1 diff)
• bridge/jni/v8/JNIBridgeV8.h (modified) (1 diff)
• bridge/jni/v8/JavaClassV8.cpp (modified) (2 diffs)
• bridge/jni/v8/JavaNPObjectV8.cpp (modified) (1 diff)
• bridge/jni/v8/JavaStringV8.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-23  Iain Merrick  <husky@google.com>
+
+        Reviewed by Steve Block.
+
+        Update JNI bridge for V8 after renaming of JavaString::utf8().
+        https://bugs.webkit.org/show_bug.cgi?id=44419
+
+        This fixes the build on Android. No new functionality, so no new tests.
+
+        * bridge/jni/v8/JNIBridgeV8.cpp:
+        (JavaField::JavaField):
+        * bridge/jni/v8/JNIBridgeV8.h:
+        (JSC::Bindings::JavaField::type):
+        * bridge/jni/v8/JavaClassV8.cpp:
+        (JavaClass::JavaClass):
+        * bridge/jni/v8/JavaNPObjectV8.cpp:
+        (JSC::Bindings::JavaNPObjectGetProperty):
+        * bridge/jni/v8/JavaStringV8.h:
+        (JSC::Bindings::JavaStringImpl::utf8):
+
 2010-08-23  Mihai Parparita  <mihaip@chromium.org>
 

trunk/WebCore/bridge/jni/v8/JNIBridgeV8.cpp

@@ -35 +35 @@
     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

trunk/WebCore/bridge/jni/v8/JNIBridgeV8.h

@@ -39 +39 @@
 
     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; }

trunk/WebCore/bridge/jni/v8/JavaClassV8.cpp

@@ -54 +54 @@
         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);
@@ -67 +67 @@
         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);
             }
         }

trunk/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp

@@ -156 +156 @@
     jvalue value = getJNIField(instance->javaInstance(),
                                field->getJNIType(),
-                               field->name().UTF8String(),
+                               field->name().utf8(),
                                field->type());
 

trunk/WebCore/bridge/jni/v8/JavaStringV8.h

@@ -47 +47 @@
     }
 
-    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(); }