diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-11 12:11:56 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-11 12:11:56 -0700 |
| commit | e67bd8de533debe80a307056f0f62065d6fd5041 (patch) | |
| tree | 54f2ebb40b0005ec0d6bd3976cc1e8fb47cae5ff /WebCore/bridge/jni | |
| parent | ba96c5ad9d140287cc378faec6bd9384836a00e6 (diff) | |
| download | external_webkit-e67bd8de533debe80a307056f0f62065d6fd5041.zip external_webkit-e67bd8de533debe80a307056f0f62065d6fd5041.tar.gz external_webkit-e67bd8de533debe80a307056f0f62065d6fd5041.tar.bz2 | |
auto import from //branches/cupcake/...@137873
Diffstat (limited to 'WebCore/bridge/jni')
| -rw-r--r-- | WebCore/bridge/jni/jni_instance.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebCore/bridge/jni/jni_instance.h b/WebCore/bridge/jni/jni_instance.h index c2e0d9d..551b8e7 100644 --- a/WebCore/bridge/jni/jni_instance.h +++ b/WebCore/bridge/jni/jni_instance.h @@ -33,6 +33,12 @@ #include <JavaVM/jni.h> +#if PLATFORM(ANDROID) +namespace android { +class WeakJavaInstance; +} +#endif + namespace JSC { namespace Bindings { @@ -46,6 +52,9 @@ friend class JavaArray; friend class JavaField; friend class JavaInstance; friend class JavaMethod; +#if PLATFORM(ANDROID) +friend class android::WeakJavaInstance; +#endif protected: JObjectWrapper(jobject instance); @@ -92,7 +101,9 @@ protected: virtual void virtualBegin(); virtual void virtualEnd(); +#if !PLATFORM(ANDROID) // Submit patch to webkit.org private: +#endif JavaInstance(jobject instance, PassRefPtr<RootObject>); RefPtr<JObjectWrapper> _instance; |