diff options
| author | Lakshmi Shanmugam <lshanmug@in.ibm.com> | 2013-02-07 17:26:41 +0530 |
|---|---|---|
| committer | Lakshmi Shanmugam <lshanmug@in.ibm.com> | 2013-02-07 18:19:42 +0530 |
| commit | 9bdefd6f55a8680c1bee734377033432d34519c2 (patch) | |
| tree | 277d3f1c094c388d68d7bf7d155a5c8d8a91a547 | |
| parent | fa723f28f2f267e5615bfd54cf2b83f638a4dc96 (diff) | |
| download | eclipse.platform.swt-9bdefd6f55a8680c1bee734377033432d34519c2.tar.gz eclipse.platform.swt-9bdefd6f55a8680c1bee734377033432d34519c2.tar.xz eclipse.platform.swt-9bdefd6f55a8680c1bee734377033432d34519c2.zip | |
xulrunner 17 interface changes
29 files changed, 505 insertions, 243 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp index 026e178742..a8ee3cc01f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library/xpcom.cpp @@ -57,7 +57,7 @@ JNIEXPORT jint JNICALL XPCOM_NATIVE(_1Call__JJJJ)(JNIEnv *env, jclass that, jint #else XPCOM_NATIVE_ENTER(env, that, _1Call__JJJJ_FUNC); #endif - rc = (jint)((SWT_XREInitEmbedding2)arg0)((nsILocalFile *)arg1, (nsILocalFile *)arg2, (nsIDirectoryServiceProvider *)arg3); + rc = (jint)((SWT_XREInitEmbedding2)arg0)((nsIFile *)arg1, (nsIFile *)arg2, (nsIDirectoryServiceProvider *)arg3); #ifndef JNI64 XPCOM_NATIVE_EXIT(env, that, _1Call__IIII_FUNC); #else diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java index 4781d213f2..727dbeb2cb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/AppFileLocProvider.java @@ -220,7 +220,7 @@ int getFiles (long /*int*/ prop, long /*int*/ _retval) { nsILocalFile localFile = new nsILocalFile (result[0]); result[0] = 0; - rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); + rc = localFile.QueryInterface (Mozilla.Is_17 ? nsIFile.NS_IFILE_17_IID : nsIFile.NS_IFILE_IID, result); if (rc != XPCOM.NS_OK) Mozilla.error (rc); if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); localFile.Release (); @@ -315,7 +315,7 @@ int getFile(long /*int*/ prop, long /*int*/ persistent, long /*int*/ _retval) { nsILocalFile localFile = new nsILocalFile (result [0]); result[0] = 0; - rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); + rc = localFile.QueryInterface (Mozilla.Is_17 ? nsIFile.NS_IFILE_17_IID : nsIFile.NS_IFILE_IID, result); if (rc != XPCOM.NS_OK) Mozilla.error (rc); if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java index 44b9e5fece..2a792f9b09 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/FilePicker.java @@ -91,6 +91,11 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } + if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_17_IID)) { + XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); + AddRef (); + return XPCOM.NS_OK; + } if (guid.Equals (nsIFilePicker.NS_IFILEPICKER_IID)) { XPCOM.memmove(ppvObject, new long /*int*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF); AddRef (); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java index 1f4a55a328..49975b4d92 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/InputStream.java @@ -66,7 +66,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID)) { + if (guid.Equals (nsIInputStream.NS_IINPUTSTREAM_IID) || guid.Equals (nsIInputStream.NS_IINPUTSTREAM_17_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {inputStream.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java index 40f2af1945..98197dc91c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java @@ -62,7 +62,7 @@ class Mozilla extends WebBrowser { static int BrowserCount, NextJSFunctionIndex = 1; static Hashtable AllFunctions = new Hashtable (); static Listener DisplayListener; - static boolean Initialized, IsPre_1_8, IsPre_1_9, IsPre_4, IsXULRunner, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued; + static boolean Initialized, IsPre_1_8, IsPre_1_9, IsPre_4, Is_17 = true, IsXULRunner, PerformedVersionCheck, XPCOMWasGlued, XPCOMInitWasGlued; static boolean IsGettingSiteWindow; static String MozillaPath; static String oldProxyHostFTP, oldProxyHostHTTP, oldProxyHostSSL; @@ -156,7 +156,7 @@ class Mozilla extends WebBrowser { nsILocalFile localFile = new nsILocalFile (result [0]); result[0] = 0; - rc = localFile.QueryInterface (nsIFile.NS_IFILE_IID, result); + rc = localFile.QueryInterface (Mozilla.Is_17 ? nsIFile.NS_IFILE_17_IID : nsIFile.NS_IFILE_IID, result); if (rc != XPCOM.NS_OK) Mozilla.error (rc); if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE); localFile.Release (); @@ -865,6 +865,7 @@ public void create (Composite parent, int style) { } IsPre_1_9 = true; IsPre_4 = true; + Is_17 = true; result[0] = 0; /* @@ -897,10 +898,21 @@ public void create (Composite parent, int style) { } else { /* >= 1.9 */ IsPre_1_9 = false; result[0] = 0; - rc = interfaceRequestor.GetInterface(nsIDocShell.NS_IDOCSHELL_10_IID, result); - if (rc == XPCOM.NS_OK && result[0] != 0) { /* >= 4.0 */ + rc = interfaceRequestor.GetInterface(nsIDocShell.NS_IDOCSHELL_17_IID, result); + if (rc == XPCOM.NS_OK && result[0] != 0) { /* = 17.0.1 */ IsPre_4 = false; new nsISupports (result[0]).Release(); + } else { + if (result[0] != 0) { + new nsISupports (result[0]).Release(); + result[0] = 0; + } + rc = interfaceRequestor.GetInterface(nsIDocShell.NS_IDOCSHELL_10_IID, result); + if (rc == XPCOM.NS_OK && result[0] != 0) { /* = 10.0 */ + IsPre_4 = false; + Is_17 = false; + new nsISupports (result[0]).Release(); + } } } } @@ -938,7 +950,7 @@ public void create (Composite parent, int style) { } /* add listeners for progress and content */ - rc = webBrowser.AddWebBrowserListener (weakReference.getAddress (), nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID); + rc = webBrowser.AddWebBrowserListener (weakReference.getAddress (), Is_17 ? nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_17_IID : nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID); if (rc != XPCOM.NS_OK) { browser.dispose (); error (rc); @@ -1136,7 +1148,7 @@ void createCOMInterfaces () { public long /*int*/ method4 (long /*int*/[] args) {return FocusPrevElement ();} }; - embeddingSiteWindow = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 1, 1, 1, 1, 1}) { + embeddingSiteWindow = new XPCOMObject (new int[] {2, 0, 0, 5, 5, 0, 1, 1, 1, 1, 1, 0}) { public long /*int*/ method0 (long /*int*/[] args) {return QueryInterface (args[0], args[1]);} public long /*int*/ method1 (long /*int*/[] args) {return AddRef ();} public long /*int*/ method2 (long /*int*/[] args) {return Release ();} @@ -1148,6 +1160,7 @@ void createCOMInterfaces () { public long /*int*/ method8 (long /*int*/[] args) {return GetTitle (args[0]);} public long /*int*/ method9 (long /*int*/[] args) {return SetTitle (args[0]);} public long /*int*/ method10 (long /*int*/[] args) {return GetSiteWindow (args[0]);} + public long /*int*/ method11 (long /*int*/[] args) {return Blur ();} }; interfaceRequestor = new XPCOMObject (new int[] {2, 0, 0, 2} ){ @@ -1293,15 +1306,19 @@ public boolean execute (String script) { nsIServiceManager serviceManager = new nsIServiceManager (result[0]); result[0] = 0; byte[] aContractID = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_SCRIPTSECURITYMANAGER_CONTRACTID, true); - rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_10_IID, result); + rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_17_IID, result); if (!(rc == XPCOM.NS_OK && result[0] != 0)) { result[0] = 0; - rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_191_IID, result); + rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_10_IID, result); if (!(rc == XPCOM.NS_OK && result[0] != 0)) { result[0] = 0; - rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_IID, result); - if (rc == XPCOM.NS_OK && result[0] != 0) { - isXULRunner190x = true; + rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_191_IID, result); + if (!(rc == XPCOM.NS_OK && result[0] != 0)) { + result[0] = 0; + rc = serviceManager.GetServiceByContractID (aContractID, nsIScriptSecurityManager.NS_ISCRIPTSECURITYMANAGER_IID, result); + if (rc == XPCOM.NS_OK && result[0] != 0) { + isXULRunner190x = true; + } } } } @@ -1462,7 +1479,7 @@ static Browser getBrowser (long /*int*/ aDOMWindow) { nsIWebBrowserChrome webBrowserChrome = new nsIWebBrowserChrome (result[0]); result[0] = 0; - rc = webBrowserChrome.QueryInterface (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result); + rc = webBrowserChrome.QueryInterface (Is_17 ? nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_17_IID : nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID, result); if (rc != XPCOM.NS_OK) Mozilla.error (rc); if (result[0] == 0) Mozilla.error (XPCOM.NS_NOINTERFACE); webBrowserChrome.Release (); @@ -1538,7 +1555,7 @@ static String getMozillaPath () { nsIProperties properties = new nsIProperties (result[0]); result[0] = 0; buffer = MozillaDelegate.wcsToMbcs (null, XPCOM.NS_GRE_DIR, true); - rc = properties.Get (buffer, nsIFile.NS_IFILE_IID, result); + rc = properties.Get (buffer, nsIFile.NS_IFILE_17_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); properties.Release (); @@ -1798,7 +1815,7 @@ void initFactories (nsIServiceManager serviceManager, nsIComponentManager compon nsIComponentRegistrar componentRegistrar = new nsIComponentRegistrar (result[0]); result[0] = 0; - componentRegistrar.AutoRegister (0); /* detect the External component */ +// componentRegistrar.AutoRegister (0); /* detect the External component */ PromptService2Factory factory = new PromptService2Factory (); factory.AddRef (); @@ -1972,6 +1989,7 @@ String initMozilla (String mozillaPath) { } void initXPCOM (String mozillaPath, boolean isXULRunner) { + System.out.println("in xpcom"); long /*int*/[] result = new long /*int*/[1]; nsEmbedString pathString = new nsEmbedString (mozillaPath); @@ -1986,7 +2004,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { error (XPCOM.NS_ERROR_NULL_POINTER); } - nsILocalFile localFile = new nsILocalFile (result[0]); + nsIFile localFile = new nsIFile (result[0]); result[0] = 0; if (isXULRunner) { int size = XPCOM.nsDynamicFunctionLoad_sizeof (); @@ -2009,6 +2027,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) { if (rc == XPCOM.NS_OK) { IsPre_4 = false; nsISupports.IsXULRunner10 = true; + nsISupports.IsXULRunner17 = true; } else { /* * XRE_InitEmbedding2 was not found, so fall back to XRE_InitEmbedding, which is @@ -2654,7 +2673,7 @@ void onDispose (Display display) { new nsISupports (badCertRequest).Release (); } - int rc = webBrowser.RemoveWebBrowserListener (weakReference.getAddress (), nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID); + int rc = webBrowser.RemoveWebBrowserListener (weakReference.getAddress (), Is_17 ? nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_17_IID : nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID); if (rc != XPCOM.NS_OK) error (rc); rc = webBrowser.SetParentURIContentListener (0); @@ -3056,7 +3075,7 @@ public boolean setText (String html, boolean trusted) { InputStream inputStream = new InputStream (data); inputStream.AddRef (); - rc = interfaceRequestor.GetInterface (nsIDocShell.NS_IDOCSHELL_IID, result); + rc = interfaceRequestor.GetInterface (Is_17 ? nsIDocShell.NS_IDOCSHELL_17_IID : nsIDocShell.NS_IDOCSHELL_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); nsIDocShell docShell = new nsIDocShell (result[0]); @@ -3251,7 +3270,7 @@ void unhookDOMListeners () { nsIDOMWindow window = new nsIDOMWindow (result[0]); result[0] = 0; - rc = window.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); + rc = window.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_17_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID) : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); nsIDOMEventTarget target = new nsIDOMEventTarget (result[0]); @@ -3278,7 +3297,7 @@ void unhookDOMListeners () { nsIDOMWindow frame = new nsIDOMWindow (result[0]); result[0] = 0; - rc = frame.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); + rc = frame.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_17_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID) : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); @@ -3350,12 +3369,12 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID)) { + if (guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_IID) || guid.Equals (nsIWebProgressListener.NS_IWEBPROGRESSLISTENER_17_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {webProgressListener.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_IID)) { + if (guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_IID) || guid.Equals (nsIWebBrowserChrome.NS_IWEBBROWSERCHROME_17_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {webBrowserChrome.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; @@ -3365,7 +3384,7 @@ int QueryInterface (long /*int*/ riid, long /*int*/ ppvObject) { AddRef (); return XPCOM.NS_OK; } - if (guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID)) { + if (guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_17_IID) || guid.Equals (nsIEmbeddingSiteWindow.NS_IEMBEDDINGSITEWINDOW_IID)) { XPCOM.memmove (ppvObject, new long /*int*/[] {embeddingSiteWindow.getAddress ()}, C.PTR_SIZEOF); AddRef (); return XPCOM.NS_OK; @@ -3427,7 +3446,7 @@ int GetInterface (long /*int*/ riid, long /*int*/ ppvObject) { if (riid == 0 || ppvObject == 0) return XPCOM.NS_ERROR_NO_INTERFACE; nsID guid = new nsID (); XPCOM.memmove (guid, riid, nsID.sizeof); - if (guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_10_IID) || guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_IID)) { + if (guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_17_IID) || guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_10_IID) || guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_IID)) { long /*int*/[] aContentDOMWindow = new long /*int*/[1]; int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow); if (rc != XPCOM.NS_OK) error (rc); @@ -3592,7 +3611,7 @@ int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateF result[0] = 0; nsIDOMWindow domWindow = new nsIDOMWindow (window[0]); - rc = domWindow.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); + rc = domWindow.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_17_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID) : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); domWindow.Release(); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); @@ -3738,7 +3757,7 @@ int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateF result[0] = 0; nsIDOMWindow domWindow = new nsIDOMWindow (window[0]); - rc = domWindow.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); + rc = domWindow.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_17_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID) : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); domWindow.Release(); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); @@ -3848,7 +3867,7 @@ int OnStateChange (long /*int*/ aWebProgress, long /*int*/ aRequest, int aStateF new nsISupports (result[0]).Release (); result[0] = 0; - rc = domWindow.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); + rc = domWindow.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_17_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_10_IID) : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE); @@ -4233,6 +4252,10 @@ int GetSiteWindow (long /*int*/ aSiteWindow) { XPCOM.memmove (aSiteWindow, new long /*int*/[] {siteWindow}, C.PTR_SIZEOF); return XPCOM.NS_OK; } + +int Blur () { + return XPCOM.NS_OK; +} /* nsIWebBrowserChromeFocus */ @@ -4273,7 +4296,7 @@ int FocusPrevElement () { int OnShowContextMenu (int aContextFlags, long /*int*/ aEvent, long /*int*/ aNode) { nsIDOMEvent domEvent = new nsIDOMEvent (aEvent); long /*int*/[] result = new long /*int*/[1]; - int rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); + int rc = domEvent.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_17_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID) :nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); @@ -4535,7 +4558,7 @@ int HandleEvent (long /*int*/ event) { if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) { long /*int*/[] result = new long /*int*/[1]; - rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); + rc = domEvent.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_17_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID) : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]); @@ -4643,7 +4666,7 @@ int HandleEvent (long /*int*/ event) { } long /*int*/[] result = new long /*int*/[1]; - rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); + rc = domEvent.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_17_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID) : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]); @@ -4699,7 +4722,7 @@ int HandleEvent (long /*int*/ event) { if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) { long /*int*/[] result = new long /*int*/[1]; - rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); + rc = domEvent.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_17_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_10_IID) : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); nsIDOMKeyEvent domKeyEvent = new nsIDOMKeyEvent (result[0]); @@ -4756,7 +4779,7 @@ int HandleEvent (long /*int*/ event) { /* mouse event */ long /*int*/[] result = new long /*int*/[1]; - rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); + rc = domEvent.QueryInterface (!IsPre_4 ? (Is_17 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_17_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_10_IID) : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result); if (rc != XPCOM.NS_OK) error (rc); if (result[0] == 0) error (XPCOM.NS_NOINTERFACE); nsIDOMMouseEvent domMouseEvent = new nsIDOMMouseEvent (result[0]); 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 b5c7f2751a..138a591342 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 @@ -619,8 +619,8 @@ public static final int Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, lo /** * @param ptr cast=(SWT_XREInitEmbedding2) - * @param aLibXULDirectory cast=(nsILocalFile *) - * @param aAppDirectory cast=(nsILocalFile *) + * @param aLibXULDirectory cast=(nsIFile *) + * @param aAppDirectory cast=(nsIFile *) * @param aAppDirProvider cast=(nsIDirectoryServiceProvider *) */ public static final native int _Call(long /*int*/ ptr, long /*int*/ aLibXULDirectory, long /*int*/ aAppDirectory, long /*int*/ aAppDirProvider); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java index c67dd14e7c..87934a146a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIAppShell.java @@ -36,6 +36,12 @@ public class nsIAppShell extends nsISupports { public static final nsID NS_IAPPSHELL_IID = new nsID(NS_IAPPSHELL_IID_STR); + + public static final String NS_IAPPSHELL_IID_17_STR = + "2d10ca53-f143-439a-bb2e-c1fbc71f6a05"; + + public static final nsID NS_IAPPSHELL_17_IID = + new nsID(NS_IAPPSHELL_IID_17_STR); public nsIAppShell(long /*int*/ address) { super(address); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java index d67711f3ea..39b3baabbb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIBaseWindow.java @@ -104,19 +104,19 @@ public class nsIBaseWindow extends nsISupports { } public int GetVisibility(int[] aVisibility) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aVisibility); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 16 : 15), getAddress(), aVisibility); } public int SetVisibility(int aVisibility) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aVisibility); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 17 : 16), getAddress(), aVisibility); } public int GetEnabled(int[] aEnabled) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), aEnabled); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 18 : 17), getAddress(), aEnabled); } public int SetEnabled(int aEnabled) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), aEnabled); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 19 : 18), getAddress(), aEnabled); } public int GetBlurSuppression(int[] aBlurSuppression) { @@ -130,18 +130,18 @@ public class nsIBaseWindow extends nsISupports { } public int GetMainWidget(long /*int*/[] aMainWidget) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 21), getAddress(), aMainWidget); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 20 : (IsXULRunner10 ? 19 : 21)), getAddress(), aMainWidget); } public int SetFocus() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 22), getAddress()); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 21 : (IsXULRunner10 ? 20 : 22)), getAddress()); } public int GetTitle(long /*int*/[] aTitle) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 23), getAddress(), aTitle); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 22 : (IsXULRunner10 ? 21 : 23)), getAddress(), aTitle); } public int SetTitle(char[] aTitle) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 24), getAddress(), aTitle); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 23 : (IsXULRunner10 ? 22 : 24)), getAddress(), aTitle); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java index 7140219d74..c0c5a5f49d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIComponentManager.java @@ -34,8 +34,14 @@ public class nsIComponentManager extends nsISupports { public static final String NS_ICOMPONENTMANAGER_IID_STR = "a88e5a60-205a-4bb1-94e1-2628daf51eae"; + public static final String NS_ICOMPONENTMANAGER_17_IID_STR = + "1d940426-5fe5-42c3-84ae-a300f2d9ebd5"; + public static final nsID NS_ICOMPONENTMANAGER_IID = - new nsID(NS_ICOMPONENTMANAGER_IID_STR); + new nsID(NS_ICOMPONENTMANAGER_IID_STR); + + public static final nsID NS_ICOMPONENTMANAGER_17_IID = + new nsID(NS_ICOMPONENTMANAGER_17_IID_STR); public nsIComponentManager(long /*int*/ address) { super(address); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java index 2ff7477231..02b9af84f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMDocument.java @@ -29,13 +29,16 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMDocument extends nsIDOMNode { - static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 61 : 17); + static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 63 : (IsXULRunner10 ? 61 : 17)); public static final String NS_IDOMDOCUMENT_IID_STR = "a6cf9075-15b3-11d2-932e-00805f8add32"; public static final String NS_IDOMDOCUMENT_10_IID_STR = "5c3bff4d-ae7f-4c93-948c-519589672c30"; + + public static final String NS_IDOMDOCUMENT_17_IID_STR = + "fdb92f4f-c6b4-4509-a29d-a309981e28ac"; public static final nsID NS_IDOMDOCUMENT_IID = new nsID(NS_IDOMDOCUMENT_IID_STR); @@ -43,6 +46,9 @@ public class nsIDOMDocument extends nsIDOMNode { public static final nsID NS_IDOMDOCUMENT_10_IID = new nsID(NS_IDOMDOCUMENT_10_IID_STR); + public static final nsID NS_IDOMDOCUMENT_17_IID = + new nsID(NS_IDOMDOCUMENT_17_IID_STR); + public nsIDOMDocument(long /*int*/ address) { super(address); } @@ -309,41 +315,41 @@ public class nsIDOMDocument extends nsIDOMNode { public int GetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 56 : 54), getAddress(), cx, aOnreadystatechange); } public int SetOnreadystatechange(long /*int*/ cx, long /*int*/ aOnreadystatechange) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 57 : 55), getAddress(), cx, aOnreadystatechange); } public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 58 : 56), getAddress(), cx, aOnmouseenter); } public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 59 : 57), getAddress(), cx, aOnmouseenter); } public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 60 : 58), getAddress(), cx, aOnmouseleave); } public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 59, getAddress(), cx, aOnmouseleave); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 61 : 59), getAddress(), cx, aOnmouseleave); } public int GetMozHidden(int[] aMozHidden) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 60, getAddress(), aMozHidden); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 62 : 60), getAddress(), aMozHidden); } public int GetMozVisibilityState(long /*int*/ aMozVisibilityState) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 61, getAddress(), aMozVisibilityState); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 63 : 61), getAddress(), aMozVisibilityState); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java index 0d30cbd4fb..1ecb4ecc84 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMElement.java @@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMElement extends nsIDOMNode { - static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 16); + static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 47 : (IsXULRunner10 ? 20 : 16)); public static final String NS_IDOMELEMENT_IID_STR = "a6cf9078-15b3-11d2-932e-00805f8add32"; @@ -37,12 +37,18 @@ public class nsIDOMElement extends nsIDOMNode { public static final String NS_IDOMELEMENT_10_IID_STR = "1f249e8b-7b41-44c0-a8d5-15298c1198cd"; + public static final String NS_IDOMELEMENT_17_IID_STR = + "69d44ce2-b544-49a8-bb5f-87804b971ee4"; + public static final nsID NS_IDOMELEMENT_IID = new nsID(NS_IDOMELEMENT_IID_STR); - + public static final nsID NS_IDOMELEMENT_10_IID = new nsID(NS_IDOMELEMENT_10_IID_STR); + public static final nsID NS_IDOMELEMENT_17_IID = + new nsID(NS_IDOMELEMENT_17_IID_STR); + public nsIDOMElement(long /*int*/ address) { super(address); } @@ -52,82 +58,82 @@ public class nsIDOMElement extends nsIDOMNode { } public int GetAttribute(long /*int*/ name, long /*int*/ _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 2, getAddress(), name, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 3 : 2), getAddress(), name, _retval); } public int SetAttribute(long /*int*/ name, long /*int*/ value) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 3, getAddress(), name, value); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 5 : 3), getAddress(), name, value); } public int RemoveAttribute(long /*int*/ name) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 4, getAddress(), name); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 7 : 4), getAddress(), name); } public int GetAttributeNode(long /*int*/ name, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 5, getAddress(), name, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 11 : 5), getAddress(), name, _retval); } public int SetAttributeNode(long /*int*/ newAttr, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 6, getAddress(), newAttr, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 12 : 6), getAddress(), newAttr, _retval); } public int RemoveAttributeNode(long /*int*/ oldAttr, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 7, getAddress(), oldAttr, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 13 : 7), getAddress(), oldAttr, _retval); } public int GetElementsByTagName(long /*int*/ name, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 8, getAddress(), name, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 16 : 8), getAddress(), name, _retval); } public int GetAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/ _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 9, getAddress(), namespaceURI, localName, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 4 : 9), getAddress(), namespaceURI, localName, _retval); } public int SetAttributeNS(long /*int*/ namespaceURI, long /*int*/ qualifiedName, long /*int*/ value) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 10, getAddress(), namespaceURI, qualifiedName, value); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 6 : 10), getAddress(), namespaceURI, qualifiedName, value); } public int RemoveAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), namespaceURI, localName); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 8 : 11), getAddress(), namespaceURI, localName); } public int GetAttributeNodeNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), namespaceURI, localName, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 14 : 12), getAddress(), namespaceURI, localName, _retval); } public int SetAttributeNodeNS(long /*int*/ newAttr, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), newAttr, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 15 : 13), getAddress(), newAttr, _retval); } public int GetElementsByTagNameNS(long /*int*/ namespaceURI, long /*int*/ localName, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, localName, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 17 : 14), getAddress(), namespaceURI, localName, _retval); } public int HasAttribute(long /*int*/ name, int[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), name, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 9 : 15), getAddress(), name, _retval); } public int HasAttributeNS(long /*int*/ namespaceURI, long /*int*/ localName, int[] _retval) { - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 10 : 16), getAddress(), namespaceURI, localName, _retval); } public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 25 : 17), getAddress(), cx, aOnmouseenter); } public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 26 : 18), getAddress(), cx, aOnmouseenter); } public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 27 : 19), getAddress(), cx, aOnmouseleave); } public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), cx, aOnmouseleave); + return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner17 ? 28 : 20), getAddress(), cx, aOnmouseleave); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java index a031d616b4..f7bfcab904 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEvent.java @@ -29,13 +29,16 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMEvent extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 10); + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 25 : (IsXULRunner10 ? 12 : 10)); public static final String NS_IDOMEVENT_IID_STR = "a66b7b80-ff46-bd97-0080-5f8ae38add32"; public static final String NS_IDOMEVENT_10_IID_STR = "e85cff74-951f-45c1-be0c-89442ea2f500"; + + public static final String NS_IDOMEVENT_17_IID_STR = + "270c945b-8a65-4170-bc0b-4ec1443cd39f"; public static final nsID NS_IDOMEVENT_IID = new nsID(NS_IDOMEVENT_IID_STR); @@ -43,6 +46,9 @@ public class nsIDOMEvent extends nsISupports { public static final nsID NS_IDOMEVENT_10_IID = new nsID(NS_IDOMEVENT_10_IID_STR); + public static final nsID NS_IDOMEVENT_17_IID = + new nsID(NS_IDOMEVENT_17_IID_STR); + public nsIDOMEvent(long /*int*/ address) { super(address); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java index 891bfe9e75..809f08ed38 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMEventTarget.java @@ -37,12 +37,18 @@ public class nsIDOMEventTarget extends nsISupports { public static final String NS_IDOMEVENTTARGET_10_IID_STR = "1797d5a4-b12a-428d-9eef-a0e13839728c"; + public static final String NS_IDOMEVENTTARGET_17_IID_STR = + "8e375931-298d-4d0a-9cb4-5668f0cdc5a8"; + public static final nsID NS_IDOMEVENTTARGET_IID = new nsID(NS_IDOMEVENTTARGET_IID_STR); public static final nsID NS_IDOMEVENTTARGET_10_IID = new nsID(NS_IDOMEVENTTARGET_10_IID_STR); + public static final nsID NS_IDOMEVENTTARGET_17_IID = + new nsID(NS_IDOMEVENTTARGET_17_IID_STR); + public nsIDOMEventTarget(long /*int*/ address) { super(address); } @@ -58,10 +64,10 @@ public class nsIDOMEventTarget extends nsISupports { } public int RemoveEventListener(long /*int*/ type, long /*int*/ listener, int useCapture) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), type, listener, useCapture); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 3 : 2), getAddress(), type, listener, useCapture); } public int DispatchEvent(long /*int*/ evt, int[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 3, getAddress(), evt, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 5 : 3), getAddress(), evt, _retval); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java index dd1cbb4469..3428ff4ff8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMKeyEvent.java @@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMKeyEvent extends nsIDOMUIEvent { - static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 7; + static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 9 : 7); public static final String NS_IDOMKEYEVENT_IID_STR = "028e0e6e-8b01-11d3-aae7-0010838a3123"; @@ -37,12 +37,18 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent { public static final String NS_IDOMKEYEVENT_10_IID_STR = "def974c3-b491-481b-bc67-29174af4b26a"; + public static final String NS_IDOMKEYEVENT_17_IID_STR = + "5d116380-8432-48cb-a717-200f04c39d2f"; + public static final nsID NS_IDOMKEYEVENT_IID = new nsID(NS_IDOMKEYEVENT_IID_STR); public static final nsID NS_IDOMKEYEVENT_10_IID = new nsID(NS_IDOMKEYEVENT_10_IID_STR); + public static final nsID NS_IDOMKEYEVENT_17_IID = + new nsID(NS_IDOMKEYEVENT_17_IID_STR); + public nsIDOMKeyEvent(long /*int*/ address) { super(address); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java index e4e99ee43b..27b9714977 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMMouseEvent.java @@ -29,19 +29,25 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMMouseEvent extends nsIDOMUIEvent { - static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 11); + static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 18 :(IsXULRunner10 ? 14 : 11)); public static final String NS_IDOMMOUSEEVENT_IID_STR = "ff751edc-8b02-aae7-0010-8301838a3123"; public static final String NS_IDOMMOUSEEVENT_10_IID_STR = "7f57aa45-6792-4d8b-ba5b-201533cf0b2f"; + + public static final String NS_IDOMMOUSEEVENT_17_IID_STR = + "796c3436-5f89-4145-be3a-49808c09fdc6"; public static final nsID NS_IDOMMOUSEEVENT_IID = new nsID(NS_IDOMMOUSEEVENT_IID_STR); public static final nsID NS_IDOMMOUSEEVENT_10_IID = new nsID(NS_IDOMMOUSEEVENT_10_IID_STR); + + public static final nsID NS_IDOMMOUSEEVENT_17_IID = + new nsID(NS_IDOMMOUSEEVENT_17_IID_STR); public nsIDOMMouseEvent(long /*int*/ address) { super(address); @@ -56,39 +62,39 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent { } public int GetClientX(int[] aClientX) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 3, getAddress(), aClientX); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 5 : 3), getAddress(), aClientX); } public int GetClientY(int[] aClientY) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 4, getAddress(), aClientY); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 6 : 4), getAddress(), aClientY); } public int GetCtrlKey(int[] aCtrlKey) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 5, getAddress(), aCtrlKey); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 7 : 5), getAddress(), aCtrlKey); } public int GetShiftKey(int[] aShiftKey) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 6, getAddress(), aShiftKey); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 8 : 6), getAddress(), aShiftKey); } public int GetAltKey(int[] aAltKey) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 7, getAddress(), aAltKey); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 9 : 7), getAddress(), aAltKey); } public int GetMetaKey(int[] aMetaKey) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 8, getAddress(), aMetaKey); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 10 : 8), getAddress(), aMetaKey); } public int GetButton(short[] aButton) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 9, getAddress(), aButton); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 11 : 9), getAddress(), aButton); } public int GetRelatedTarget(long /*int*/[] aRelatedTarget) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 10, getAddress(), aRelatedTarget); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 13 : 10), getAddress(), aRelatedTarget); } public int InitMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg) { - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 11, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 14 : 11), getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg); } /* the following constants are defined in Mozilla 10 */ @@ -102,17 +108,17 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent { public int GetMozPressure(float[] aMozPressure) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 12, getAddress(), aMozPressure); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 15 : 12), getAddress(), aMozPressure); } public int GetMozInputSource(short[] aMozInputSource) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 13, getAddress(), aMozInputSource); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 16 : 13), getAddress(), aMozInputSource); } public int InitNSMouseEvent(long /*int*/ typeArg, int canBubbleArg, int cancelableArg, long /*int*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, long /*int*/ relatedTargetArg, float pressure, short inputSourceArg) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 14, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg, pressure, inputSourceArg); + return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner17 ? 17 : 14), getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg, screenXArg, screenYArg, clientXArg, clientYArg, ctrlKeyArg, altKeyArg, shiftKeyArg, metaKeyArg, buttonArg, relatedTargetArg, pressure, inputSourceArg); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java index 2437ff288b..f7e8f4a76e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMNode.java @@ -29,13 +29,16 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMNode extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 36 : 25); + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + ((IsXULRunner10 || IsXULRunner17) ? 36 : 25); public static final String NS_IDOMNODE_IID_STR = "a6cf907c-15b3-11d2-932e-00805f8add32"; public static final String NS_IDOMNODE_10_IID_STR = "ce82fb71-60f2-4c38-be31-de5f2f90dada"; + + public static final String NS_IDOMNODE_17_IID_STR = + "5e9bcec9-5928-4f77-8a9c-424ef01c20e1"; public static final nsID NS_IDOMNODE_IID = new nsID(NS_IDOMNODE_IID_STR); @@ -43,6 +46,9 @@ public class nsIDOMNode extends nsISupports { public static final nsID NS_IDOMNODE_10_IID = new nsID(NS_IDOMNODE_10_IID_STR); + public static final nsID NS_IDOMNODE_17_IID = + new nsID(NS_IDOMNODE_17_IID_STR); + public nsIDOMNode(long /*int*/ address) { super(address); } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java index e2d80f628f..9d8ec5a49a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMWindow.java @@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla; public class nsIDOMWindow extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 129 : 17); + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 139 : (IsXULRunner10 ? 129 : 17)); public static final String NS_IDOMWINDOW_IID_STR = "a6cf906b-15b3-11d2-932e-00805f8add32"; @@ -37,11 +37,17 @@ public class nsIDOMWindow extends nsISupports { public static final String NS_IDOMWINDOW_10_IID_STR = "8f577294-d572-4473-94b1-d2c5a74a2a74"; + public static final String NS_IDOMWINDOW_17_IID_STR = + "a1af6cd9-c6e7-4037-99f8-dbca1b03e345"; + public static final nsID NS_IDOMWINDOW_IID = new nsID(NS_IDOMWINDOW_IID_STR); public static final nsID NS_IDOMWINDOW_10_IID = new nsID(NS_IDOMWINDOW_10_IID_STR); + + public static final nsID NS_IDOMWINDOW_17_IID = + new nsID(NS_IDOMWINDOW_17_IID_STR); public nsIDOMWindow(long /*int*/ address) { super(address); @@ -62,19 +68,31 @@ public class nsIDOMWindow extends nsISupports { } public int GetParent(long /*int*/[] aParent) { + if (IsXULRunner17) return XPCOM.NS_ERROR_NOT_IMPLEMENTED; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 2), getAddress(), aParent); } + + public int GetRealParent(long /*int*/[] aParent) { + if (!IsXULRunner17) return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aParent); + } public int GetTop(long /*int*/[] aTop) { + if (IsXULRunner17) return GetRealTop(aTop); return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 3), getAddress(), aTop); } - + + public int GetRealTop(long /*int*/[] aTop) { + if (!IsXULRunner17) return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aTop); + } + public int GetScrollbars(long /*int*/[] aScrollbars) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 4), getAddress(), aScrollbars); } public int GetFrames(long /*int*/[] aFrames) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 62 : 5), getAddress(), aFrames); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 65 : (IsXULRunner10 ? 62 : 5)), getAddress(), aFrames); } public int GetName(long /*int*/ aName) { @@ -111,45 +129,44 @@ public class nsIDOMWindow extends nsISupports { } public int GetTextZoom(float[] aTextZoom) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 63 : 8), getAddress(), aTextZoom); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 66 : (IsXULRunner10 ? 63 : 8)), getAddress(), aTextZoom); } public int SetTextZoom(float aTextZoom) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 64 : 9), getAddress(), aTextZoom); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 67 : (IsXULRunner10 ? 64 : 9)), getAddress(), aTextZoom); } public int GetScrollX(int[] aScrollX) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 45 : 10), getAddress(), aScrollX); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 48 : (IsXULRunner10 ? 45 : 10)), getAddress(), aScrollX); } public int GetScrollY(int[] aScrollY) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 47 : 11), getAddress(), aScrollY); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 50 : (IsXULRunner10 ? 47 : 11)), getAddress(), aScrollY); } public int ScrollTo(int xScroll, int yScroll) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 50 : 12), getAddress(), xScroll, yScroll); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 53 : (IsXULRunner10 ? 50 : 12)), getAddress(), xScroll, yScroll); } public int ScrollBy(int xScrollDif, int yScrollDif) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 51 : 13), getAddress(), xScrollDif, yScrollDif); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 54 : (IsXULRunner10 ? 51 : 13)), getAddress(), xScrollDif, yScrollDif); } public int GetSelection(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 38 : 14), getAddress(), _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 41 : (IsXULRunner10 ? 38 : 14)), getAddress(), _retval); } public int ScrollByLines(int numLines) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 65 : 15), getAddress(), numLines); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 68 : (IsXULRunner10 ? 65 : 15)), getAddress(), numLines); } public int ScrollByPages(int numPages) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 66 : 16), getAddress(), numPages); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 69 : (IsXULRunner10 ? 66 : 16)), getAddress(), numPages); } public int SizeToContent() { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 67 : 17), getAddress()); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 70 : (IsXULRunner10 ? 67 : 17)), getAddress()); } - public int GetStatusbar(long /*int*/[] aStatusbar) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; @@ -198,481 +215,481 @@ public class nsIDOMWindow extends nsISupports { public int GetOpener(long /*int*/[] aOpener) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aOpener); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 25 : 22), getAddress(), aOpener); } public int SetOpener(long /*int*/ aOpener) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aOpener); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 26 :23), getAddress(), aOpener); } public int GetFrameElement(long /*int*/[] aFrameElement) { - if (!IsXULRunner10) return XPCOM.NS_COMFALSE; + if (!IsXULRunner10 || IsXULRunner17) return XPCOM.NS_ERROR_NOT_IMPLEMENTED; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFrameElement); } public int GetNavigator(long /*int*/[] aNavigator) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aNavigator); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 29 : 26), getAddress(), aNavigator); } public int GetApplicationCache(long /*int*/[] aApplicationCache) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aApplicationCache); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 30 : 27), getAddress(), aApplicationCache); } public int Alert(long /*int*/ text) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), text); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 31 : 28), getAddress(), text); } public int Confirm(long /*int*/ text, int[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), text, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 32 : 29), getAddress(), text, _retval); } public int Prompt(long /*int*/ aMessage, long /*int*/ aInitial, long /*int*/ _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aMessage, aInitial, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 33 : 30), getAddress(), aMessage, aInitial, _retval); } public int Print() { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress()); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 34 : 31), getAddress()); } public int ShowModalDialog(long /*int*/ aURI, long /*int*/ aArgs, long /*int*/ aOptions, long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aURI, aArgs, aOptions, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 35 : 32), getAddress(), aURI, aArgs, aOptions, _retval); } public int PostMessageMoz(long /*int*/ message, long /*int*/ targetOrigin, long /*int*/ cx) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), message, targetOrigin, cx); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 36 : 33), getAddress(), message, targetOrigin, cx); } public int Atob(long /*int*/ aAsciiString, long /*int*/ _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aAsciiString, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 37 : 34), getAddress(), aAsciiString, _retval); } public int Btoa(long /*int*/ aBase64Data, long /*int*/ _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aBase64Data, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 38 : 35), getAddress(), aBase64Data, _retval); } public int GetSessionStorage(long /*int*/[] aSessionStorage) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aSessionStorage); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 39 : 36), getAddress(), aSessionStorage); } public int GetLocalStorage(long /*int*/[] aLocalStorage) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aLocalStorage); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 40 : 37), getAddress(), aLocalStorage); } public int MatchMedia(long /*int*/ media_query_list, long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), media_query_list, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 42 : 39), getAddress(), media_query_list, _retval); } public int GetScreen(long /*int*/[] aScreen) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aScreen); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 43 : 40), getAddress(), aScreen); } public int GetInnerWidth(int[] aInnerWidth) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aInnerWidth); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 44 : 41), getAddress(), aInnerWidth); } public int SetInnerWidth(int aInnerWidth) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aInnerWidth); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 45 : 42), getAddress(), aInnerWidth); } public int GetInnerHeight(int[] aInnerHeight) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aInnerHeight); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 46 : 43), getAddress(), aInnerHeight); } public int SetInnerHeight(int aInnerHeight) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aInnerHeight); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 47 : 44), getAddress(), aInnerHeight); } public int GetPageXOffset(int[] aPageXOffset) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aPageXOffset); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 48 : 46), getAddress(), aPageXOffset); } public int GetPageYOffset(int[] aPageYOffset) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aPageYOffset); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 49 : 48), getAddress(), aPageYOffset); } public int Scroll(int xScroll, int yScroll) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), xScroll, yScroll); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 52 : 49), getAddress(), xScroll, yScroll); } public int GetScreenX(int[] aScreenX) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress(), aScreenX); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 55 : 52), getAddress(), aScreenX); } public int SetScreenX(int aScreenX) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress(), aScreenX); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 56 : 53), getAddress(), aScreenX); } public int GetScreenY(int[] aScreenY) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), aScreenY); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 57 : 54), getAddress(), aScreenY); } public int SetScreenY(int aScreenY) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress(), aScreenY); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 58 : 55), getAddress(), aScreenY); } public int GetOuterWidth(int[] aOuterWidth) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aOuterWidth); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 59 : 56), getAddress(), aOuterWidth); } public int SetOuterWidth(int aOuterWidth) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aOuterWidth); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 60 : 57), getAddress(), aOuterWidth); } public int GetOuterHeight(int[] aOuterHeight) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aOuterHeight); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 61 : 58), getAddress(), aOuterHeight); } public int SetOuterHeight(int aOuterHeight) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aOuterHeight); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 62 : 59), getAddress(), aOuterHeight); } public int GetComputedStyle(long /*int*/ elt, long /*int*/ pseudoElt, long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), elt, pseudoElt, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 63 : 60), getAddress(), elt, pseudoElt, _retval); } public int GetWindowRoot(long /*int*/[] aWindowRoot) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), aWindowRoot); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 64 : 61), getAddress(), aWindowRoot); } public int GetContent(long /*int*/[] aContent) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 68, getAddress(), aContent); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 71 : 68), getAddress(), aContent); } public int GetPrompter(long /*int*/[] aPrompter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 69, getAddress(), aPrompter); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 72 : 69), getAddress(), aPrompter); } public int GetClosed(int[] aClosed) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 70, getAddress(), aClosed); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 73 : 70), getAddress(), aClosed); } public int GetCrypto(long /*int*/[] aCrypto) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 71, getAddress(), aCrypto); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 74 : 71), getAddress(), aCrypto); } public int GetPkcs11(long /*int*/[] aPkcs11) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 72, getAddress(), aPkcs11); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 75 : 72), getAddress(), aPkcs11); } public int GetControllers(long /*int*/[] aControllers) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 73, getAddress(), aControllers); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 76 : 73), getAddress(), aControllers); } public int GetDefaultStatus(long /*int*/ aDefaultStatus) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 74, getAddress(), aDefaultStatus); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 77 : 74), getAddress(), aDefaultStatus); } public int SetDefaultStatus(long /*int*/ aDefaultStatus) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 75, getAddress(), aDefaultStatus); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 78 : 75), getAddress(), aDefaultStatus); } public int GetMozInnerScreenX(float[] aMozInnerScreenX) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 76, getAddress(), aMozInnerScreenX); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 79 : 76), getAddress(), aMozInnerScreenX); } public int GetMozInnerScreenY(float[] aMozInnerScreenY) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 77, getAddress(), aMozInnerScreenY); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 80 : 77), getAddress(), aMozInnerScreenY); } public int GetScrollMaxX(int[] aScrollMaxX) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 78, getAddress(), aScrollMaxX); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 81 : 78), getAddress(), aScrollMaxX); } public int GetScrollMaxY(int[] aScrollMaxY) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 79, getAddress(), aScrollMaxY); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 82 : 79), getAddress(), aScrollMaxY); } public int GetFullScreen(int[] aFullScreen) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 80, getAddress(), aFullScreen); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 83 : 80), getAddress(), aFullScreen); } public int SetFullScreen(int aFullScreen) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 81, getAddress(), aFullScreen); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 84 : 81), getAddress(), aFullScreen); } public int Back() { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 82, getAddress()); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 85 : 82), getAddress()); } public int Forward() { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 83, getAddress()); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 86 : 83), getAddress()); } public int Home() { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 84, getAddress()); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 87 : 84), getAddress()); } public int MoveTo(int xPos, int yPos) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 85, getAddress(), xPos, yPos); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 88 : 85), getAddress(), xPos, yPos); } public int MoveBy(int xDif, int yDif) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 86, getAddress(), xDif, yDif); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 89 : 86), getAddress(), xDif, yDif); } public int ResizeTo(int width, int height) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 87, getAddress(), width, height); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 90 : 87), getAddress(), width, height); } public int ResizeBy(int widthDif, int heightDif) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 88, getAddress(), widthDif, heightDif); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 91 : 88), getAddress(), widthDif, heightDif); } public int Open(long /*int*/ url, long /*int*/ name, long /*int*/ options, long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 89, getAddress(), url, name, options, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 92 : 89), getAddress(), url, name, options, _retval); } public int OpenDialog(long /*int*/ url, long /*int*/ name, long /*int*/ options, long /*int*/ aExtraArgument, long /*int*/[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 90, getAddress(), url, name, options, aExtraArgument, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 93 : 90), getAddress(), url, name, options, aExtraArgument, _retval); } public int UpdateCommands(long /*int*/ action) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 91, getAddress(), action); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 94 : 91), getAddress(), action); } public int Find(long /*int*/ str, int caseSensitive, int backwards, int wrapAround, int wholeWord, int searchInFrames, int showDialog, int[] _retval) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 92, getAddress(), str, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog, _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 95 : 92), getAddress(), str, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog, _retval); } public int GetMozPaintCount(long /*int*/ aMozPaintCount) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 93, getAddress(), aMozPaintCount); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 96 : 93), getAddress(), aMozPaintCount); } public int MozRequestAnimationFrame(long /*int*/ aListener) { - if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 94, getAddress(), aListener); + if (!IsXULRunner10 || IsXULRunner17) return XPCOM.NS_COMFALSE; + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 97 : 94), getAddress(), aListener); } public int GetMozAnimationStartTime(long[] aMozAnimationStartTime) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 95, getAddress(), aMozAnimationStartTime); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 100 : 95), getAddress(), aMozAnimationStartTime); } public int GetURL(long /*int*/[] aURL) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 96, getAddress(), aURL); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 101 : 96), getAddress(), aURL); } public int GetGlobalStorage(long /*int*/[] aGlobalStorage) { - if (!IsXULRunner10) return XPCOM.NS_COMFALSE; + if (!IsXULRunner10 || IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 97, getAddress(), aGlobalStorage); } public int GetOnafterprint(long /*int*/ cx, long /*int*/ aOnafterprint) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 98, getAddress(), cx, aOnafterprint); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 102 : 98), getAddress(), cx, aOnafterprint); } public int SetOnafterprint(long /*int*/ cx, long /*int*/ aOnafterprint) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 99, getAddress(), cx, aOnafterprint); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 103 : 99), getAddress(), cx, aOnafterprint); } public int GetOnbeforeprint(long /*int*/ cx, long /*int*/ aOnbeforeprint) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 100, getAddress(), cx, aOnbeforeprint); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 104 : 100), getAddress(), cx, aOnbeforeprint); } public int SetOnbeforeprint(long /*int*/ cx, long /*int*/ aOnbeforeprint) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 101, getAddress(), cx, aOnbeforeprint); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 105 : 101), getAddress(), cx, aOnbeforeprint); } public int GetOnbeforeunload(long /*int*/ cx, long /*int*/ aOnbeforeunload) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 102, getAddress(), cx, aOnbeforeunload); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 106 : 102), getAddress(), cx, aOnbeforeunload); } public int SetOnbeforeunload(long /*int*/ cx, long /*int*/ aOnbeforeunload) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 103, getAddress(), cx, aOnbeforeunload); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 107 : 103), getAddress(), cx, aOnbeforeunload); } public int GetOnhashchange(long /*int*/ cx, long /*int*/ aOnhashchange) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 104, getAddress(), cx, aOnhashchange); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 108 : 104), getAddress(), cx, aOnhashchange); } public int SetOnhashchange(long /*int*/ cx, long /*int*/ aOnhashchange) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 105, getAddress(), cx, aOnhashchange); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 109 : 105), getAddress(), cx, aOnhashchange); } public int GetOnmessage(long /*int*/ cx, long /*int*/ aOnmessage) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 106, getAddress(), cx, aOnmessage); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 110 : 106), getAddress(), cx, aOnmessage); } public int SetOnmessage(long /*int*/ cx, long /*int*/ aOnmessage) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 107, getAddress(), cx, aOnmessage); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 111 : 107), getAddress(), cx, aOnmessage); } public int GetOnoffline(long /*int*/ cx, long /*int*/ aOnoffline) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 108, getAddress(), cx, aOnoffline); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 112 : 108), getAddress(), cx, aOnoffline); } public int SetOnoffline(long /*int*/ cx, long /*int*/ aOnoffline) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 109, getAddress(), cx, aOnoffline); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 113 : 109), getAddress(), cx, aOnoffline); } public int GetOnonline(long /*int*/ cx, long /*int*/ aOnonline) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 110, getAddress(), cx, aOnonline); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 114 : 110), getAddress(), cx, aOnonline); } public int SetOnonline(long /*int*/ cx, long /*int*/ aOnonline) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 111, getAddress(), cx, aOnonline); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 115 : 111), getAddress(), cx, aOnonline); } public int GetOnpopstate(long /*int*/ cx, long /*int*/ aOnpopstate) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 112, getAddress(), cx, aOnpopstate); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 116 : 112), getAddress(), cx, aOnpopstate); } public int SetOnpopstate(long /*int*/ cx, long /*int*/ aOnpopstate) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 113, getAddress(), cx, aOnpopstate); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 117 : 113), getAddress(), cx, aOnpopstate); } public int GetOnpagehide(long /*int*/ cx, long /*int*/ aOnpagehide) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 114, getAddress(), cx, aOnpagehide); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 118 : 114), getAddress(), cx, aOnpagehide); } public int SetOnpagehide(long /*int*/ cx, long /*int*/ aOnpagehide) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 115, getAddress(), cx, aOnpagehide); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 119 : 115), getAddress(), cx, aOnpagehide); } public int GetOnpageshow(long /*int*/ cx, long /*int*/ aOnpageshow) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 116, getAddress(), cx, aOnpageshow); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 120 : 116), getAddress(), cx, aOnpageshow); } public int SetOnpageshow(long /*int*/ cx, long /*int*/ aOnpageshow) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 117, getAddress(), cx, aOnpageshow); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 121 : 117), getAddress(), cx, aOnpageshow); } public int GetOnresize(long /*int*/ cx, long /*int*/ aOnresize) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 118, getAddress(), cx, aOnresize); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 122 : 118), getAddress(), cx, aOnresize); } public int SetOnresize(long /*int*/ cx, long /*int*/ aOnresize) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 119, getAddress(), cx, aOnresize); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 123 : 119), getAddress(), cx, aOnresize); } public int GetOnunload(long /*int*/ cx, long /*int*/ aOnunload) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 120, getAddress(), cx, aOnunload); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 124 : 120), getAddress(), cx, aOnunload); } public int SetOnunload(long /*int*/ cx, long /*int*/ aOnunload) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 121, getAddress(), cx, aOnunload); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 125 : 121), getAddress(), cx, aOnunload); } public int GetOndevicemotion(long /*int*/ cx, long /*int*/ aOndevicemotion) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 122, getAddress(), cx, aOndevicemotion); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 126 : 122), getAddress(), cx, aOndevicemotion); } public int SetOndevicemotion(long /*int*/ cx, long /*int*/ aOndevicemotion) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 123, getAddress(), cx, aOndevicemotion); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 127 : 123), getAddress(), cx, aOndevicemotion); } public int GetOndeviceorientation(long /*int*/ cx, long /*int*/ aOndeviceorientation) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 124, getAddress(), cx, aOndeviceorientation); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 128 : 124), getAddress(), cx, aOndeviceorientation); } public int SetOndeviceorientation(long /*int*/ cx, long /*int*/ aOndeviceorientation) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 125, getAddress(), cx, aOndeviceorientation); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 129 : 125), getAddress(), cx, aOndeviceorientation); } public int GetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 126, getAddress(), cx, aOnmouseenter); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 136 : 126), getAddress(), cx, aOnmouseenter); } public int SetOnmouseenter(long /*int*/ cx, long /*int*/ aOnmouseenter) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 127, getAddress(), cx, aOnmouseenter); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 137 : 127), getAddress(), cx, aOnmouseenter); } public int GetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 128, getAddress(), cx, aOnmouseleave); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 138 : 128), getAddress(), cx, aOnmouseleave); } public int SetOnmouseleave(long /*int*/ cx, long /*int*/ aOnmouseleave) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 129, getAddress(), cx, aOnmouseleave); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 139 : 129), getAddress(), cx, aOnmouseleave); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java index 4c8d7b7f24..6a15906d40 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell.java @@ -48,6 +48,12 @@ public class nsIDocShell extends nsISupports { public static final nsID NS_IDOCSHELL_10_IID = new nsID(NS_IDOCSHELL_10_IID_STR); + + public static final String NS_IDOCSHELL_17_IID_STR = + "9b283337-097d-4fa8-a2da-916318eaf828"; + + public static final nsID NS_IDOCSHELL_17_IID = + new nsID(NS_IDOCSHELL_17_IID_STR); public nsIDocShell(long /*int*/ address) { super(address); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java index a584ac20a2..923f1c7383 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIEmbeddingSiteWindow.java @@ -29,13 +29,19 @@ package org.eclipse.swt.internal.mozilla; public class nsIEmbeddingSiteWindow extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 8; + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 9 :8); public static final String NS_IEMBEDDINGSITEWINDOW_IID_STR = "3e5432cd-9568-4bd1-8cbe-d50aba110743"; public static final nsID NS_IEMBEDDINGSITEWINDOW_IID = new nsID(NS_IEMBEDDINGSITEWINDOW_IID_STR); + + public static final String NS_IEMBEDDINGSITEWINDOW_17_IID_STR = + "0b976267-4aaa-4f36-a2d4-27b5ca8d73bb"; + + public static final nsID NS_IEMBEDDINGSITEWINDOW_17_IID = + new nsID(NS_IEMBEDDINGSITEWINDOW_17_IID_STR); public nsIEmbeddingSiteWindow(long /*int*/ address) { super(address); @@ -76,4 +82,9 @@ public class nsIEmbeddingSiteWindow extends nsISupports { public int GetSiteWindow(long /*int*/[] aSiteWindow) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aSiteWindow); } + + public int Blur() { + if (!IsXULRunner17) return XPCOM.NS_ERROR_NOT_IMPLEMENTED; + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress()); + } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java index 455f59bc73..ade60acae9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFile.java @@ -29,14 +29,20 @@ package org.eclipse.swt.internal.mozilla; public class nsIFile extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 45; + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 62 : 45); public static final String NS_IFILE_IID_STR = "c8c0a080-0868-11d3-915f-d9d889d48e3c"; + + public static final String NS_IFILE_17_IID_STR = + "272a5020-64f5-485c-a8c4-44b2882ae0a2"; public static final nsID NS_IFILE_IID = new nsID(NS_IFILE_IID_STR); + public static final nsID NS_IFILE_17_IID = + new nsID(NS_IFILE_17_IID_STR); + public nsIFile(long /*int*/ address) { super(address); } @@ -223,4 +229,72 @@ public class nsIFile extends nsISupports { public int GetDirectoryEntries(long /*int*/[] aDirectoryEntries) { return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 45, getAddress(), aDirectoryEntries); } + + public int InitWithPath(long /*int*/ filePath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), filePath); + } + + public int InitWithNativePath(long /*int*/ filePath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 47, getAddress(), filePath); + } + + public int InitWithFile(long /*int*/ aFile) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aFile); + } + + public int GetFollowLinks(int[] aFollowLinks) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), aFollowLinks); + } + + public int SetFollowLinks(int aFollowLinks) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 50, getAddress(), aFollowLinks); + } + + public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 51, getAddress(), flags, mode, _retval); + } + + public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress(), mode, _retval); + } + + public int Load(long /*int*/[] _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress(), _retval); + } + + public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), aDiskSpaceAvailable); + } + + public int AppendRelativePath(long /*int*/ relativeFilePath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress(), relativeFilePath); + } + + public int AppendRelativeNativePath(long /*int*/ relativeFilePath) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), relativeFilePath); + } + + public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aPersistentDescriptor); + } + + public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aPersistentDescriptor); + } + + public int Reveal() { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress()); + } + + public int Launch() { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress()); + } + + public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), fromFile, _retval); + } + + public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) { + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 62, getAddress(), fromFile, relativeDesc); + } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java index f74a83c6b0..0d93c54d17 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker.java @@ -29,13 +29,19 @@ package org.eclipse.swt.internal.mozilla; public class nsIFilePicker extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 15; + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 18 :15); public static final String NS_IFILEPICKER_IID_STR = "c47de916-1dd1-11b2-8141-82507fa02b21"; + + public static final String NS_IFILEPICKER_17_IID_STR = + "f2c0e216-5d07-4df4-bbcb-37683077ae7e"; public static final nsID NS_IFILEPICKER_IID = new nsID(NS_IFILEPICKER_IID_STR); + + public static final nsID NS_IFILEPICKER_17_IID = + new nsID(NS_IFILEPICKER_17_IID_STR); public nsIFilePicker(long /*int*/ address) { super(address); @@ -113,6 +119,6 @@ public class nsIFilePicker extends nsISupports { } public int Show(long /*int*/ _retval) { - return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), _retval); + return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 17 : 15), getAddress(), _retval); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java index 15026fea9b..2df68b1e21 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIInputStream.java @@ -33,9 +33,15 @@ public class nsIInputStream extends nsISupports { public static final String NS_IINPUTSTREAM_IID_STR = "fa9c7f6c-61b3-11d4-9877-00c04fa0cf4a"; + + public static final String NS_IINPUTSTREAM_17_IID_STR = + "53cdbc97-c2d7-4e30-b2c3-45b2ee79db18"; public static final nsID NS_IINPUTSTREAM_IID = new nsID(NS_IINPUTSTREAM_IID_STR); + + public static final nsID NS_IINPUTSTREAM_17_IID = + new nsID(NS_IINPUTSTREAM_17_IID_STR); public nsIInputStream(long /*int*/ address) { super(address); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java index b3c75d93e1..8b87b1c85d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsILocalFile.java @@ -29,83 +29,106 @@ package org.eclipse.swt.internal.mozilla; public class nsILocalFile extends nsIFile { - static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + 17; + static final int LAST_METHOD_ID = nsIFile.LAST_METHOD_ID + (IsXULRunner17 ? 0 : 17); public static final String NS_ILOCALFILE_IID_STR = "aa610f20-a889-11d3-8c81-000064657374"; + + public static final String NS_ILOCALFILE_17_IID_STR = + "ce4ef184-7660-445e-9e59-6731bdc65505"; public static final nsID NS_ILOCALFILE_IID = new nsID(NS_ILOCALFILE_IID_STR); + + public static final nsID NS_ILOCALFILE_17_IID = + new nsID(NS_ILOCALFILE_17_IID_STR); public nsILocalFile(long /*int*/ address) { super(address); } public int InitWithPath(long /*int*/ filePath) { + if (IsXULRunner17) return super.InitWithPath(filePath); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 1, getAddress(), filePath); } public int InitWithNativePath(long /*int*/ filePath) { + if (IsXULRunner17) return super.InitWithNativePath(filePath); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 2, getAddress(), filePath); } public int InitWithFile(long /*int*/ aFile) { + if (IsXULRunner17) return super.InitWithFile(aFile); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 3, getAddress(), aFile); } public int GetFollowLinks(int[] aFollowLinks) { + if (IsXULRunner17) return super.GetFollowLinks(aFollowLinks); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 4, getAddress(), aFollowLinks); } public int SetFollowLinks(int aFollowLinks) { + if (IsXULRunner17) return super.SetFollowLinks(aFollowLinks); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 5, getAddress(), aFollowLinks); } public int OpenNSPRFileDesc(int flags, int mode, long /*int*/[] _retval) { + if (IsXULRunner17) return super.OpenNSPRFileDesc(flags, mode, _retval); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 6, getAddress(), flags, mode, _retval); } public int OpenANSIFileDesc(byte[] mode, long /*int*/[] _retval) { + if (IsXULRunner17) return super.OpenANSIFileDesc(mode, _retval); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 7, getAddress(), mode, _retval); } public int Load(long /*int*/[] _retval) { + if (IsXULRunner17) return super.Load(_retval); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 8, getAddress(), _retval); } public int GetDiskSpaceAvailable(long[] aDiskSpaceAvailable) { + if (IsXULRunner17) return super.GetDiskSpaceAvailable(aDiskSpaceAvailable); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 9, getAddress(), aDiskSpaceAvailable); } public int AppendRelativePath(long /*int*/ relativeFilePath) { + if (IsXULRunner17) return super.AppendRelativePath(relativeFilePath); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 10, getAddress(), relativeFilePath); } public int AppendRelativeNativePath(long /*int*/ relativeFilePath) { + if (IsXULRunner17) return super.AppendRelativeNativePath(relativeFilePath); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 11, getAddress(), relativeFilePath); } public int GetPersistentDescriptor(long /*int*/ aPersistentDescriptor) { + if (IsXULRunner17) return super.GetPersistentDescriptor(aPersistentDescriptor); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 12, getAddress(), aPersistentDescriptor); } public int SetPersistentDescriptor(long /*int*/ aPersistentDescriptor) { + if (IsXULRunner17) return super.SetPersistentDescriptor(aPersistentDescriptor); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 13, getAddress(), aPersistentDescriptor); } public int Reveal() { + if (IsXULRunner17) return super.Reveal(); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 14, getAddress()); } public int Launch() { + if (IsXULRunner17) return super.Launch(); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 15, getAddress()); } public int GetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ _retval) { + if (IsXULRunner17) return super.GetRelativeDescriptor(fromFile, _retval); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 16, getAddress(), fromFile, _retval); } public int SetRelativeDescriptor(long /*int*/ fromFile, long /*int*/ relativeDesc) { + if (IsXULRunner17) return super.SetRelativeDescriptor(fromFile, relativeDesc); return XPCOM.VtblCall(nsIFile.LAST_METHOD_ID + 17, getAddress(), fromFile, relativeDesc); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java index 37612614a3..8a18e456ba 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrefBranch.java @@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla; public class nsIPrefBranch extends nsISupports { - static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 18; + static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner17 ? 20 : 18); public static final String NS_IPREFBRANCH_IID_STR = "56c35506-f14b-11d3-99d3-ddbfac2ccf65"; @@ -37,11 +37,17 @@ public class nsIPrefBranch extends nsISupports { public static final String NS_IPREFBRANCH_10_IID_STR = "e162bfa0-01bd-4e9f-9843-8fb2efcd6d1f"; + public static final String NS_IPREFBRANCH_17_IID_STR = + "7df46a54-d8b0-448e-903c-4341a1b2499c"; + public static final nsID NS_IPREFBRANCH_IID = new nsID(NS_IPREFBRANCH_IID_STR); public static final nsID NS_IPREFBRANCH_10_IID = new nsID(NS_IPREFBRANCH_10_IID_STR); + + public static final nsID NS_IPREFBRANCH_17_IID = + new nsID(NS_IPREFBRANCH_17_IID_STR); public nsIPrefBranch(long /*int*/ address) { super(address); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java index b3f5760560..c821fcb132 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIPrincipal.java @@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla; public class nsIPrincipal extends nsISerializable { - static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 23); + static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 27 : (IsXULRunner10 ? 26 : 23)); public static final String NS_IPRINCIPAL_IID_STR = "b8268b9a-2403-44ed-81e3-614075c92034"; @@ -42,6 +42,12 @@ public class nsIPrincipal extends nsISerializable { public static final nsID NS_IPRINCIPAL_10_IID = new nsID(NS_IPRINCIPAL_10_IID_STR); + + public static final String NS_IPRINCIPAL_17_IID_STR = + "825ffce8-962d-11e1-aef3-8f2b6188709b"; + + public static final nsID NS_IPRINCIPAL_17_IID = + new nsID(NS_IPRINCIPAL_17_IID_STR); public nsIPrincipal(long /*int*/ address) { super(address); @@ -70,6 +76,7 @@ public class nsIPrincipal extends nsISerializable { } public int GetJSPrincipals(long /*int*/ cx, long /*int*/[] _retval) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 4), getAddress(), cx, _retval); } @@ -86,76 +93,79 @@ public class nsIPrincipal extends nsISerializable { } public int SetCanEnableCapability(byte[] capability, short canEnable) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), capability, canEnable); } public int IsCapabilityEnabled(byte[] capability, long /*int*/ annotation, int[] _retval) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), capability, annotation, _retval); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 8 : (IsXULRunner10 ? 10 : 9)), getAddress(), capability, annotation, _retval); } public int EnableCapability(byte[] capability, long /*int*/[] annotation) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), capability, annotation); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 9 : (IsXULRunner10 ? 11 : 10)), getAddress(), capability, annotation); } public int RevertCapability(byte[] capability, long /*int*/[] annotation) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), capability, annotation); } public int DisableCapability(byte[] capability, long /*int*/[] annotation) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), capability, annotation); } public int GetURI(long /*int*/[] aURI) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), aURI); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 10 : (IsXULRunner10 ? 14 : 13)), getAddress(), aURI); } public int GetDomain(long /*int*/[] aDomain) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), aDomain); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 11 : (IsXULRunner10 ? 15 : 14)), getAddress(), aDomain); } public int SetDomain(long /*int*/ aDomain) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), aDomain); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 12 : (IsXULRunner10 ? 16 : 15)), getAddress(), aDomain); } public int GetOrigin(long /*int*/[] aOrigin) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), aOrigin); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 13 : (IsXULRunner10 ? 17 : 16)), getAddress(), aOrigin); } public int GetHasCertificate(int[] aHasCertificate) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), aHasCertificate); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 14 : (IsXULRunner10 ? 18 : 17)), getAddress(), aHasCertificate); } public int GetFingerprint(long /*int*/ aFingerprint) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), aFingerprint); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 15 : (IsXULRunner10 ? 19 : 18)), getAddress(), aFingerprint); } public int GetPrettyName(long /*int*/ aPrettyName) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress(), aPrettyName); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + ((IsXULRunner17 ? 16 : IsXULRunner10 ? 20 : 19)), getAddress(), aPrettyName); } public int Subsumes(long /*int*/ other, int[] _retval) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), other, _retval); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 17 : (IsXULRunner10 ? 21 : 20)), getAddress(), other, _retval); } public int CheckMayLoad(long /*int*/ uri, int report) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), uri, report); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + ((IsXULRunner17 ? 19 : IsXULRunner10 ? 22 : 21)), getAddress(), uri, report); } public int GetSubjectName(long /*int*/ aSubjectName) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aSubjectName); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + ((IsXULRunner17 ? 20 : IsXULRunner10 ? 23 : 22)), getAddress(), aSubjectName); } public int GetCertificate(long /*int*/[] aCertificate) { - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), aCertificate); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + ((IsXULRunner17 ? 21 : IsXULRunner10 ? 24 : 23)), getAddress(), aCertificate); } public int GetCsp(long /*int*/[] aCsp) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 25, getAddress(), aCsp); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 22 : 25), getAddress(), aCsp); } public int SetCsp(long /*int*/ aCsp) { if (!IsXULRunner10) return XPCOM.NS_COMFALSE; - return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp); + return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner17 ? 22 : 26), getAddress(), aCsp); } } diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java index 2ecc2c9765..b215155d81 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIScriptSecurityManager.java @@ -29,7 +29,7 @@ package org.eclipse.swt.internal.mozilla; public class nsIScriptSecurityManager extends nsIXPCSecurityManager { - static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26); + static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + ((IsXULRunner17 || IsXULRunner10) ? 27 : 26); public static final String NS_ISCRIPTSECURITYMANAGER_IID_STR = "3fffd8e8-3fea-442e-a0ed-2ba81ae197d5"; @@ -48,6 +48,12 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { public static final nsID NS_ISCRIPTSECURITYMANAGER_10_IID = new nsID(NS_ISCRIPTSECURITYMANAGER_10_IID_STR); + + public static final String NS_ISCRIPTSECURITYMANAGER_17_IID_STR = + "45e12581-2c3f-4142-8e0d-4075e5a67d2d"; + + public static final nsID NS_ISCRIPTSECURITYMANAGER_17_IID = + new nsID(NS_ISCRIPTSECURITYMANAGER_17_IID_STR); public nsIScriptSecurityManager(long /*int*/ address) { super(address); @@ -78,31 +84,33 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { } public int CheckLoadURI(long /*int*/ from, long /*int*/ uri, int flags) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 5), getAddress(), from, uri, flags); } public int CheckLoadURIStrWithPrincipal(long /*int*/ aPrincipal, long /*int*/ uri, int flags) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 6), getAddress(), aPrincipal, uri, flags); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 4 : (IsXULRunner10 ? 5 : 6)), getAddress(), aPrincipal, uri, flags); } public int CheckLoadURIStr(long /*int*/ from, long /*int*/ uri, int flags) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 7), getAddress(), from, uri, flags); } public int CheckFunctionAccess(long /*int*/ cx, long /*int*/ funObj, long /*int*/ targetObj) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 8), getAddress(), cx, funObj, targetObj); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 5 : (IsXULRunner10 ? 7 : 8)), getAddress(), cx, funObj, targetObj); } public int CanExecuteScripts(long /*int*/ cx, long /*int*/ principal, int[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 9), getAddress(), cx, principal, _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 6 : (IsXULRunner10 ? 8 : 9)), getAddress(), cx, principal, _retval); } public int GetSubjectPrincipal(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 10), getAddress(), _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 7 : (IsXULRunner10 ? 9 : 10)), getAddress(), _retval); } public int GetSystemPrincipal(long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 11), getAddress(), _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 8 : (IsXULRunner10 ? 10 : 11)), getAddress(), _retval); } // public int GetCertificatePrincipal(long /*int*/ aCertFingerprint, long /*int*/ aSubjectName, long /*int*/ aPrettyName, long /*int*/ aCert, long /*int*/ aURI, long /*int*/[] _retval) { @@ -110,6 +118,7 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { // } public int GetCodebasePrincipal(long /*int*/ aURI, long /*int*/[] _retval) { + if (IsXULRunner17) return XPCOM.NS_COMFALSE; return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 13), getAddress(), aURI, _retval); } @@ -118,11 +127,11 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { // } public int IsCapabilityEnabled(byte[] capability, int[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), capability, _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 16 : (IsXULRunner10 ? 14 : 15)), getAddress(), capability, _retval); } public int EnableCapability(byte[] capability) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), capability); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 17 : (IsXULRunner10 ? 15 : 16)), getAddress(), capability); } public int RevertCapability(byte[] capability) { @@ -138,31 +147,31 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager { // } public int GetObjectPrincipal(long /*int*/ cx, long /*int*/ obj, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 20), getAddress(), cx, obj, _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 18 :(IsXULRunner10 ? 19 : 20)), getAddress(), cx, obj, _retval); } public int SubjectPrincipalIsSystem(int[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 21), getAddress(), _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 19 :(IsXULRunner10 ? 20 : 21)), getAddress(), _retval); } public int CheckSameOrigin(long /*int*/ aJSContext, long /*int*/ aTargetURI) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 22), getAddress(), aJSContext, aTargetURI); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 20 : (IsXULRunner10 ? 21 : 22)), getAddress(), aJSContext, aTargetURI); } public int CheckSameOriginURI(long /*int*/ aSourceURI, long /*int*/ aTargetURI, int reportError) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 23), getAddress(), aSourceURI, aTargetURI, reportError); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 21 : (IsXULRunner10 ? 22 : 23)), getAddress(), aSourceURI, aTargetURI, reportError); } public int GetPrincipalFromContext(long /*int*/ cx, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 24), getAddress(), cx, _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + ((IsXULRunner17 ? 22 :IsXULRunner10 ? 23 : 24)), getAddress(), cx, _retval); } public int GetChannelPrincipal(long /*int*/ aChannel, long /*int*/[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 25), getAddress(), aChannel, _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 23 : (IsXULRunner10 ? 24 : 25)), getAddress(), aChannel, _retval); } public int IsSystemPrincipal(long /*int*/ aPrincipal, int[] _retval) { - return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 26), getAddress(), aPrincipal, _retval); + return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner17 ? 24 : (IsXULRunner10 ? 25 : 26)), getAddress(), aPrincipal, _retval); } public int PushContextPrincipal(long /*int*/ cx, long /*int*/ fp, long /*int*/ principal) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java index 885542a894..83f3fc7e5d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISupports.java @@ -38,7 +38,7 @@ public class nsISupports { static final int FIRST_METHOD_ID = IsSolaris ? 2 : 0; static final int LAST_METHOD_ID = FIRST_METHOD_ID + 2; - public static boolean IsXULRunner10; + public static boolean IsXULRunner10, IsXULRunner17; public static final String NS_ISUPPORTS_IID_STR = "00000000-0000-0000-c000-000000000046"; diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java index e0e0a14cd3..be60ca5259 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowserChrome.java @@ -36,6 +36,12 @@ public class nsIWebBrowserChrome extends nsISupports { public static final nsID NS_IWEBBROWSERCHROME_IID = new nsID(NS_IWEBBROWSERCHROME_IID_STR); + + public static final String NS_IWEBBROWSERCHROME_17_IID_STR = + "e8c414c4-dc38-4ba3-ab4e-ec4cbbe22907"; + + public static final nsID NS_IWEBBROWSERCHROME_17_IID = + new nsID(NS_IWEBBROWSERCHROME_17_IID_STR); public nsIWebBrowserChrome(long /*int*/ address) { super(address); diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java index 902ef3a290..22e78c35e9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebProgressListener.java @@ -36,6 +36,12 @@ public class nsIWebProgressListener extends nsISupports { public static final nsID NS_IWEBPROGRESSLISTENER_IID = new nsID(NS_IWEBPROGRESSLISTENER_IID_STR); + + public static final String NS_IWEBPROGRESSLISTENER_17_IID_STR = + "a0cda7e4-c6ca-11e0-b6a5-001320257da5"; + + public static final nsID NS_IWEBPROGRESSLISTENER_17_IID = + new nsID(NS_IWEBPROGRESSLISTENER_17_IID_STR); public nsIWebProgressListener(long /*int*/ address) { super(address); |