[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit b321900560d496ec22984b3c4461e7abee9c88ff
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 23 21:52:03 2010 +0000

    2010-08-23  Iain Merrick  <husky at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65833 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a8ed748..e7f7106 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-08-23  Iain Merrick  <husky at 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 at chromium.org>
 
         Reviewed by David Hyatt.
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 d6b4ac2..50cc8f3 100644
--- a/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp
@@ -155,7 +155,7 @@ bool JavaNPObjectGetProperty(NPObject* obj, NPIdentifier identifier, NPVariant*
 
     jvalue value = getJNIField(instance->javaInstance(),
                                field->getJNIType(),
-                               field->name().UTF8String(),
+                               field->name().utf8(),
                                field->type());
 
     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(); }
 

-- 
WebKit Debian packaging