summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java107
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java59
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java21
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCScriptable.java195
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java12
5 files changed, 46 insertions, 348 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
index 8423c7a547..fd0259f7ec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/XPCOM.java
@@ -47,7 +47,7 @@ public class XPCOM extends C {
public static final String DOMEVENT_KEYDOWN = "keydown"; //$NON-NLS-1$
public static final String DOMEVENT_KEYPRESS = "keypress"; //$NON-NLS-1$
public static final String DOMEVENT_KEYUP = "keyup"; //$NON-NLS-1$
-
+
/* CID constants */
public static final nsID EXTERNAL_CID = new nsID ("f2c59ad0-bd76-11dd-ad8b-0800200c9a66"); //$NON-NLS-1$
public static final nsID NS_APPSHELL_CID = new nsID("2d96b3df-c051-11d1-a827-0040959a28c9"); //$NON-NLS-1$
@@ -62,6 +62,10 @@ public class XPCOM extends C {
public static final nsID NS_PROMPTER_CID = new nsID("f2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
public static final nsID NS_PROMPTSERVICE_CID = new nsID("a2112d6a-0e28-421f-b46a-25c0b308cbd0"); //$NON-NLS-1$
public static final nsID NS_IWEBBROWSER_CID = new nsID ("F1EAC761-87E9-11d3-AF80-00A024FFC08C"); //$NON-NLS-1$
+ public static final nsID NS_IXPCONNECT_CID = new nsID ("CB6593E0-F9B2-11d2-BDD6-000064657374"); //$NON-NLS-1$
+
+ public static final nsID NS_ISCRIPTOBJECTOWNER_IID = new nsID ("8f6bca7e-ce42-11d1-b724-00600891d8c9"); //$NON-NLS-1$
+ public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID = new nsID ("0dad9e8c-a12d-4dcb-9a6f-7d09839356e1"); //$NON-NLS-1$
public static final String EXTERNAL_CONTRACTID = "@eclipse.org/external;1"; //$NON-NLS-1$
public static final String NS_AUTHPROMPTER_CONTRACTID = "@mozilla.org/passwordmanager/authpromptfactory;1"; //$NON-NLS-1$
@@ -147,6 +151,13 @@ public class XPCOM extends C {
public static final int SEC_ERROR_UNTRUSTED_ISSUER = 0x805A1FEC;
public static final int SSL_ERROR_BAD_CERT_DOMAIN = 0x805A2FF4;
+ /* JSAPI constants */
+ public static final int JSPROP_ENUMERATE = 0x1;
+ public static final int JSPROP_PERMANENT = 0x4;
+ public static final int JSPROP_READONLY = 0x2;
+ public static final int JS_FALSE = 0x0;
+ public static final int JS_TRUE = 0x1;
+
public static final native int nsDynamicFunctionLoad_sizeof ();
public static void memmove(int /*long*/ dest, boolean[] src) {
@@ -191,6 +202,9 @@ public static final native void memmove(int /*long*/ dest, nsID src, int nbytes)
public static final native int strlen_PRUnichar(int /*long*/ s);
/** @method flags=no_gen */
+public static final native int /*long*/ CALLBACK_JSNative(int /*long*/ func);
+
+/** @method flags=no_gen */
public static final native int /*long*/ _JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags);
public static final int /*long*/ JS_DefineFunction(byte[] mozillaPath, int /*long*/ cx, int /*long*/ obj, byte[] name, int /*long*/ call, int nargs, int flags) {
lock.lock();
@@ -221,26 +235,6 @@ public static final int /*long*/ JS_GetGlobalObject(byte[] mozillaPath, int /*lo
}
}
/** @method flags=no_gen */
-public static final native int /*long*/ _JS_GetGlobalForScopeChain(byte[] mozillaPath, int /*long*/ cx);
-public static final int /*long*/ JS_GetGlobalForScopeChain(byte[] mozillaPath, int /*long*/ cx) {
- lock.lock();
- try {
- return _JS_GetGlobalForScopeChain(mozillaPath, cx);
- } finally {
- lock.unlock();
- }
-}
-/** @method flags=no_gen */
-public static final native int /*long*/ _JSVAL_TO_IMPL2(byte[] mozillaPath, int /*long*/ cx);
-public static final int /*long*/ JSVAL_TO_IMPL2(byte[] mozillaPath, int /*long*/ cx) {
- lock.lock();
- try {
- return _JSVAL_TO_IMPL2(mozillaPath, cx);
- } finally {
- lock.unlock();
- }
-}
-/** @method flags=no_gen */
public static final native int /*long*/ _JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent);
public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ cx, int /*long*/ clasp, int /*long*/ proto, int /*long*/ parent) {
lock.lock();
@@ -251,46 +245,6 @@ public static final int /*long*/ JS_NewObject(byte[] mozillaPath, int /*long*/ c
}
}
/** @method flags=no_gen */
-public static final native int /*long*/ _JS_ValueToString(byte[] mozillaPath, int /*long*/ cx, int /*long*/ string);
-public static final int /*long*/ JS_ValueToString(byte[] mozillaPath, int /*long*/ cx, int /*long*/ string) {
- lock.lock();
- try {
- return _JS_ValueToString(mozillaPath, cx, string);
- } finally {
- lock.unlock();
- }
-}
-/** @method flags=no_gen */
-public static final native int /*long*/ _JS_TypeOfValue(byte[] mozillaPath, int /*long*/ cx, int /*long*/ value);
-public static final int /*long*/ JS_TypeOfValue(byte[] mozillaPath, int /*long*/ cx, int /*long*/ value) {
- lock.lock();
- try {
- return _JS_TypeOfValue(mozillaPath, cx, value);
- } finally {
- lock.unlock();
- }
-}
-/** @method flags=no_gen */
-public static final native int /*long*/ _JS_GetStringCharsZ(byte[] mozillaPath, int /*long*/ cx, int /*long*/ string);
-public static final int /*long*/ JS_GetStringCharsZ(byte[] mozillaPath, int /*long*/ cx, int /*long*/ string) {
- lock.lock();
- try {
- return _JS_GetStringCharsZ(mozillaPath, cx, string);
- } finally {
- lock.unlock();
- }
-}
-/** @method flags=no_gen */
-public static final native int /*long*/ _JS_GetStringLength(byte[] mozillaPath, int /*long*/ string);
-public static final int /*long*/ JS_GetStringLength(byte[] mozillaPath, int /*long*/ string) {
- lock.lock();
- try {
- return _JS_GetStringLength(mozillaPath, string);
- } finally {
- lock.unlock();
- }
-}
-/** @method flags=no_gen */
public static final native boolean _NS_Free(byte[] mozillaPath, int /*long*/ aPtr);
public static final boolean NS_Free(byte[] mozillaPath, int /*long*/ aPtr) {
lock.lock();
@@ -439,19 +393,6 @@ public static final int /*long*/ nsIScriptGlobalObject_GetScriptContext(int /*lo
* @method flags=cpp
* @param ptr cast=(nsIScriptContext *)
*/
-public static final native int /*long*/ _nsIScriptContext_GetGlobalObject(int /*long*/ ptr);
-public static final int /*long*/ nsIScriptContext_GetGlobalObject(int /*long*/ ptr) {
- lock.lock();
- try {
- return _nsIScriptContext_GetGlobalObject(ptr);
- } finally {
- lock.unlock();
- }
-}
-/**
- * @method flags=cpp
- * @param ptr cast=(nsIScriptContext *)
- */
public static final native int /*long*/ _nsIScriptContext_GetNativeContext(int /*long*/ ptr);
public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/ ptr) {
lock.lock();
@@ -461,7 +402,6 @@ public static final int /*long*/ nsIScriptContext_GetNativeContext(int /*long*/
lock.unlock();
}
}
-
/**
* @method flags=cpp
* @param ptr cast=(nsEmbedCString *)
@@ -1707,6 +1647,15 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg
lock.unlock();
}
}
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long arg3) {
+ lock.lock();
+ try {
+ return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3);
+ } finally {
+ lock.unlock();
+ }
+}
static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3);
static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, long arg1, long arg2, long[] arg3) {
lock.lock();
@@ -2591,12 +2540,4 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
}
}
-
-// added by nsIXPConnect
-//static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, !ERROR UNKNOWN C TYPE <PRInt16 >! arg0);
-//static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/[] arg0);
-//static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, !ERROR UNKNOWN C TYPE <bool >! arg0, !ERROR UNKNOWN C TYPE <bool >! arg1);
-//static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, nsID arg0, int /*long*/[] arg1);
-//static final native int VtblCall(int fnNumber, int /*long*/ ppVtbl, int /*long*/ arg0, int /*long*/ arg1, short arg2, int /*long*/ arg3, int /*long*/[] arg4, int /*long*/[] arg5);
-
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
deleted file mode 100644
index 017ed674bb..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISecurityCheckedComponent.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsISecurityCheckedComponent extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 4;
-
- public static final String NS_ISECURITYCHECKEDCOMPONENT_IID_STR =
- "0dad9e8c-a12d-4dcb-9a6f-7d09839356e1";
-
- public static final nsID NS_ISECURITYCHECKEDCOMPONENT_IID =
- new nsID(NS_ISECURITYCHECKEDCOMPONENT_IID_STR);
-
- public nsISecurityCheckedComponent(int /*long*/ address) {
- super(address);
- }
-
- public int CanCreateWrapper(int /*long*/ iid, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), iid, _retval);
- }
-
- public int CanCallMethod(int /*long*/ iid, char[] methodName, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), iid, methodName, _retval);
- }
-
- public int CanGetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), iid, propertyName, _retval);
- }
-
- public int CanSetProperty(int /*long*/ iid, char[] propertyName, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), iid, propertyName, _retval);
- }
-}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
index 2de3baf3fc..1d8df8effd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIVariant.java
@@ -29,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
public class nsIVariant extends nsISupports {
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 26;
+ static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26);
public static final String NS_IVARIANT_IID_STR =
"6c9eb060-8c6a-11d5-90f3-0010a4e73d9a";
+ public static final String NS_IVARIANT_10_IID_STR =
+ "81e4c2de-acac-4ad6-901a-b5fb1b851a0d";
+
public static final nsID NS_IVARIANT_IID =
new nsID(NS_IVARIANT_IID_STR);
+ public static final nsID NS_IVARIANT_10_IID =
+ new nsID(NS_IVARIANT_10_IID_STR);
+
public nsIVariant(int /*long*/ address) {
super(address);
}
@@ -129,19 +135,24 @@ public class nsIVariant extends nsISupports {
return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), _retval);
}
+ public int GetAsJSVal(int /*long*/[] _retval) {
+ if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), _retval);
+ }
+
public int GetAsInterface(int /*long*/[] iid, int /*long*/[] iface) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), iid, iface);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), iid, iface);
}
public int GetAsArray(short[] type, int /*long*/ iid, int[] count, int /*long*/[] ptr) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), type, iid, count, ptr);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 24), getAddress(), type, iid, count, ptr);
}
public int GetAsStringWithSize(int[] size, int /*long*/[] str) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), size, str);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 25), getAddress(), size, str);
}
public int GetAsWStringWithSize(int[] size, int /*long*/[] str) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), size, str);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26), getAddress(), size, str);
}
}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCScriptable.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCScriptable.java
deleted file mode 100644
index 9429de65d6..0000000000
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPCScriptable.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by Netscape are Copyright (C) 1998-1999
- * Netscape Communications Corporation. All Rights Reserved.
- *
- * Contributor(s):
- *
- * IBM
- * - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
- *
- * ***** END LICENSE BLOCK ***** */
-package org.eclipse.swt.internal.mozilla;
-
-public class nsIXPCScriptable extends nsISupports {
-
- static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 22;
-
- public static final String NS_IXPCSCRIPTABLE_IID_STR =
- "a40ce52e-2d8c-400f-9af2-f8784a656070";
-
- public static final nsID NS_IXPCSCRIPTABLE_IID =
- new nsID(NS_IXPCSCRIPTABLE_IID_STR);
-
- public nsIXPCScriptable(int /*long*/ address) {
- super(address);
- }
-
- public static final int WANT_PRECREATE = 1;
-
- public static final int WANT_CREATE = 2;
-
- public static final int WANT_POSTCREATE = 4;
-
- public static final int WANT_ADDPROPERTY = 8;
-
- public static final int WANT_DELPROPERTY = 16;
-
- public static final int WANT_GETPROPERTY = 32;
-
- public static final int WANT_SETPROPERTY = 64;
-
- public static final int WANT_ENUMERATE = 128;
-
- public static final int WANT_NEWENUMERATE = 256;
-
- public static final int WANT_NEWRESOLVE = 512;
-
- public static final int WANT_CONVERT = 1024;
-
- public static final int WANT_FINALIZE = 2048;
-
- public static final int WANT_CHECKACCESS = 4096;
-
- public static final int WANT_CALL = 8192;
-
- public static final int WANT_CONSTRUCT = 16384;
-
- public static final int WANT_HASINSTANCE = 32768;
-
- public static final int WANT_TRACE = 65536;
-
- public static final int USE_JSSTUB_FOR_ADDPROPERTY = 131072;
-
- public static final int USE_JSSTUB_FOR_DELPROPERTY = 262144;
-
- public static final int USE_JSSTUB_FOR_SETPROPERTY = 524288;
-
- public static final int DONT_ENUM_STATIC_PROPS = 1048576;
-
- public static final int DONT_ENUM_QUERY_INTERFACE = 2097152;
-
- public static final int DONT_ASK_INSTANCE_FOR_SCRIPTABLE = 4194304;
-
- public static final int CLASSINFO_INTERFACES_ONLY = 8388608;
-
- public static final int ALLOW_PROP_MODS_DURING_RESOLVE = 16777216;
-
- public static final int ALLOW_PROP_MODS_TO_PROTOTYPE = 33554432;
-
- public static final int DONT_SHARE_PROTOTYPE = 67108864;
-
- public static final int DONT_REFLECT_INTERFACE_NAMES = 134217728;
-
- public static final int WANT_EQUALITY = 268435456;
-
- public static final int WANT_OUTER_OBJECT = 536870912;
-
- public static final int USE_STUB_EQUALITY_HOOK = 1073741824;
-
- public static final int RESERVED = 2147483648;
-
- public int GetClassName(int /*long*/[] aClassName) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aClassName);
- }
-
- public int GetScriptableFlags(int[] aScriptableFlags) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aScriptableFlags);
- }
-
- public int PreCreate(int /*long*/ nativeObj, int /*long*/ cx, int /*long*/ globalObj, int /*long*/[] parentObj) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), nativeObj, cx, globalObj, parentObj);
- }
-
- public int Create(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 4, getAddress(), wrapper, cx, obj);
- }
-
- public int PostCreate(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), wrapper, cx, obj);
- }
-
- public int AddProperty(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, !ERROR UNKNOWN C TYPE <jsid >! id, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), wrapper, cx, obj, id, vp, _retval);
- }
-
- public int DelProperty(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, !ERROR UNKNOWN C TYPE <jsid >! id, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), wrapper, cx, obj, id, vp, _retval);
- }
-
- public int GetProperty(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, !ERROR UNKNOWN C TYPE <jsid >! id, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), wrapper, cx, obj, id, vp, _retval);
- }
-
- public int SetProperty(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, !ERROR UNKNOWN C TYPE <jsid >! id, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), wrapper, cx, obj, id, vp, _retval);
- }
-
- public int Enumerate(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), wrapper, cx, obj, _retval);
- }
-
- public int NewEnumerate(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int enum_op, int /*long*/ statep, int /*long*/ idp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), wrapper, cx, obj, enum_op, statep, idp, _retval);
- }
-
- public int NewResolve(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, !ERROR UNKNOWN C TYPE <jsid >! id, int flags, int /*long*/[] objp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), wrapper, cx, obj, id, flags, objp, _retval);
- }
-
- public int Convert(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int type, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), wrapper, cx, obj, type, vp, _retval);
- }
-
- public int Finalize(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), wrapper, cx, obj);
- }
-
- public int CheckAccess(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, !ERROR UNKNOWN C TYPE <jsid >! id, int mode, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), wrapper, cx, obj, id, mode, vp, _retval);
- }
-
- public int Call(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int argc, int /*long*/ argv, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), wrapper, cx, obj, argc, argv, vp, _retval);
- }
-
- public int Construct(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int argc, int /*long*/ argv, int /*long*/ vp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), wrapper, cx, obj, argc, argv, vp, _retval);
- }
-
- public int HasInstance(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int /*long*/ val, int /*long*/ bp, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), wrapper, cx, obj, val, bp, _retval);
- }
-
- public int Trace(int /*long*/ wrapper, int /*long*/ trc, int /*long*/ obj) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), wrapper, trc, obj);
- }
-
- public int Equality(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int /*long*/ val, int /*long*/ _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), wrapper, cx, obj, val, _retval);
- }
-
- public int OuterObject(int /*long*/ wrapper, int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), wrapper, cx, obj, _retval);
- }
-
- public int PostCreatePrototype(int /*long*/ cx, int /*long*/ proto) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), cx, proto);
- }
-} \ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
index 9ab32d7381..dc49321651 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIXPConnect.java
@@ -22,7 +22,7 @@
*
* IBM
* - Binding to permit interfacing between Mozilla and SWT
- * - Copyright (C) 2003, 2009 IBM Corp. All Rights Reserved.
+ * - Copyright (C) 2012 IBM Corp. All Rights Reserved.
*
* ***** END LICENSE BLOCK ***** */
package org.eclipse.swt.internal.mozilla;
@@ -41,11 +41,11 @@ public class nsIXPConnect extends nsISupports {
super(address);
}
- public int Equals(int /*long*/ other, int[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);
- }
-
public int JSValToVariant(int /*long*/ cx, int /*long*/ aJSVal, int /*long*/[] _retval) {
- return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), cx, aJSVal, _retval);
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), cx, aJSVal, _retval);
+ }
+
+ public int VariantToJS(int /*long*/ ctx, int /*long*/ scope, int /*long*/ value, int /*long*/ _retval) {
+ return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), ctx, scope, value, _retval);
}
}
generated by cgit (git 2.34.1) at 2024-07-04 04:24:54 +0000