summaryrefslogtreecommitdiffstats
path: root/WebCore/bridge/jni/jni_jsobject.h
diff options
context:
space:
mode:
authorFeng Qian <fqian@google.com>2009-06-17 12:12:20 -0700
committerFeng Qian <fqian@google.com>2009-06-17 12:12:20 -0700
commit5f1ab04193ad0130ca8204aadaceae083aca9881 (patch)
tree5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/bridge/jni/jni_jsobject.h
parent194315e5a908cc8ed67d597010544803eef1ac59 (diff)
downloadexternal_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip
external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz
external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2
Get WebKit r44544.
Diffstat (limited to 'WebCore/bridge/jni/jni_jsobject.h')
-rw-r--r--WebCore/bridge/jni/jni_jsobject.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/bridge/jni/jni_jsobject.h b/WebCore/bridge/jni/jni_jsobject.h
index 4125565..b4f5719 100644
--- a/WebCore/bridge/jni/jni_jsobject.h
+++ b/WebCore/bridge/jni/jni_jsobject.h
@@ -42,6 +42,7 @@ namespace JSC {
class ArgList;
class ExecState;
class JSObject;
+class MarkedArgumentBuffer;
namespace Bindings {
@@ -90,9 +91,9 @@ public:
static jvalue invoke(JSObjectCallContext*);
- jobject convertValueToJObject(JSValuePtr) const;
- JSValuePtr convertJObjectToValue(ExecState*, jobject) const;
- void getListFromJArray(ExecState*, jobjectArray, ArgList&) const;
+ jobject convertValueToJObject(JSValue) const;
+ JSValue convertJObjectToValue(ExecState*, jobject) const;
+ void getListFromJArray(ExecState*, jobjectArray, MarkedArgumentBuffer&) const;
RootObject* rootObject() const;