adapt interfaces and boolean representation to XULRunner 10

32 files changed, 1093 insertions, 400 deletions

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 ecb412a7c5..7de3b85ba9 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
@@ -302,7 +302,7 @@ int getFile(int /*long*/ prop, int /*long*/ persistent, int /*long*/ _retval) {
 		if (isXULRunner) propertyValue = profilePath;
 	}
 
-	XPCOM.memmove (persistent, new int[] {1}, 4); /* PRBool */
+	XPCOM.memmove (persistent, new boolean[] {true});
 	XPCOM.memmove (_retval, new int /*long*/[] {0}, C.PTR_SIZEOF);
 	if (propertyValue != null && propertyValue.length () > 0) {
 		int /*long*/[] result = new int /*long*/[1];
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
index 19e3df1190..64f359244a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Download.java
@@ -187,7 +187,7 @@ int Init (int /*long*/ aSource, int /*long*/ aTarget, int /*long*/ aDisplayName,
 	String filename = null;
 	nsISupports supports = new nsISupports (aTarget);
 	int /*long*/[] result = new int /*long*/[1];
-	rc = supports.QueryInterface (!Mozilla.IsPre_4 ? nsIURI.NS_IURI_8_IID : nsIURI.NS_IURI_IID, result);
+	rc = supports.QueryInterface (!Mozilla.IsPre_4 ? nsIURI.NS_IURI_10_IID : nsIURI.NS_IURI_IID, result);
 	if (rc == XPCOM.NS_OK) {	/* >= 1.7 */
 		nsIURI target = new nsIURI (result[0]);
 		result[0] = 0;
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 ddf543cd38..d519577394 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
@@ -101,7 +101,7 @@ int QueryInterface (int /*long*/ riid, int /*long*/ ppvObject) {
 		AddRef ();
 		return XPCOM.NS_OK;
 	}
-	if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_8_IID)) {
+	if (guid.Equals (nsIFilePicker_1_8.NS_IFILEPICKER_10_IID)) {
 		XPCOM.memmove(ppvObject, new int /*long*/[] {filePicker.getAddress ()}, C.PTR_SIZEOF);
 		AddRef ();
 		return XPCOM.NS_OK;
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 8a5d967b47..4dccd629db 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
@@ -126,7 +126,7 @@ int ReadSegments (int /*long*/ aWriter, int /*long*/ aClosure, int aCount, int /
 
 int IsNonBlocking (int /*long*/ _retval) {
 	/* blocking */
-	XPCOM.memmove (_retval, new int[] {0}, 4);
+	XPCOM.memmove (_retval, new boolean[] {false});
 	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 a444e34f1e..87a4e29a28 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
@@ -792,7 +792,7 @@ public void create (Composite parent, int style) {
 	result[0] = 0;
 
 	/* create the nsIWebBrowser instance */
-	rc = componentManager.CreateInstance (XPCOM.NS_IWEBBROWSER_CID, 0, nsIWebBrowser.NS_IWEBBROWSER_8_IID, result);
+	rc = componentManager.CreateInstance (XPCOM.NS_IWEBBROWSER_CID, 0, nsIWebBrowser.NS_IWEBBROWSER_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
 		rc = componentManager.CreateInstance (XPCOM.NS_IWEBBROWSER_CID, 0, nsIWebBrowser.NS_IWEBBROWSER_IID, result);
 		if (rc != XPCOM.NS_OK) {
@@ -895,7 +895,7 @@ public void create (Composite parent, int style) {
 			} else { /* >= 1.9 */
 				IsPre_1_9 = false;
 				result[0] = 0;
-				rc = interfaceRequestor.GetInterface(nsIDocShell_1_8.NS_IDOCSHELL_8_IID, result);
+				rc = interfaceRequestor.GetInterface(nsIDocShell_1_8.NS_IDOCSHELL_10_IID, result);
 				if (rc == XPCOM.NS_OK && result[0] != 0) { /* >=2.0 */
 					IsPre_4 = false;
 					new nsISupports (result[0]).Release();
@@ -1290,7 +1290,7 @@ 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_8_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_191_IID, result);
@@ -1658,7 +1658,7 @@ public Object getWebBrowser () {
 		Method method = clazz.getMethod ("getInstance", new Class[0]); //$NON-NLS-1$
 		Object mozilla = method.invoke (null, new Object[0]);
 		method = clazz.getMethod ("wrapXPCOMObject", new Class[] {Long.TYPE, String.class}); //$NON-NLS-1$
-		webBrowserObject = method.invoke (mozilla, new Object[] {new Long (webBrowser.getAddress ()), !IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_8_IID_STR : nsIWebBrowser.NS_IWEBBROWSER_IID_STR});
+		webBrowserObject = method.invoke (mozilla, new Object[] {new Long (webBrowser.getAddress ()), !IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_10_IID_STR : nsIWebBrowser.NS_IWEBBROWSER_IID_STR});
 		/*
 		 * The following AddRef() is needed to offset the automatic Release() that
 		 * will be performed by JavaXPCOM when webBrowserObject is finalized.
@@ -1978,7 +1978,7 @@ void initXPCOM (String mozillaPath, boolean isXULRunner) {
 		if (version < 4) {
 			IsPre_4 = true;
 		} else {
-			nsISupports.Is8 = true;
+			nsISupports.IsXULRunner10 = true;
 		}
 		String initFunctionName = IsPre_4 ? "XRE_InitEmbedding" : "XRE_InitEmbedding2";
 		byte[] bytes = MozillaDelegate.wcsToMbcs (null, initFunctionName, true); //$NON-NLS-1$
@@ -2487,10 +2487,13 @@ void initWebBrowserWindows () {
 	}
 
 	int /*long*/[] result = new int /*long*/[1];
-	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
 	if (rc != XPCOM.NS_OK) {
-		browser.dispose ();
-		error (rc);
+		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+		if (rc != XPCOM.NS_OK) {
+			browser.dispose ();
+			error (rc);
+		}
 	}
 	if (result[0] == 0) {
 		browser.dispose ();
@@ -2630,8 +2633,11 @@ void onDispose (Display display) {
 	unhookDOMListeners ();
 
 	int /*long*/[] result = new int /*long*/[1];
-	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
+	rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
+	if (rc != XPCOM.NS_OK) {
+		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+	}
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 
 	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
@@ -2847,8 +2853,11 @@ void onResize () {
 	int height = Math.max (1, rect.height);
 
 	int /*long*/[] result = new int /*long*/[1];
-	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
+	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
+	if (rc != XPCOM.NS_OK) {
+		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+	}
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 
 	delegate.setSize (embedHandle, width, height);
@@ -3207,7 +3216,7 @@ void unhookDOMListeners () {
 
 	nsIDOMWindow window = new nsIDOMWindow (result[0]);
 	result[0] = 0;
-	rc = window.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_8_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+	rc = window.QueryInterface (!IsPre_4 ? 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]);
@@ -3234,7 +3243,7 @@ void unhookDOMListeners () {
 
 			nsIDOMWindow frame = new nsIDOMWindow (result[0]);
 			result[0] = 0;
-			rc = frame.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_8_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+			rc = frame.QueryInterface (!IsPre_4 ? 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);
 
@@ -3383,7 +3392,7 @@ int GetInterface (int /*long*/ riid, int /*long*/ 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_8_IID) || guid.Equals(nsIDOMWindow.NS_IDOMWINDOW_IID)) {
+	if (guid.Equals (nsIDOMWindow.NS_IDOMWINDOW_10_IID) || guid.Equals(nsIDOMWindow.NS_IDOMWINDOW_IID)) {
 		int /*long*/[] aContentDOMWindow = new int /*long*/[1];
 		int rc = webBrowser.GetContentDOMWindow (aContentDOMWindow);
 		if (rc != XPCOM.NS_OK) error (rc);
@@ -3456,8 +3465,11 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 		*/
 		if (isRetrievingBadCert) {
 			nsIRequest request = new nsIRequest (aRequest);
-			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
-			if (rc != XPCOM.NS_OK) error (rc);
+			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
+			if (rc != XPCOM.NS_OK) {
+				rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
+				if (rc != XPCOM.NS_OK) error (rc);
+			}
 			if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 
 			nsIChannel channel = new nsIChannel (result[0]);
@@ -3545,7 +3557,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 			result[0] = 0;
 
 			nsIDOMWindow domWindow = new nsIDOMWindow (window[0]);
-			rc = domWindow.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_8_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+			rc = domWindow.QueryInterface (!IsPre_4 ? 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);
@@ -3691,7 +3703,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 				result[0] = 0;
 
 				nsIDOMWindow domWindow = new nsIDOMWindow (window[0]);
-				rc = domWindow.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_8_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+				rc = domWindow.QueryInterface (!IsPre_4 ? 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);
@@ -3745,10 +3757,13 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 	} else if ((aStateFlags & nsIWebProgressListener.STATE_TRANSFERRING) != 0) {
 		if (updateLastNavigateUrl) {
 			updateLastNavigateUrl = false;
-			int /*long*/[] result = new int /*long*/[1];
 			nsIRequest request = new nsIRequest (aRequest);
 
-			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
+			int /*long*/[] result = new int /*long*/[1];
+			int rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_10_IID, result);
+			if (rc != XPCOM.NS_OK) {
+				rc = request.QueryInterface (nsIChannel.NS_ICHANNEL_IID, result);
+			}
 			if (rc == XPCOM.NS_OK && result[0] != 0) {
 				nsIChannel channel = new nsIChannel (result[0]);
 				result[0] = 0;
@@ -3794,7 +3809,7 @@ int OnStateChange (int /*long*/ aWebProgress, int /*long*/ aRequest, int aStateF
 			new nsISupports (result[0]).Release ();
 			result[0] = 0;
 
-			rc = domWindow.QueryInterface (!IsPre_4 ? nsIDOMEventTarget.NS_IDOMEVENTTARGET_8_IID : nsIDOMEventTarget.NS_IDOMEVENTTARGET_IID, result);
+			rc = domWindow.QueryInterface (!IsPre_4 ? 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);
 
@@ -4022,8 +4037,8 @@ int ShowAsModal () {
 }
 
 int IsWindowModal (int /*long*/ retval) {
-	int result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0 ? 1 : 0;
-	XPCOM.memmove (retval, new int[] {result}, 4); /* PRBool */
+	boolean result = (chromeFlags & nsIWebBrowserChrome.CHROME_MODAL) != 0;
+	XPCOM.memmove (retval, new boolean[] {result});
 	return XPCOM.NS_OK;
 }
    
@@ -4076,8 +4091,11 @@ int GetDimensions (int flags, int /*long*/ x, int /*long*/ y, int /*long*/ cx, i
 
 int SetFocus () {
 	int /*long*/[] result = new int /*long*/[1];
-	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
+	int rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
+	if (rc != XPCOM.NS_OK) {
+		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+	}
 	if (result[0] == 0) error (XPCOM.NS_ERROR_NO_INTERFACE);
 	
 	nsIBaseWindow baseWindow = new nsIBaseWindow (result[0]);
@@ -4095,7 +4113,7 @@ int SetFocus () {
 
 int GetVisibility (int /*long*/ aVisibility) {
 	boolean visible = browser.isVisible () && !browser.getShell ().getMinimized ();
-	XPCOM.memmove (aVisibility, new int[] {visible ? 1 : 0}, 4); /* PRBool */
+	XPCOM.memmove (aVisibility, new boolean[] {visible});
 	return XPCOM.NS_OK;
 }
 
@@ -4215,7 +4233,7 @@ int FocusPrevElement () {
 int OnShowContextMenu (int aContextFlags, int /*long*/ aEvent, int /*long*/ aNode) {
 	nsIDOMEvent domEvent = new nsIDOMEvent (aEvent);
 	int /*long*/[] result = new int /*long*/[1];
-	int rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_8_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
+	int rc = domEvent.QueryInterface (!IsPre_4 ? 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);
 
@@ -4266,7 +4284,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
 	* to the page with the bad certificate so that NotifyCertProblem will be invoked.
 	*/
 	if (value.indexOf ("aboutCertError.xhtml") != -1 || (isViewingErrorPage && value.indexOf ("javascript:showSecuritySection") != -1)) { //$NON-NLS-1$ //$NON-NLS-2$
-		XPCOM.memmove (retval, new int[] {1}, 4); /* PRBool */
+		XPCOM.memmove (retval, new boolean[] {true});
 		isRetrievingBadCert = true;
 		setUrl (lastNavigateURL, (byte[])null, null);
 		return XPCOM.NS_OK;
@@ -4323,7 +4341,7 @@ int OnStartURIOpen (int /*long*/ aURI, int /*long*/ retval) {
 			}
 		}
 	}
-	XPCOM.memmove (retval, new int[] {doit ? 0 : 1}, 4); /* PRBool */
+	XPCOM.memmove (retval, new boolean[] {!doit});
 	return XPCOM.NS_OK;
 }
 
@@ -4382,7 +4400,7 @@ int IsPreferred (int /*long*/ aContentType, int /*long*/ aDesiredContentType, in
 		}
 	}
 
-	XPCOM.memmove(retval, new int[] {preferred ? 1 : 0}, 4); /* PRBool */
+	XPCOM.memmove(retval, new boolean[] {preferred});
 	if (preferred) {
 		XPCOM.memmove (aDesiredContentType, new int /*long*/[] {0}, C.PTR_SIZEOF);
 	}
@@ -4478,7 +4496,7 @@ int HandleEvent (int /*long*/ event) {
 
 	if (XPCOM.DOMEVENT_KEYDOWN.equals (typeString)) {
 		int /*long*/[] result = new int /*long*/[1];
-		rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_8_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
+		rc = domEvent.QueryInterface (!IsPre_4 ? 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]);
@@ -4586,7 +4604,7 @@ int HandleEvent (int /*long*/ event) {
 		}
 
 		int /*long*/[] result = new int /*long*/[1];
-		rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_8_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
+		rc = domEvent.QueryInterface (!IsPre_4 ? 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]);
@@ -4642,7 +4660,7 @@ int HandleEvent (int /*long*/ event) {
 
 	if (XPCOM.DOMEVENT_KEYUP.equals (typeString)) {
 		int /*long*/[] result = new int /*long*/[1];
-		rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMKeyEvent.NS_IDOMKEYEVENT_8_IID : nsIDOMKeyEvent.NS_IDOMKEYEVENT_IID, result);
+		rc = domEvent.QueryInterface (!IsPre_4 ? 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 +4717,7 @@ int HandleEvent (int /*long*/ event) {
 	/* mouse event */
 
 	int /*long*/[] result = new int /*long*/[1];
-	rc = domEvent.QueryInterface (!IsPre_4 ? nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_8_IID : nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_IID, result);
+	rc = domEvent.QueryInterface (!IsPre_4 ? 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]);
@@ -4831,8 +4849,11 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 
 	int /*long*/[] result = new int /*long*/[1];
 	nsISupports supports = new nsISupports (status);
-	int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
-	if (rc != XPCOM.NS_OK) error (rc);
+	int rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_10_IID, result);
+	if (rc != XPCOM.NS_OK) {
+		rc = supports.QueryInterface (nsISSLStatus.NS_ISSLSTATUS_IID, result);
+		if (rc != XPCOM.NS_OK) error (rc);
+	}
 	if (result[0] == 0) error (XPCOM.NS_NOINTERFACE);
 
 	nsISSLStatus sslStatus = new nsISSLStatus (result[0]);
@@ -4959,7 +4980,7 @@ int NotifyCertProblem (int /*long*/ socketInfo, int /*long*/ status, int /*long*
 		}
 	});
 
-	C.memmove (_suppressError, new int[] {1}, 4); /* PRInt32 */
+	XPCOM.memmove (_suppressError, new boolean[] {true});
 	return XPCOM.NS_OK;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
index 0163c1f575..5be3696073 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptAuth2.java
@@ -53,7 +53,7 @@ void disposeCOMInterfaces () {
 	}	
 	if (promptAuth != null) {
 		promptAuth.dispose ();
-		promptAuth = null;	
+		promptAuth = null;
 	}
 }
 
@@ -93,7 +93,7 @@ Browser getBrowser() {
 	if (rc == XPCOM.NS_OK && result[0] != 0) {
 		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
 		result[0] = 0;
-		componentManager.GetClassObject(XPCOM.NS_IWEBBROWSER_CID, !Mozilla.IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_8_IID : nsIWebBrowser.NS_IWEBBROWSER_IID, result);
+		componentManager.GetClassObject(XPCOM.NS_IWEBBROWSER_CID, !Mozilla.IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_10_IID : nsIWebBrowser.NS_IWEBBROWSER_IID, result);
 		if (rc == XPCOM.NS_OK && result[0] != 0) {
 			nsIWebBrowser browser = new nsIWebBrowser(result[0]);
 			result[0] = 0;
@@ -124,7 +124,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 				event.location = mozilla.lastNavigateURL;
 				mozilla.authenticationListeners[i].authenticate (event);
 				if (!event.doit) {
-					XPCOM.memmove (_retval, new int[] {0}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {false});
 					return XPCOM.NS_OK;
 				}
 				if (event.user != null && event.password != null) {
@@ -136,7 +136,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 					rc = auth.SetPassword (string.getAddress ());
 					if (rc != XPCOM.NS_OK) SWT.error (rc);
 					string.dispose ();
-					XPCOM.memmove (_retval, new int[] {1}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {true});
 					return XPCOM.NS_OK;
 				}
 			}
@@ -146,7 +146,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	/* no listener handled the challenge, so show an authentication dialog */
 
 	String checkLabel = null;
-	int[] checkValue = new int[1];
+	boolean[] checkValue = new boolean[1];
 	String[] userLabel = new String[1], passLabel = new String[1];
 
 	String title = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
@@ -213,11 +213,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	/* open the prompter */
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] result = new int[1];
+	boolean[] result = new boolean[1];
 	dialog.promptUsernameAndPassword (title, message, checkLabel, userLabel, passLabel, checkValue, result);
 
-	XPCOM.memmove (_retval, result, 4);	/* PRBool */
-	if (result[0] == 1) {	/* User selected OK */
+	XPCOM.memmove (_retval, result);
+	if (result[0]) {	/* User selected OK */
 		nsEmbedString string = new nsEmbedString (userLabel[0]);
 		rc = auth.SetUsername(string.getAddress ());
 		if (rc != XPCOM.NS_OK) SWT.error (rc);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
index d7937cac15..8db4f5ac1b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptDialog.java
@@ -28,7 +28,7 @@ class PromptDialog extends Dialog {
 		this(parent, 0);
 	}
 	
-	void alertCheck(String title, String text, String check, final int[] checkValue) {
+	void alertCheck(String title, String text, String check, final boolean[] checkValue) {
 		Shell parent = getParent();
 		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		if (title != null) shell.setText(title);
@@ -48,7 +48,7 @@ class PromptDialog extends Dialog {
 		final Button checkButton = check != null ? new Button(shell, SWT.CHECK) : null;
 		if (checkButton != null) {
 			checkButton.setText(check);
-			checkButton.setSelection(checkValue[0] != 0);
+			checkButton.setSelection(checkValue[0]);
 			data = new GridData ();
 			data.horizontalAlignment = GridData.BEGINNING;
 			checkButton.setLayoutData (data);
@@ -60,7 +60,7 @@ class PromptDialog extends Dialog {
 		okButton.setLayoutData (data);
 		okButton.addListener(SWT.Selection, new Listener() {
 			public void handleEvent(Event event) {
-				if (checkButton != null) checkValue[0] = checkButton.getSelection() ? 1 : 0;
+				if (checkButton != null) checkValue[0] = checkButton.getSelection();
 				shell.close();
 			}
 		});
@@ -207,7 +207,7 @@ class PromptDialog extends Dialog {
 		return result[0];
 	}
 
-	void confirmEx(String title, String text, String check, String button0, String button1, String button2, int defaultIndex, final int[] checkValue, final int[] result) {
+	void confirmEx(String title, String text, String check, String button0, String button1, String button2, int defaultIndex, final boolean[] checkValue, final int[] result) {
 		Shell parent = getParent();
 		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		shell.setText(title);
@@ -227,7 +227,7 @@ class PromptDialog extends Dialog {
 		final Button[] buttons = new Button[4];
 		Listener listener = new Listener() {
 			public void handleEvent(Event event) {
-				if (buttons[0] != null) checkValue[0] = buttons[0].getSelection() ? 1 : 0;
+				if (buttons[0] != null) checkValue[0] = buttons[0].getSelection();
 				Widget widget = event.widget;
 				for (int i = 1; i < buttons.length; i++) {
 					if (widget == buttons[i]) {
@@ -241,7 +241,7 @@ class PromptDialog extends Dialog {
 		if (check != null) {
 			buttons[0] = new Button(shell, SWT.CHECK);
 			buttons[0].setText(check);
-			buttons[0].setSelection(checkValue[0] != 0);
+			buttons[0].setSelection(checkValue[0]);
 			data = new GridData ();
 			data.horizontalAlignment = GridData.BEGINNING;
 			buttons[0].setLayoutData (data);
@@ -287,7 +287,7 @@ class PromptDialog extends Dialog {
 		}
 	}
 	
-	void prompt(String title, String text, String check, final String[] value, final int[] checkValue, final int[] result) {
+	void prompt(String title, String text, String check, final String[] value, final boolean[] checkValue, final boolean[] result) {
 		Shell parent = getParent();
 		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		if (title != null) shell.setText(title);
@@ -316,16 +316,16 @@ class PromptDialog extends Dialog {
 		final Button[] buttons = new Button[3];
 		Listener listener = new Listener() {
 			public void handleEvent(Event event) {
-				if (buttons[0] != null) checkValue[0] = buttons[0].getSelection() ? 1 : 0;
+				if (buttons[0] != null) checkValue[0] = buttons[0].getSelection();
 				value[0] = valueText.getText();
-				result[0] = event.widget == buttons[1] ? 1 : 0;
+				result[0] = event.widget == buttons[1];
 				shell.close();
 			}	
 		};
 		if (check != null) {
 			buttons[0] = new Button(shell, SWT.CHECK);
 			buttons[0].setText(check);
-			buttons[0].setSelection(checkValue[0] != 0);
+			buttons[0].setSelection(checkValue[0]);
 			data = new GridData ();
 			data.horizontalAlignment = GridData.BEGINNING;
 			buttons[0].setLayoutData (data);
@@ -352,7 +352,7 @@ class PromptDialog extends Dialog {
 		}	
 	}
 
-	void promptUsernameAndPassword(String title, String text, String check, final String[] user, final String[] pass, final int[] checkValue, final int[] result) {
+	void promptUsernameAndPassword(String title, String text, String check, final String[] user, final String[] pass, final boolean[] checkValue, final boolean[] result) {
 		Shell parent = getParent();
 		final Shell shell = new Shell(parent, SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
 		shell.setText(title);
@@ -392,17 +392,17 @@ class PromptDialog extends Dialog {
 		final Button[] buttons = new Button[3];
 		Listener listener = new Listener() {
 			public void handleEvent(Event event) {
-				if (buttons[0] != null) checkValue[0] = buttons[0].getSelection() ? 1 : 0;
+				if (buttons[0] != null) checkValue[0] = buttons[0].getSelection();
 				user[0] = userText.getText();
 				pass[0] = passwordText.getText();
-				result[0] = event.widget == buttons[1] ? 1 : 0;
+				result[0] = event.widget == buttons[1];
 				shell.close();
 			}	
 		};
 		if (check != null) {
 			buttons[0] = new Button(shell, SWT.CHECK);
 			buttons[0].setText(check);
-			buttons[0].setSelection(checkValue[0] != 0);
+			buttons[0].setSelection(checkValue[0]);
 			data = new GridData ();
 			data.horizontalAlignment = GridData.BEGINNING;
 			buttons[0].setLayoutData (data);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
index 4de7cae2c6..660ff4053f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/PromptService2.java
@@ -197,10 +197,10 @@ int AlertCheck (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aT
 
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] check = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4); /* PRBool */
+	boolean[] check = new boolean[1];
+	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 	dialog.alertCheck (titleLabel, textLabel, checkLabel, check);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4); /* PRBool */
+	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	return XPCOM.NS_OK;
 }
 
@@ -212,7 +212,7 @@ int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText
 	Browser browser = getBrowser (aParent);
 
 	if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
-		XPCOM.memmove (_retval, new int[] {1}, 4); /* PRBool */
+		XPCOM.memmove (_retval, new boolean[] {true});
 		return XPCOM.NS_OK;
 	}
 
@@ -231,8 +231,8 @@ int Confirm (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText
 	messageBox.setText (titleLabel);
 	messageBox.setMessage (textLabel);
 	int id = messageBox.open ();
-	int[] result = {id == SWT.OK ? 1 : 0};
-	XPCOM.memmove (_retval, result, 4); /* PRBool */
+	boolean[] result = {id == SWT.OK};
+	XPCOM.memmove (_retval, result);
 	return XPCOM.NS_OK;
 }
 
@@ -274,10 +274,11 @@ int ConfirmEx (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aTe
 	
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] check = new int[1], result = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4);
+	boolean[] check = new boolean[1];
+	int[] result = new int[1];
+	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 	dialog.confirmEx (titleLabel, textLabel, checkLabel, button0Label, button1Label, button2Label, defaultIndex, check, result);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4);
+	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	XPCOM.memmove (_retval, result, 4);
 	return XPCOM.NS_OK;
 }
@@ -320,12 +321,12 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
 
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] check = new int[1], result = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4);
+	boolean[] check = new boolean[1], result = new boolean[1];
+	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 	dialog.prompt (titleLabel, textLabel, checkLabel, valueLabel, check, result);
 
-	XPCOM.memmove (_retval, result, 4);
-	if (result[0] == 1) {
+	XPCOM.memmove (_retval, result);
+	if (result[0]) {
 		/* 
 		* User selected OK. User name and password are returned as PRUnichar values. Any default
 		* value that we override must be freed using the nsIMemory service.
@@ -361,7 +362,7 @@ int Prompt (int /*long*/ aParent, int /*long*/ aDialogTitle, int /*long*/ aText,
 			memory.Release ();
 		}
 	}
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4);
+	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	return XPCOM.NS_OK;
 }
 
@@ -382,7 +383,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 				event.location = mozilla.lastNavigateURL;
 				mozilla.authenticationListeners[i].authenticate (event);
 				if (!event.doit) {
-					XPCOM.memmove (_retval, new int[] {0}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {false});
 					return XPCOM.NS_OK;
 				}
 				if (event.user != null && event.password != null) {
@@ -394,7 +395,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 					rc = auth.SetPassword (string.getAddress ());
 					if (rc != XPCOM.NS_OK) SWT.error (rc);
 					string.dispose ();
-					XPCOM.memmove (_retval, new int[] {1}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {true});
 					return XPCOM.NS_OK;
 				}
 			}
@@ -404,7 +405,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 	/* no listener handled the challenge, so show an authentication dialog */
 
 	String checkLabel = null;
-	int[] checkValue = new int[1];
+	boolean[] checkValue = new boolean[1];
 	String[] userLabel = new String[1], passLabel = new String[1];
 
 	String title = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
@@ -414,7 +415,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 		char[] dest = new char[length];
 		XPCOM.memmove (dest, checkboxLabel, length * 2);
 		checkLabel = new String (dest);
-		XPCOM.memmove (checkValue, checkboxValue, 4); /* PRBool */
+		XPCOM.memmove (checkValue, checkboxValue);
 	}
 
 	/* get initial username and password values */
@@ -479,11 +480,11 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 	/* open the prompter */
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] result = new int[1];
+	boolean[] result = new boolean[1];
 	dialog.promptUsernameAndPassword (title, message, checkLabel, userLabel, passLabel, checkValue, result);
 
-	XPCOM.memmove (_retval, result, 4);	/* PRBool */
-	if (result[0] == 1) {	/* User selected OK */
+	XPCOM.memmove (_retval, result);
+	if (result[0]) {	/* User selected OK */
 		nsEmbedString string = new nsEmbedString (userLabel[0]);
 		rc = auth.SetUsername(string.getAddress ());
 		if (rc != XPCOM.NS_OK) SWT.error (rc);
@@ -495,7 +496,7 @@ int PromptAuth(int /*long*/ aParent, int /*long*/ aChannel, int level, int /*lon
 		string.dispose ();
 	}
 
-	if (checkboxValue != 0) XPCOM.memmove (checkboxValue, checkValue, 4); /* PRBool */
+	if (checkboxValue != 0) XPCOM.memmove (checkboxValue, checkValue);
 	return XPCOM.NS_OK;
 }
 
@@ -516,13 +517,13 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 				event.location = mozilla.lastNavigateURL;
 				mozilla.authenticationListeners[i].authenticate (event);
 				if (!event.doit) {
-					XPCOM.memmove (_retval, new int[] {0}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {false});
 					return XPCOM.NS_OK;
 				}
 				if (event.user != null && event.password != null) {
 					user = event.user;
 					password = event.password;
-					XPCOM.memmove (_retval, new int[] {1}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {true});
 					break;
 				}
 			}
@@ -579,17 +580,17 @@ int PromptUsernameAndPassword (int /*long*/ aParent, int /*long*/ aDialogTitle,
 	
 		Shell shell = browser == null ? new Shell () : browser.getShell ();
 		PromptDialog dialog = new PromptDialog (shell);
-		int[] check = new int[1], result = new int[1];
-		if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4);	/* PRBool */
+		boolean[] check = new boolean[1], result = new boolean[1];
+		if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 		dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
 	
-		XPCOM.memmove (_retval, result, 4);	/* PRBool */
-		if (result[0] == 1) {
+		XPCOM.memmove (_retval, result);
+		if (result[0]) {
 			/* User selected OK */
 			user = userLabel[0];
 			password = passLabel[0];
 		}
-		if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4); /* PRBool */
+		if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	}
 
 	if (user != null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
index e06fab5783..4d061a6b56 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Prompter.java
@@ -150,7 +150,7 @@ Browser getBrowser() {
 	if (rc == XPCOM.NS_OK && result[0] != 0) {
 		nsIComponentManager componentManager = new nsIComponentManager (result[0]);
 		result[0] = 0;
-		componentManager.GetClassObject(XPCOM.NS_IWEBBROWSER_CID, !Mozilla.IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_8_IID : nsIWebBrowser.NS_IWEBBROWSER_IID, result);
+		componentManager.GetClassObject(XPCOM.NS_IWEBBROWSER_CID, !Mozilla.IsPre_4 ? nsIWebBrowser.NS_IWEBBROWSER_10_IID : nsIWebBrowser.NS_IWEBBROWSER_IID, result);
 		if (rc == XPCOM.NS_OK && result[0] != 0) {
 			nsIWebBrowser browser = new nsIWebBrowser(result[0]);
 			result[0] = 0;
@@ -183,10 +183,10 @@ int AlertCheck (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aChe
 
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] check = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4); /* PRBool */
+	boolean[] check = new boolean[1];
+	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 	dialog.alertCheck (titleLabel, textLabel, checkLabel, check);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4); /* PRBool */
+	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	return XPCOM.NS_OK;
 }
 
@@ -194,7 +194,7 @@ int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval
 	Browser browser = getBrowser ();
 
 	if (browser != null && ((Mozilla)browser.webBrowser).ignoreAllMessages) {
-		XPCOM.memmove (_retval, new int[] {1}, 4); /* PRBool */
+		XPCOM.memmove (_retval, new boolean[] {true});
 		return XPCOM.NS_OK;
 	}
 
@@ -213,8 +213,8 @@ int Confirm (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ _retval
 	messageBox.setText (titleLabel);
 	messageBox.setMessage (textLabel);
 	int id = messageBox.open ();
-	int[] result = {id == SWT.OK ? 1 : 0};
-	XPCOM.memmove (_retval, result, 4); /* PRBool */
+	boolean[] result = {id == SWT.OK};
+	XPCOM.memmove (_retval, result);
 	return XPCOM.NS_OK;
 }
 
@@ -256,10 +256,11 @@ int ConfirmEx (int /*long*/ aDialogTitle, int /*long*/ aText, int aButtonFlags,
 	
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] check = new int[1], result = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4);
+	boolean[] check = new boolean[1];
+	int[] result = new int[1];
+	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 	dialog.confirmEx (titleLabel, textLabel, checkLabel, button0Label, button1Label, button2Label, defaultIndex, check, result);
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4);
+	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	XPCOM.memmove (_retval, result, 4);
 	return XPCOM.NS_OK;
 }
@@ -302,12 +303,12 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
 
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] check = new int[1], result = new int[1];
-	if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4);
+	boolean[] check = new boolean[1], result = new boolean[1];
+	if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 	dialog.prompt (titleLabel, textLabel, checkLabel, valueLabel, check, result);
 
-	XPCOM.memmove (_retval, result, 4);
-	if (result[0] == 1) {
+	XPCOM.memmove (_retval, result);
+	if (result[0]) {
 		/* 
 		* User selected OK. User name and password are returned as PRUnichar values. Any default
 		* value that we override must be freed using the nsIMemory service.
@@ -343,7 +344,7 @@ int Prompt (int /*long*/ aDialogTitle, int /*long*/ aText, int /*long*/ aValue,
 			memory.Release ();
 		}
 	}
-	if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4);
+	if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	return XPCOM.NS_OK;
 }
 
@@ -364,7 +365,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 				event.location = mozilla.lastNavigateURL;
 				mozilla.authenticationListeners[i].authenticate (event);
 				if (!event.doit) {
-					XPCOM.memmove (_retval, new int[] {0}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {false});
 					return XPCOM.NS_OK;
 				}
 				if (event.user != null && event.password != null) {
@@ -376,7 +377,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 					rc = auth.SetPassword (string.getAddress ());
 					if (rc != XPCOM.NS_OK) SWT.error (rc);
 					string.dispose ();
-					XPCOM.memmove (_retval, new int[] {1}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {true});
 					return XPCOM.NS_OK;
 				}
 			}
@@ -386,7 +387,7 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	/* no listener handled the challenge, so show an authentication dialog */
 
 	String checkLabel = null;
-	int[] checkValue = new int[1];
+	boolean[] checkValue = new boolean[1];
 	String[] userLabel = new String[1], passLabel = new String[1];
 
 	String title = SWT.getMessage ("SWT_Authentication_Required"); //$NON-NLS-1$
@@ -453,11 +454,11 @@ int PromptAuth(int /*long*/ aChannel, int level, int /*long*/ authInfo, int /*lo
 	/* open the prompter */
 	Shell shell = browser == null ? new Shell () : browser.getShell ();
 	PromptDialog dialog = new PromptDialog (shell);
-	int[] result = new int[1];
+	boolean[] result = new boolean[1];
 	dialog.promptUsernameAndPassword (title, message, checkLabel, userLabel, passLabel, checkValue, result);
 
-	XPCOM.memmove (_retval, result, 4);	/* PRBool */
-	if (result[0] == 1) {	/* User selected OK */
+	XPCOM.memmove (_retval, result);
+	if (result[0]) {	/* User selected OK */
 		nsEmbedString string = new nsEmbedString (userLabel[0]);
 		rc = auth.SetUsername(string.getAddress ());
 		if (rc != XPCOM.NS_OK) SWT.error (rc);
@@ -489,13 +490,13 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 				event.location = mozilla.lastNavigateURL;
 				mozilla.authenticationListeners[i].authenticate (event);
 				if (!event.doit) {
-					XPCOM.memmove (_retval, new int[] {0}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {false});
 					return XPCOM.NS_OK;
 				}
 				if (event.user != null && event.password != null) {
 					user = event.user;
 					password = event.password;
-					XPCOM.memmove (_retval, new int[] {1}, 4);	/* PRBool */
+					XPCOM.memmove (_retval, new boolean[] {true});
 					break;
 				}
 			}
@@ -552,17 +553,17 @@ int PromptUsernameAndPassword (int /*long*/ aDialogTitle, int /*long*/ aText, in
 	
 		Shell shell = browser == null ? new Shell () : browser.getShell ();
 		PromptDialog dialog = new PromptDialog (shell);
-		int[] check = new int[1], result = new int[1];
-		if (aCheckState != 0) XPCOM.memmove (check, aCheckState, 4);	/* PRBool */
+		boolean[] check = new boolean[1], result = new boolean[1];
+		if (aCheckState != 0) XPCOM.memmove (check, aCheckState);
 		dialog.promptUsernameAndPassword (titleLabel, textLabel, checkLabel, userLabel, passLabel, check, result);
 	
-		XPCOM.memmove (_retval, result, 4);	/* PRBool */
-		if (result[0] == 1) {
+		XPCOM.memmove (_retval, result);
+		if (result[0]) {
 			/* User selected OK */
 			user = userLabel[0];
 			password = passLabel[0];
 		}
-		if (aCheckState != 0) XPCOM.memmove (aCheckState, check, 4); /* PRBool */
+		if (aCheckState != 0) XPCOM.memmove (aCheckState, check);
 	}
 
 	if (user != null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
index 4be8516ca4..75f58ade59 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/SimpleEnumerator.java
@@ -99,7 +99,7 @@ int Release () {
 
 int HasMoreElements (int /*long*/ _retval) {
 	boolean more = values != null && index < values.length;
-	XPCOM.memmove (_retval, new int[] {more ? 1 : 0}, 4); /*PRBool */
+	XPCOM.memmove (_retval, new boolean[] {more});
 	return XPCOM.NS_OK;
 }	
 	
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
index 4a176e0144..06a7b5cbf8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/WindowCreator2.java
@@ -129,8 +129,11 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
 
 		nsIWebBrowser webBrowser = new nsIWebBrowser (aWebBrowser[0]);
 		int /*long*/[] result = new int /*long*/[1];
-		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
-		if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+		rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_10_IID, result);
+		if (rc != XPCOM.NS_OK) {
+			rc = webBrowser.QueryInterface (nsIBaseWindow.NS_IBASEWINDOW_IID, result);
+			if (rc != XPCOM.NS_OK) Mozilla.error (rc);
+		}
 		if (result[0] == 0) Mozilla.error (XPCOM.NS_ERROR_NO_INTERFACE);
 		webBrowser.Release ();
 
@@ -222,7 +225,7 @@ int CreateChromeWindow2 (int /*long*/ parent, int chromeFlags, int contextFlags,
 		XPCOM.memmove (_retval, new int /*long*/[] {chromePtr}, C.PTR_SIZEOF);
 	} else {
 		if (cancel != 0) {
-			C.memmove (cancel, new int[] {1}, 4);	/* PRBool */
+			XPCOM.memmove (cancel, new boolean[] {true});
 		}
 	}
 	return doit ? XPCOM.NS_OK : XPCOM.NS_ERROR_NOT_IMPLEMENTED;
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 7ee5d5ee41..bba67f88a2 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
@@ -149,12 +149,32 @@ public class XPCOM extends C {
 
 public static final native int nsDynamicFunctionLoad_sizeof ();
 
+public static void memmove(int /*long*/ dest, boolean[] src) {
+	if (nsISupports.IsXULRunner10) { // TODO change this reference
+		memmove (dest, new byte[] {src[0] ? (byte)1 : 0}, 1);
+	} else {
+		memmove (dest, new int[] {src[0] ? 1 : 0}, 4);
+	}
+}
+
+public static void memmove(boolean[] dest, int /*long*/ src) {
+	if (nsISupports.IsXULRunner10) { // TODO change this reference
+		byte[] result = new byte[1];
+		memmove (result, src, 1);
+		dest[0] = result[0] != 0;
+	} else {
+		int[] result = new int[1];
+		memmove (result, src, 4);
+		dest[0] = result[0] != 0;
+	}
+}
+
 /**
  * @param dest cast=(void *)
  * @param src cast=(const void *),flags=no_out critical
  * @param size cast=(size_t)
  */
-public static final native void memmove (int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
+public static final native void memmove(int /*long*/ dest, nsDynamicFunctionLoad src, int /*long*/ size);
 /**
  * @param dest cast=(void *)
  * @param src cast=(const void *)
@@ -2461,4 +2481,24 @@ static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1
 	}
 }
 
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, int arg14, float arg15, short arg16) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+	} finally {
+		lock.unlock();
+	}
+}
+
+static final native int _VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16);
+static final int VtblCall(int fnNumber, int /*long*/ ppVtbl, long arg0, int arg1, int arg2, long arg3, int arg4, int arg5, int arg6, int arg7, int arg8, int arg9, int arg10, int arg11, int arg12, short arg13, long arg14, float arg15, short arg16) {
+	lock.lock();
+	try {
+		return _VtblCall(fnNumber, ppVtbl, arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16);
+	} finally {
+		lock.unlock();
+	}
+}
+
 }
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 23c915b66d..d589bcc7cf 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
@@ -29,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIBaseWindow extends nsISupports {
 
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 24;
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 24);
 
 	public static final String NS_IBASEWINDOW_IID_STR =
 		"046bc8a0-8015-11d3-af70-00a024ffc08c";
 
+	public static final String NS_IBASEWINDOW_10_IID_STR =
+		"7144ac8b-6702-4a4b-a73d-d1d4e9717e46";
+
 	public static final nsID NS_IBASEWINDOW_IID =
 		new nsID(NS_IBASEWINDOW_IID_STR);
 
+	public static final nsID NS_IBASEWINDOW_10_IID =
+		new nsID(NS_IBASEWINDOW_10_IID_STR);
+		
 	public nsIBaseWindow(int /*long*/ address) {
 		super(address);
 	}
@@ -114,26 +120,28 @@ public class nsIBaseWindow extends nsISupports {
 	}
 
 	public int GetBlurSuppression(int[] aBlurSuppression) {
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress(), aBlurSuppression);
 	}
 
 	public int SetBlurSuppression(int aBlurSuppression) {
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aBlurSuppression);
 	}
 
 	public int GetMainWidget(int /*long*/[] aMainWidget) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aMainWidget);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 21), getAddress(), aMainWidget);
 	}
 
 	public int SetFocus() {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 22), getAddress());
 	}
 
 	public int GetTitle(int /*long*/[] aTitle) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aTitle);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 23), getAddress(), aTitle);
 	}
 
 	public int SetTitle(char[] aTitle) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 24, getAddress(), aTitle);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 24), getAddress(), aTitle);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
index 98cef8f59d..eff730ab32 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIChannel.java
@@ -29,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIChannel extends nsIRequest {
 
-	static final int LAST_METHOD_ID = nsIRequest.LAST_METHOD_ID + 16;
+	static final int LAST_METHOD_ID = nsIRequest.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 16);
 
 	public static final String NS_ICHANNEL_IID_STR =
 		"c63a055a-a676-4e71-bf3c-6cfa11082018";
 
+	public static final String NS_ICHANNEL_10_IID_STR =
+		"06f6ada3-7729-4e72-8d3f-bf8ba630ff9b";
+
 	public static final nsID NS_ICHANNEL_IID =
 		new nsID(NS_ICHANNEL_IID_STR);
 
+	public static final nsID NS_ICHANNEL_10_IID =
+		new nsID(NS_ICHANNEL_10_IID_STR);
+
 	public nsIChannel(int /*long*/ address) {
 		super(address);
 	}
@@ -105,10 +111,28 @@ public class nsIChannel extends nsIRequest {
 		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 16, getAddress(), aListener, aContext);
 	}
 
+	public int GetContentDisposition(int[] aContentDisposition) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 17, getAddress(), aContentDisposition);
+	}
+
+	public int GetContentDispositionFilename(int /*long*/ aContentDispositionFilename) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 18, getAddress(), aContentDispositionFilename);
+	}
+
+	public int GetContentDispositionHeader(int /*long*/ aContentDispositionHeader) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIRequest.LAST_METHOD_ID + 19, getAddress(), aContentDispositionHeader);
+	}
+
 	public static final int LOAD_DOCUMENT_URI = 65536;
 	public static final int LOAD_RETARGETED_DOCUMENT_URI = 131072;
 	public static final int LOAD_REPLACE = 262144;
 	public static final int LOAD_INITIAL_DOCUMENT_URI = 524288;
 	public static final int LOAD_TARGETED = 1048576;
 	public static final int LOAD_CALL_CONTENT_SNIFFERS = 2097152;
+	public static final int LOAD_CLASSIFY_URI = 4194304;
+	public static final int DISPOSITION_INLINE = 0;
+	public static final int DISPOSITION_ATTACHMENT = 1;
 }
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 99881594bb..e2dbda418d 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,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
 

 public class nsIDOMDocument extends nsIDOMNode {

 

-	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + 17;

+	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (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 nsID NS_IDOMDOCUMENT_IID =

 		new nsID(NS_IDOMDOCUMENT_IID_STR);

 

+	public static final nsID NS_IDOMDOCUMENT_10_IID =

+		new nsID(NS_IDOMDOCUMENT_10_IID_STR);

+

 	public nsIDOMDocument(int /*long*/ address) {

 		super(address);

 	}

@@ -82,30 +88,262 @@ public class nsIDOMDocument extends nsIDOMNode {
 	}

 

 	public int CreateEntityReference(int /*long*/ name, int /*long*/[] _retval) {

+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;

 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 11, getAddress(), name, _retval);

 	}

 

 	public int GetElementsByTagName(int /*long*/ tagname, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), tagname, _retval);

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 12), getAddress(), tagname, _retval);

 	}

 

 	public int ImportNode(int /*long*/ importedNode, int deep, int /*long*/[] _retval) {

+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;

 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 13, getAddress(), importedNode, deep, _retval);

 	}

 

+	public int ImportNode(int /*long*/ importedNode, int deep, int _argc, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 12, getAddress(), importedNode, deep, _argc, _retval);

+	}

+

 	public int CreateElementNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 14, getAddress(), namespaceURI, qualifiedName, _retval);

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 14), getAddress(), namespaceURI, qualifiedName, _retval);

 	}

 

 	public int CreateAttributeNS(int /*long*/ namespaceURI, int /*long*/ qualifiedName, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 15, getAddress(), namespaceURI, qualifiedName, _retval);

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), namespaceURI, qualifiedName, _retval);

 	}

 

 	public int GetElementsByTagNameNS(int /*long*/ namespaceURI, int /*long*/ localName, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), namespaceURI, localName, _retval);

 	}

 

 	public int GetElementById(int /*long*/ elementId, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), elementId, _retval);

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), elementId, _retval);

+	}

+	

+	public int GetInputEncoding(int /*long*/ aInputEncoding) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), aInputEncoding);

+	}

+

+	public int GetDocumentURI(int /*long*/ aDocumentURI) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), aDocumentURI);

+	}

+

+	public int AdoptNode(int /*long*/ source, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), source, _retval);

+	}

+

+	public int CreateRange(int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 20, getAddress(), _retval);

+	}

+

+	public int CreateNodeIterator(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 21, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);

+	}

+

+	public int CreateTreeWalker(int /*long*/ root, int whatToShow, int /*long*/ filter, int entityReferenceExpansion, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 22, getAddress(), root, whatToShow, filter, entityReferenceExpansion, _retval);

+	}

+

+	public int CreateEvent(int /*long*/ eventType, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 23, getAddress(), eventType, _retval);

+	}

+

+	public int GetDefaultView(int /*long*/[] aDefaultView) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 24, getAddress(), aDefaultView);

+	}

+

+	public int GetCharacterSet(int /*long*/ aCharacterSet) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 25, getAddress(), aCharacterSet);

+	}

+

+	public int GetDir(int /*long*/ aDir) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 26, getAddress(), aDir);

+	}

+

+	public int SetDir(int /*long*/ aDir) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 27, getAddress(), aDir);

+	}

+

+	public int GetLocation(int /*long*/[] aLocation) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 28, getAddress(), aLocation);

+	}

+

+	public int GetTitle(int /*long*/ aTitle) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 29, getAddress(), aTitle);

+	}

+

+	public int SetTitle(int /*long*/ aTitle) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 30, getAddress(), aTitle);

+	}

+

+	public int GetReadyState(int /*long*/ aReadyState) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 31, getAddress(), aReadyState);

+	}

+

+	public int GetLastModified(int /*long*/ aLastModified) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 32, getAddress(), aLastModified);

+	}

+

+	public int GetReferrer(int /*long*/ aReferrer) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 33, getAddress(), aReferrer);

+	}

+

+	public int HasFocus(int[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 34, getAddress(), _retval);

+	}

+

+	public int GetActiveElement(int /*long*/[] aActiveElement) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 35, getAddress(), aActiveElement);

+	}

+

+	public int GetElementsByClassName(int /*long*/ classes, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 36, getAddress(), classes, _retval);

+	}

+

+	public int GetStyleSheets(int /*long*/[] aStyleSheets) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 37, getAddress(), aStyleSheets);

+	}

+

+	public int GetPreferredStyleSheetSet(int /*long*/ aPreferredStyleSheetSet) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 38, getAddress(), aPreferredStyleSheetSet);

+	}

+

+	public int GetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 39, getAddress(), aSelectedStyleSheetSet);

+	}

+

+	public int SetSelectedStyleSheetSet(int /*long*/ aSelectedStyleSheetSet) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 40, getAddress(), aSelectedStyleSheetSet);

+	}

+

+	public int GetLastStyleSheetSet(int /*long*/ aLastStyleSheetSet) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 41, getAddress(), aLastStyleSheetSet);

+	}

+

+	public int GetStyleSheetSets(int /*long*/[] aStyleSheetSets) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 42, getAddress(), aStyleSheetSets);

+	}

+

+	public int EnableStyleSheetsForSet(int /*long*/ name) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 43, getAddress(), name);

+	}

+

+	public int ElementFromPoint(float x, float y, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 44, getAddress(), x, y, _retval);

+	}

+

+	public int GetContentType(int /*long*/ aContentType) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 45, getAddress(), aContentType);

+	}

+

+	public int GetMozSyntheticDocument(int[] aMozSyntheticDocument) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 46, getAddress(), aMozSyntheticDocument);

+	}

+

+	public int GetCurrentScript(int /*long*/[] aCurrentScript) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 47, getAddress(), aCurrentScript);

+	}

+

+	public int ReleaseCapture() {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 48, getAddress());

+	}

+

+	public int MozSetImageElement(int /*long*/ aImageElementId, int /*long*/ aImageElement) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 49, getAddress(), aImageElementId, aImageElement);

+	}

+

+	public int GetMozFullScreenElement(int /*long*/[] aMozFullScreenElement) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 50, getAddress(), aMozFullScreenElement);

+	}

+

+	public int MozCancelFullScreen() {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 51, getAddress());

+	}

+

+	public int GetMozFullScreen(int[] aMozFullScreen) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 52, getAddress(), aMozFullScreen);

+	}

+

+	public int GetMozFullScreenEnabled(int[] aMozFullScreenEnabled) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 53, getAddress(), aMozFullScreenEnabled);

+	}

+

+	public int GetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 54, getAddress(), cx, aOnreadystatechange);

+	}

+

+	public int SetOnreadystatechange(int /*long*/ cx, int /*long*/ aOnreadystatechange) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 55, getAddress(), cx, aOnreadystatechange);

+	}

+

+	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 56, getAddress(), cx, aOnmouseenter);

+	}

+

+	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 57, getAddress(), cx, aOnmouseenter);

+	}

+

+	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 58, getAddress(), cx, aOnmouseleave);

+	}

+

+	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 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);

+	}

+

+	public int GetMozVisibilityState(int /*long*/ aMozVisibilityState) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 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 1f975f285c..87f630e5c2 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,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
 

 public class nsIDOMElement extends nsIDOMNode {

 

-	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + 16;

+	static final int LAST_METHOD_ID = nsIDOMNode.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 16);

 

 	public static final String NS_IDOMELEMENT_IID_STR =

 		"a6cf9078-15b3-11d2-932e-00805f8add32";

 

+	public static final String NS_IDOMELEMENT_10_IID_STR =

+		"1f249e8b-7b41-44c0-a8d5-15298c1198cd";

+

 	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 nsIDOMElement(int /*long*/ address) {

 		super(address);

 	}

@@ -104,4 +110,24 @@ public class nsIDOMElement extends nsIDOMNode {
 	public int HasAttributeNS(int /*long*/ namespaceURI, int /*long*/ localName, int[] _retval) {

 		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 16, getAddress(), namespaceURI, localName, _retval);

 	}

+

+	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 17, getAddress(), cx, aOnmouseenter);

+	}

+

+	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 18, getAddress(), cx, aOnmouseenter);

+	}

+

+	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 19, getAddress(), cx, aOnmouseleave);

+	}

+

+	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsIDOMNode.LAST_METHOD_ID + 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 c5f95b6eea..57c28a7874 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,19 +29,19 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIDOMEvent extends nsISupports {
 
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (Is8 ? 11 : 10);
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 10);
 
 	public static final String NS_IDOMEVENT_IID_STR =
 		"a66b7b80-ff46-bd97-0080-5f8ae38add32";
 
-	public static final String NS_IDOMEVENT_8_IID_STR =
-		"548137e8-fd2c-48c4-8635-3033f7db79e0";
+	public static final String NS_IDOMEVENT_10_IID_STR =
+		"e85cff74-951f-45c1-be0c-89442ea2f500";
 
 	public static final nsID NS_IDOMEVENT_IID =
 		new nsID(NS_IDOMEVENT_IID_STR);
 
-	public static final nsID NS_IDOMEVENT_8_IID =
-		new nsID(NS_IDOMEVENT_8_IID_STR);
+	public static final nsID NS_IDOMEVENT_10_IID =
+		new nsID(NS_IDOMEVENT_10_IID_STR);
 
 	public nsIDOMEvent(int /*long*/ address) {
 		super(address);
@@ -92,7 +92,12 @@ public class nsIDOMEvent extends nsISupports {
 	}
 	
 	public int GetDefaultPrevented(int[] aDefaultPrevented) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aDefaultPrevented);
 	}
+
+	public int StopImmediatePropagation() {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress());
+	}
 }
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 92f48f2254..20b2096301 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
@@ -34,26 +34,26 @@ public class nsIDOMEventTarget extends nsISupports {
 	public static final String NS_IDOMEVENTTARGET_IID_STR =
 		"1c773b30-d1cf-11d2-bd95-00805f8ae3f4";
 
-	public static final String NS_IDOMEVENTTARGET_8_IID_STR =
+	public static final String NS_IDOMEVENTTARGET_10_IID_STR =
 		"1797d5a4-b12a-428d-9eef-a0e13839728c";
 	
 	public static final nsID NS_IDOMEVENTTARGET_IID =
 		new nsID(NS_IDOMEVENTTARGET_IID_STR);
 
-	public static final nsID NS_IDOMEVENTTARGET_8_IID =
-		new nsID(NS_IDOMEVENTTARGET_8_IID_STR);
+	public static final nsID NS_IDOMEVENTTARGET_10_IID =
+		new nsID(NS_IDOMEVENTTARGET_10_IID_STR);
 
 	public nsIDOMEventTarget(int /*long*/ address) {
 		super(address);
 	}
 
 	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture) {
-		if (Is8) return XPCOM.NS_COMFALSE;
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture);
 	}
 
 	public int AddEventListener(int /*long*/ type, int /*long*/ listener, int useCapture, int wantsUntrusted, int _argc) {
-		if (!Is8) return AddEventListener(type, listener, useCapture);
+		if (!IsXULRunner10) return AddEventListener(type, listener, useCapture);
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), type, listener, useCapture, wantsUntrusted, _argc);
 	}
 
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 b09a1ddfa0..70ee34150d 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
@@ -34,14 +34,14 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
 	public static final String NS_IDOMKEYEVENT_IID_STR =
 		"028e0e6e-8b01-11d3-aae7-0010838a3123";
 
-	public static final String NS_IDOMKEYEVENT_8_IID_STR =
-		"e44d7977-20f2-442e-bc13-0f2f52992a4c";
+	public static final String NS_IDOMKEYEVENT_10_IID_STR =
+		"def974c3-b491-481b-bc67-29174af4b26a";
 	
 	public static final nsID NS_IDOMKEYEVENT_IID =
 		new nsID(NS_IDOMKEYEVENT_IID_STR);
 
-	public static final nsID NS_IDOMKEYEVENT_8_IID =
-		new nsID(NS_IDOMKEYEVENT_8_IID_STR);
+	public static final nsID NS_IDOMKEYEVENT_10_IID =
+		new nsID(NS_IDOMKEYEVENT_10_IID_STR);
 	
 	public nsIDOMKeyEvent(int /*long*/ address) {
 		super(address);
@@ -162,7 +162,7 @@ public class nsIDOMKeyEvent extends nsIDOMUIEvent {
 	public static final int DOM_VK_QUOTE = 222;
 	public static final int DOM_VK_META = 224;
 	
-	/* the follow constants are defined in Mozilla 8 */
+	/* the following constants are defined in Mozilla 10 */
 	public static final int DOM_VK_KANA = 21;
 	public static final int DOM_VK_HANGUL = 21;
 	public static final int DOM_VK_JUNJA = 23;
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 c38626b54c..0083edc044 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,19 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIDOMMouseEvent extends nsIDOMUIEvent {
 
-	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + 11;
+	static final int LAST_METHOD_ID = nsIDOMUIEvent.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 11);
 
 	public static final String NS_IDOMMOUSEEVENT_IID_STR =
 		"ff751edc-8b02-aae7-0010-8301838a3123";
 
-	public static final String NS_IDOMMOUSEEVENT_8_IID_STR =
-		"73558605-f479-493e-86d1-9794cd117fef";
+	public static final String NS_IDOMMOUSEEVENT_10_IID_STR =
+		"7f57aa45-6792-4d8b-ba5b-201533cf0b2f";
 
 	public static final nsID NS_IDOMMOUSEEVENT_IID =
 		new nsID(NS_IDOMMOUSEEVENT_IID_STR);
 
-	public static final nsID NS_IDOMMOUSEEVENT_8_IID =
-		new nsID(NS_IDOMMOUSEEVENT_8_IID_STR);
+	public static final nsID NS_IDOMMOUSEEVENT_10_IID =
+		new nsID(NS_IDOMMOUSEEVENT_10_IID_STR);
 
 	public nsIDOMMouseEvent(int /*long*/ address) {
 		super(address);
@@ -90,4 +90,29 @@ public class nsIDOMMouseEvent extends nsIDOMUIEvent {
 	public int InitMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ 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);
 	}
+
+	/* the following constants are defined in Mozilla 10 */
+	public static final int MOZ_SOURCE_UNKNOWN = 0;
+	public static final int MOZ_SOURCE_MOUSE = 1;
+	public static final int MOZ_SOURCE_PEN = 2;
+	public static final int MOZ_SOURCE_ERASER = 3;
+	public static final int MOZ_SOURCE_CURSOR = 4;
+	public static final int MOZ_SOURCE_TOUCH = 5;
+	public static final int MOZ_SOURCE_KEYBOARD = 6;
+
+	public int GetMozPressure(float[] aMozPressure) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 12, getAddress(), aMozPressure);
+	}
+
+	public int GetMozInputSource(short[] aMozInputSource) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMUIEvent.LAST_METHOD_ID + 13, getAddress(), aMozInputSource);
+	}
+
+	public int InitNSMouseEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg, int screenXArg, int screenYArg, int clientXArg, int clientYArg, int ctrlKeyArg, int altKeyArg, int shiftKeyArg, int metaKeyArg, short buttonArg, int /*long*/ 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);
+	}
+
 }
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 e7b22df231..61e02ad138 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,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
 

 public class nsIDOMNode extends nsISupports {

 

-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 25;

+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 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 nsID NS_IDOMNODE_IID =

 		new nsID(NS_IDOMNODE_IID_STR);

 

+	public static final nsID NS_IDOMNODE_10_IID =

+		new nsID(NS_IDOMNODE_10_IID_STR);

+

 	public nsIDOMNode(int /*long*/ address) {

 		super(address);

 	}

@@ -74,75 +80,81 @@ public class nsIDOMNode extends nsISupports {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 5, getAddress(), aParentNode);

 	}

 

+	public int GetParentElement(int /*long*/[] aParentElement) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aParentElement);

+	}

+

 	public int GetChildNodes(int /*long*/[] aChildNodes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aChildNodes);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aChildNodes);

 	}

 

 	public int GetFirstChild(int /*long*/[] aFirstChild) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aFirstChild);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), aFirstChild);

 	}

 

 	public int GetLastChild(int /*long*/[] aLastChild) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLastChild);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), aLastChild);

 	}

 

 	public int GetPreviousSibling(int /*long*/[] aPreviousSibling) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aPreviousSibling);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), aPreviousSibling);

 	}

 

 	public int GetNextSibling(int /*long*/[] aNextSibling) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aNextSibling);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), aNextSibling);

 	}

 

 	public int GetAttributes(int /*long*/[] aAttributes) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 11, getAddress(), aAttributes);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), aAttributes);

 	}

 

 	public int GetOwnerDocument(int /*long*/[] aOwnerDocument) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aOwnerDocument);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), aOwnerDocument);

 	}

 

 	public int InsertBefore(int /*long*/ newChild, int /*long*/ refChild, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), newChild, refChild, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), newChild, refChild, _retval);

 	}

 

 	public int ReplaceChild(int /*long*/ newChild, int /*long*/ oldChild, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), newChild, oldChild, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), newChild, oldChild, _retval);

 	}

 

 	public int RemoveChild(int /*long*/ oldChild, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), oldChild, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), oldChild, _retval);

 	}

 

 	public int AppendChild(int /*long*/ newChild, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), newChild, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), newChild, _retval);

 	}

 

 	public int HasChildNodes(int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress(), _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), _retval);

 	}

 

 	public int CloneNode(int deep, int /*long*/[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress(), deep, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), deep, _retval);

 	}

 

 	public int Normalize() {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress());

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress());

 	}

 

 	public int IsSupported(int /*long*/ feature, int /*long*/ version, int[] _retval) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), feature, version, _retval);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), feature, version, _retval);

 	}

 

 	public int GetNamespaceURI(int /*long*/ aNamespaceURI) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 21, getAddress(), aNamespaceURI);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), aNamespaceURI);

 	}

 

 	public int GetPrefix(int /*long*/ aPrefix) {

-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aPrefix);

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aPrefix);

 	}

 

 	public int SetPrefix(int /*long*/ aPrefix) {

+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;

 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aPrefix);

 	}

 

@@ -153,4 +165,67 @@ public class nsIDOMNode extends nsISupports {
 	public int HasAttributes(int[] _retval) {

 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), _retval);

 	}

+	

+	public int GetDOMBaseURI(int /*long*/ aBaseURI) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aBaseURI);

+	}

+

+	/* the following constants are defined in Mozilla 10 */

+	public static final int DOCUMENT_POSITION_DISCONNECTED = 1;

+	public static final int DOCUMENT_POSITION_PRECEDING = 2;

+	public static final int DOCUMENT_POSITION_FOLLOWING = 4;

+	public static final int DOCUMENT_POSITION_CONTAINS = 8;

+	public static final int DOCUMENT_POSITION_CONTAINED_BY = 16;

+	public static final int DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 32;

+

+	public int CompareDocumentPosition(int /*long*/ other, short[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), other, _retval);

+	}

+

+	public int GetTextContent(int /*long*/ aTextContent) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aTextContent);

+	}

+

+	public int SetTextContent(int /*long*/ aTextContent) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), aTextContent);

+	}

+

+	public int LookupPrefix(int /*long*/ namespaceURI, int /*long*/ _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), namespaceURI, _retval);

+	}

+

+	public int IsDefaultNamespace(int /*long*/ namespaceURI, int[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), namespaceURI, _retval);

+	}

+

+	public int LookupNamespaceURI(int /*long*/ prefix, int /*long*/ _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), prefix, _retval);

+	}

+

+	public int IsEqualNode(int /*long*/ arg, int[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), arg, _retval);

+	}

+

+	public int SetUserData(int /*long*/ key, int /*long*/ data, int /*long*/ handler, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), key, data, handler, _retval);

+	}

+

+	public int GetUserData(int /*long*/ key, int /*long*/[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), key, _retval);

+	}

+

+	public int Contains(int /*long*/ aOther, int[] _retval) {

+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;

+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aOther, _retval);

+	}

 }

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
index 9520babad8..403ddf4b0f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDOMUIEvent.java
@@ -29,19 +29,19 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIDOMUIEvent extends nsIDOMEvent {
 
-	static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + 3;
+	static final int LAST_METHOD_ID = nsIDOMEvent.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 3);
 
 	public static final String NS_IDOMUIEVENT_IID_STR =
 		"a6cf90c3-15b3-11d2-932e-00805f8add32";
 
-	public static final String NS_IDOMUIEVENT_8_IID_STR =
-		"25f28689-3f78-47e8-8d76-15b936faf8c1";
+	public static final String NS_IDOMUIEVENT_10_IID_STR =
+		"af3f130e-0c22-4613-a150-780a46c22e3a";
 	
 	public static final nsID NS_IDOMUIEVENT_IID =
 		new nsID(NS_IDOMUIEVENT_IID_STR);
 
-	public static final nsID NS_IDOMUIEVENT_8_IID =
-		new nsID(NS_IDOMUIEVENT_8_IID_STR);
+	public static final nsID NS_IDOMUIEVENT_10_IID =
+		new nsID(NS_IDOMUIEVENT_10_IID_STR);
 
 	public nsIDOMUIEvent(int /*long*/ address) {
 		super(address);
@@ -58,4 +58,58 @@ public class nsIDOMUIEvent extends nsIDOMEvent {
 	public int InitUIEvent(int /*long*/ typeArg, int canBubbleArg, int cancelableArg, int /*long*/ viewArg, int detailArg) {
 		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 3, getAddress(), typeArg, canBubbleArg, cancelableArg, viewArg, detailArg);
 	}
+	
+	/* the following constants are defined in Mozilla 10 */
+	public static final int SCROLL_PAGE_UP = -32768;
+	public static final int SCROLL_PAGE_DOWN = 32768;
+
+	public int GetLayerX(int[] aLayerX) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 4, getAddress(), aLayerX);
+	}
+
+	public int GetLayerY(int[] aLayerY) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 5, getAddress(), aLayerY);
+	}
+
+	public int GetPageX(int[] aPageX) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 6, getAddress(), aPageX);
+	}
+
+	public int GetPageY(int[] aPageY) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 7, getAddress(), aPageY);
+	}
+
+	public int GetWhich(int[] aWhich) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 8, getAddress(), aWhich);
+	}
+
+	public int GetRangeParent(int /*long*/[] aRangeParent) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 9, getAddress(), aRangeParent);
+	}
+
+	public int GetRangeOffset(int[] aRangeOffset) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 10, getAddress(), aRangeOffset);
+	}
+
+	public int GetCancelBubble(int[] aCancelBubble) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 11, getAddress(), aCancelBubble);
+	}
+
+	public int SetCancelBubble(int aCancelBubble) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 12, getAddress(), aCancelBubble);
+	}
+
+	public int GetIsChar(int[] aIsChar) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsIDOMEvent.LAST_METHOD_ID + 13, getAddress(), aIsChar);
+	}
 }
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 2e2b9801fc..10b579aa86 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,489 +29,650 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIDOMWindow extends nsISupports {
 
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (Is8 ? 97 : 17);
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 129 : 17);
 
 	public static final String NS_IDOMWINDOW_IID_STR =
 		"a6cf906b-15b3-11d2-932e-00805f8add32";
 
-	public static final String NS_IDOMWINDOW_8_IID_STR =
-		"972cb379-6bdc-4544-8b46-8d721e12e906";
+	public static final String NS_IDOMWINDOW_10_IID_STR =
+		"8f577294-d572-4473-94b1-d2c5a74a2a74";
 
 	public static final nsID NS_IDOMWINDOW_IID =
 		new nsID(NS_IDOMWINDOW_IID_STR);
 
-	public static final nsID NS_IDOMWINDOW_8_IID =
-		new nsID(NS_IDOMWINDOW_8_IID_STR);
+	public static final nsID NS_IDOMWINDOW_10_IID =
+		new nsID(NS_IDOMWINDOW_10_IID_STR);
 
 	public nsIDOMWindow(int /*long*/ address) {
 		super(address);
 	}
 
+	public int GetWindow(int /*long*/[] aWindow) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow);
+	}
+
+	public int GetSelf(int /*long*/[] aSelf) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSelf);
+	}
+
 	public int GetDocument(int /*long*/[] aDocument) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 3 : 1), getAddress(), aDocument);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 1), getAddress(), aDocument);
 	}
 
 	public int GetParent(int /*long*/[] aParent) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 24 : 2), getAddress(), aParent);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 2), getAddress(), aParent);
 	}
 
 	public int GetTop(int /*long*/[] aTop) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 21 : 3), getAddress(), aTop);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 3), getAddress(), aTop);
 	}
 
 	public int GetScrollbars(int /*long*/[] aScrollbars) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 11 : 4), getAddress(), aScrollbars);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 4), getAddress(), aScrollbars);
 	}
 
 	public int GetFrames(int /*long*/[] aFrames) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 62 : 5), getAddress(), aFrames);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 62 : 5), getAddress(), aFrames);
 	}
 
 	public int GetName(int /*long*/ aName) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 4 : 6), getAddress(), aName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 6), getAddress(), aName);
 	}
 
 	public int SetName(int /*long*/ aName) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 5 : 7), getAddress(), aName);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 7), getAddress(), aName);
+	}
+
+	public int GetLocation(int /*long*/[] aLocation) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLocation);
+	}
+
+	public int GetHistory(int /*long*/[] aHistory) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aHistory);
+	}
+
+	public int GetLocationbar(int /*long*/[] aLocationbar) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLocationbar);
+	}
+
+	public int GetMenubar(int /*long*/[] aMenubar) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMenubar);
+	}
+
+	public int GetPersonalbar(int /*long*/[] aPersonalbar) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPersonalbar);
 	}
 
 	public int GetTextZoom(float[] aTextZoom) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 63 : 8), getAddress(), aTextZoom);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 63 : 8), getAddress(), aTextZoom);
 	}
 
 	public int SetTextZoom(float aTextZoom) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 64 : 9), getAddress(), aTextZoom);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 64 : 9), getAddress(), aTextZoom);
 	}
 
 	public int GetScrollX(int[] aScrollX) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 45 : 10), getAddress(), aScrollX);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 45 : 10), getAddress(), aScrollX);
 	}
 
 	public int GetScrollY(int[] aScrollY) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 47 : 11), getAddress(), aScrollY);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 47 : 11), getAddress(), aScrollY);
 	}
 
 	public int ScrollTo(int xScroll, int yScroll) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 50 : 12), getAddress(), xScroll, yScroll);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 50 : 12), getAddress(), xScroll, yScroll);
 	}
 
 	public int ScrollBy(int xScrollDif, int yScrollDif) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 51 : 13), getAddress(), xScrollDif, yScrollDif);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 51 : 13), getAddress(), xScrollDif, yScrollDif);
 	}
 
 	public int GetSelection(int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 38 : 14), getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 38 : 14), getAddress(), _retval);
 	}
 
 	public int ScrollByLines(int numLines) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 65 : 15), getAddress(), numLines);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 65 : 15), getAddress(), numLines);
 	}
 
 	public int ScrollByPages(int numPages) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 66 : 16), getAddress(), numPages);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 66 : 16), getAddress(), numPages);
 	}
 
 	public int SizeToContent() {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 67 : 17), getAddress());
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 67 : 17), getAddress());
 	}
 	
-	public int GetWindow(int /*long*/[] aWindow) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow);
-	}
-
-	public int GetSelf(int /*long*/[] aSelf) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aSelf);
-	}
-
-	public int GetLocation(int /*long*/[] aLocation) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 6, getAddress(), aLocation);
-	}
-
-	public int GetHistory(int /*long*/[] aHistory) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aHistory);
-	}
-
-	public int GetLocationbar(int /*long*/[] aLocationbar) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aLocationbar);
-	}
-
-	public int GetMenubar(int /*long*/[] aMenubar) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aMenubar);
-	}
-
-	public int GetPersonalbar(int /*long*/[] aPersonalbar) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 10, getAddress(), aPersonalbar);
-	}
 
 	public int GetStatusbar(int /*long*/[] aStatusbar) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 12, getAddress(), aStatusbar);
 	}
 
 	public int GetToolbar(int /*long*/[] aToolbar) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 13, getAddress(), aToolbar);
 	}
 
 	public int GetStatus(int /*long*/ aStatus) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 14, getAddress(), aStatus);
 	}
 
 	public int SetStatus(int /*long*/ aStatus) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aStatus);
 	}
 
 	public int Close() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress());
 	}
 
 	public int Stop() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 17, getAddress());
 	}
 
 	public int Focus() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 18, getAddress());
 	}
 
 	public int Blur() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 19, getAddress());
 	}
 
 	public int GetLength(int[] aLength) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 20, getAddress(), aLength);
 	}
 
 	public int GetOpener(int /*long*/[] aOpener) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 22, getAddress(), aOpener);
 	}
 
 	public int SetOpener(int /*long*/ aOpener) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 23, getAddress(), aOpener);
 	}
 
 	public int GetFrameElement(int /*long*/[] aFrameElement) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 25, getAddress(), aFrameElement);
 	}
 
 	public int GetNavigator(int /*long*/[] aNavigator) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 26, getAddress(), aNavigator);
 	}
 
 	public int GetApplicationCache(int /*long*/[] aApplicationCache) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aApplicationCache);
 	}
 
 	public int Alert(int /*long*/ text) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), text);
 	}
 
 	public int Confirm(int /*long*/ text, int[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), text, _retval);
 	}
 
 	public int Prompt(int /*long*/ aMessage, int /*long*/ aInitial, int /*long*/ _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), aMessage, aInitial, _retval);
 	}
 
 	public int Print() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress());
 	}
 
 	public int ShowModalDialog(int /*long*/ aURI, int /*long*/ aArgs, int /*long*/ aOptions, int /*long*/[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aURI, aArgs, aOptions, _retval);
 	}
 
 	public int PostMessageMoz(int /*long*/ message, int /*long*/ targetOrigin, int /*long*/ cx) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 33, getAddress(), message, targetOrigin, cx);
 	}
 
 	public int Atob(int /*long*/ aAsciiString, int /*long*/ _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 34, getAddress(), aAsciiString, _retval);
 	}
 
 	public int Btoa(int /*long*/ aBase64Data, int /*long*/ _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 35, getAddress(), aBase64Data, _retval);
 	}
 
 	public int GetSessionStorage(int /*long*/[] aSessionStorage) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 36, getAddress(), aSessionStorage);
 	}
 
 	public int GetLocalStorage(int /*long*/[] aLocalStorage) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 37, getAddress(), aLocalStorage);
 	}
 
 	public int MatchMedia(int /*long*/ media_query_list, int /*long*/[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 39, getAddress(), media_query_list, _retval);
 	}
 
 	public int GetScreen(int /*long*/[] aScreen) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 40, getAddress(), aScreen);
 	}
 
 	public int GetInnerWidth(int[] aInnerWidth) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 41, getAddress(), aInnerWidth);
 	}
 
 	public int SetInnerWidth(int aInnerWidth) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 42, getAddress(), aInnerWidth);
 	}
 
 	public int GetInnerHeight(int[] aInnerHeight) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 43, getAddress(), aInnerHeight);
 	}
 
 	public int SetInnerHeight(int aInnerHeight) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 44, getAddress(), aInnerHeight);
 	}
 
 	public int GetPageXOffset(int[] aPageXOffset) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 46, getAddress(), aPageXOffset);
 	}
 
 	public int GetPageYOffset(int[] aPageYOffset) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 48, getAddress(), aPageYOffset);
 	}
 
 	public int Scroll(int xScroll, int yScroll) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 49, getAddress(), xScroll, yScroll);
 	}
 
 	public int GetScreenX(int[] aScreenX) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 52, getAddress(), aScreenX);
 	}
 
 	public int SetScreenX(int aScreenX) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 53, getAddress(), aScreenX);
 	}
 
 	public int GetScreenY(int[] aScreenY) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 54, getAddress(), aScreenY);
 	}
 
 	public int SetScreenY(int aScreenY) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 55, getAddress(), aScreenY);
 	}
 
 	public int GetOuterWidth(int[] aOuterWidth) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 56, getAddress(), aOuterWidth);
 	}
 
 	public int SetOuterWidth(int aOuterWidth) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 57, getAddress(), aOuterWidth);
 	}
 
 	public int GetOuterHeight(int[] aOuterHeight) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 58, getAddress(), aOuterHeight);
 	}
 
 	public int SetOuterHeight(int aOuterHeight) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 59, getAddress(), aOuterHeight);
 	}
 
 	public int GetComputedStyle(int /*long*/ elt, int /*long*/ pseudoElt, int /*long*/[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 60, getAddress(), elt, pseudoElt, _retval);
 	}
 
 	public int GetWindowRoot(int /*long*/[] aWindowRoot) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 61, getAddress(), aWindowRoot);
 	}
 
 	public int GetContent(int /*long*/[] aContent) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 68, getAddress(), aContent);
 	}
 
 	public int GetPrompter(int /*long*/[] aPrompter) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 69, getAddress(), aPrompter);
 	}
 
 	public int GetClosed(int[] aClosed) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 70, getAddress(), aClosed);
 	}
 
 	public int GetCrypto(int /*long*/[] aCrypto) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 71, getAddress(), aCrypto);
 	}
 
 	public int GetPkcs11(int /*long*/[] aPkcs11) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 72, getAddress(), aPkcs11);
 	}
 
 	public int GetControllers(int /*long*/[] aControllers) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 73, getAddress(), aControllers);
 	}
 
 	public int GetDefaultStatus(int /*long*/ aDefaultStatus) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 74, getAddress(), aDefaultStatus);
 	}
 
 	public int SetDefaultStatus(int /*long*/ aDefaultStatus) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 75, getAddress(), aDefaultStatus);
 	}
 
 	public int GetMozInnerScreenX(float[] aMozInnerScreenX) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 76, getAddress(), aMozInnerScreenX);
 	}
 
 	public int GetMozInnerScreenY(float[] aMozInnerScreenY) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 77, getAddress(), aMozInnerScreenY);
 	}
 
 	public int GetScrollMaxX(int[] aScrollMaxX) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 78, getAddress(), aScrollMaxX);
 	}
 
 	public int GetScrollMaxY(int[] aScrollMaxY) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 79, getAddress(), aScrollMaxY);
 	}
 
 	public int GetFullScreen(int[] aFullScreen) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 80, getAddress(), aFullScreen);
 	}
 
 	public int SetFullScreen(int aFullScreen) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 81, getAddress(), aFullScreen);
 	}
 
 	public int Back() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 82, getAddress());
 	}
 
 	public int Forward() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 83, getAddress());
 	}
 
 	public int Home() {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 84, getAddress());
 	}
 
 	public int MoveTo(int xPos, int yPos) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 85, getAddress(), xPos, yPos);
 	}
 
 	public int MoveBy(int xDif, int yDif) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 86, getAddress(), xDif, yDif);
 	}
 
 	public int ResizeTo(int width, int height) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 87, getAddress(), width, height);
 	}
 
 	public int ResizeBy(int widthDif, int heightDif) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 88, getAddress(), widthDif, heightDif);
 	}
 
 	public int Open(int /*long*/ url, int /*long*/ name, int /*long*/ options, int /*long*/[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 89, getAddress(), url, name, options, _retval);
 	}
 
 	public int OpenDialog(int /*long*/ url, int /*long*/ name, int /*long*/ options, int /*long*/ aExtraArgument, int /*long*/[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 90, getAddress(), url, name, options, aExtraArgument, _retval);
 	}
 
 	public int UpdateCommands(int /*long*/ action) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 91, getAddress(), action);
 	}
 
 	public int Find(int /*long*/ str, int caseSensitive, int backwards, int wrapAround, int wholeWord, int searchInFrames, int showDialog, int[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 92, getAddress(), str, caseSensitive, backwards, wrapAround, wholeWord, searchInFrames, showDialog, _retval);
 	}
 
 	public int GetMozPaintCount(int /*long*/ aMozPaintCount) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 93, getAddress(), aMozPaintCount);
 	}
 
 	public int MozRequestAnimationFrame(int /*long*/ aListener) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 94, getAddress(), aListener);
 	}
 
 	public int GetMozAnimationStartTime(long[] aMozAnimationStartTime) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 95, getAddress(), aMozAnimationStartTime);
 	}
 
 	public int GetURL(int /*long*/[] aURL) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 96, getAddress(), aURL);
 	}
 
 	public int GetGlobalStorage(int /*long*/[] aGlobalStorage) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 97, getAddress(), aGlobalStorage);
 	}
+
+	public int GetOnafterprint(int /*long*/ cx, int /*long*/ aOnafterprint) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 98, getAddress(), cx, aOnafterprint);
+	}
+
+	public int SetOnafterprint(int /*long*/ cx, int /*long*/ aOnafterprint) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 99, getAddress(), cx, aOnafterprint);
+	}
+
+	public int GetOnbeforeprint(int /*long*/ cx, int /*long*/ aOnbeforeprint) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 100, getAddress(), cx, aOnbeforeprint);
+	}
+
+	public int SetOnbeforeprint(int /*long*/ cx, int /*long*/ aOnbeforeprint) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 101, getAddress(), cx, aOnbeforeprint);
+	}
+
+	public int GetOnbeforeunload(int /*long*/ cx, int /*long*/ aOnbeforeunload) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 102, getAddress(), cx, aOnbeforeunload);
+	}
+
+	public int SetOnbeforeunload(int /*long*/ cx, int /*long*/ aOnbeforeunload) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 103, getAddress(), cx, aOnbeforeunload);
+	}
+
+	public int GetOnhashchange(int /*long*/ cx, int /*long*/ aOnhashchange) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 104, getAddress(), cx, aOnhashchange);
+	}
+
+	public int SetOnhashchange(int /*long*/ cx, int /*long*/ aOnhashchange) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 105, getAddress(), cx, aOnhashchange);
+	}
+
+	public int GetOnmessage(int /*long*/ cx, int /*long*/ aOnmessage) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 106, getAddress(), cx, aOnmessage);
+	}
+
+	public int SetOnmessage(int /*long*/ cx, int /*long*/ aOnmessage) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 107, getAddress(), cx, aOnmessage);
+	}
+
+	public int GetOnoffline(int /*long*/ cx, int /*long*/ aOnoffline) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 108, getAddress(), cx, aOnoffline);
+	}
+
+	public int SetOnoffline(int /*long*/ cx, int /*long*/ aOnoffline) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 109, getAddress(), cx, aOnoffline);
+	}
+
+	public int GetOnonline(int /*long*/ cx, int /*long*/ aOnonline) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 110, getAddress(), cx, aOnonline);
+	}
+
+	public int SetOnonline(int /*long*/ cx, int /*long*/ aOnonline) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 111, getAddress(), cx, aOnonline);
+	}
+
+	public int GetOnpopstate(int /*long*/ cx, int /*long*/ aOnpopstate) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 112, getAddress(), cx, aOnpopstate);
+	}
+
+	public int SetOnpopstate(int /*long*/ cx, int /*long*/ aOnpopstate) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 113, getAddress(), cx, aOnpopstate);
+	}
+
+	public int GetOnpagehide(int /*long*/ cx, int /*long*/ aOnpagehide) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 114, getAddress(), cx, aOnpagehide);
+	}
+
+	public int SetOnpagehide(int /*long*/ cx, int /*long*/ aOnpagehide) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 115, getAddress(), cx, aOnpagehide);
+	}
+
+	public int GetOnpageshow(int /*long*/ cx, int /*long*/ aOnpageshow) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 116, getAddress(), cx, aOnpageshow);
+	}
+
+	public int SetOnpageshow(int /*long*/ cx, int /*long*/ aOnpageshow) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 117, getAddress(), cx, aOnpageshow);
+	}
+
+	public int GetOnresize(int /*long*/ cx, int /*long*/ aOnresize) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 118, getAddress(), cx, aOnresize);
+	}
+
+	public int SetOnresize(int /*long*/ cx, int /*long*/ aOnresize) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 119, getAddress(), cx, aOnresize);
+	}
+
+	public int GetOnunload(int /*long*/ cx, int /*long*/ aOnunload) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 120, getAddress(), cx, aOnunload);
+	}
+
+	public int SetOnunload(int /*long*/ cx, int /*long*/ aOnunload) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 121, getAddress(), cx, aOnunload);
+	}
+
+	public int GetOndevicemotion(int /*long*/ cx, int /*long*/ aOndevicemotion) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 122, getAddress(), cx, aOndevicemotion);
+	}
+
+	public int SetOndevicemotion(int /*long*/ cx, int /*long*/ aOndevicemotion) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 123, getAddress(), cx, aOndevicemotion);
+	}
+
+	public int GetOndeviceorientation(int /*long*/ cx, int /*long*/ aOndeviceorientation) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 124, getAddress(), cx, aOndeviceorientation);
+	}
+
+	public int SetOndeviceorientation(int /*long*/ cx, int /*long*/ aOndeviceorientation) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 125, getAddress(), cx, aOndeviceorientation);
+	}
+
+	public int GetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 126, getAddress(), cx, aOnmouseenter);
+	}
+
+	public int SetOnmouseenter(int /*long*/ cx, int /*long*/ aOnmouseenter) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 127, getAddress(), cx, aOnmouseenter);
+	}
+
+	public int GetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 128, getAddress(), cx, aOnmouseleave);
+	}
+
+	public int SetOnmouseleave(int /*long*/ cx, int /*long*/ aOnmouseleave) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 129, getAddress(), cx, aOnmouseleave);
+	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
index 0260249822..aec4a31c9d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIDocShell_1_8.java
@@ -37,11 +37,11 @@ public class nsIDocShell_1_8 extends nsISupports {
 	public static final nsID NS_IDOCSHELL_IID =
 		new nsID(NS_IDOCSHELL_IID_STR);
 
-	public static final String NS_IDOCSHELL_8_IID_STR =
+	public static final String NS_IDOCSHELL_10_IID_STR =
 		"0666adf8-8738-4ca7-a917-0348f47d2f40";
 
-	public static final nsID NS_IDOCSHELL_8_IID =
-		new nsID(NS_IDOCSHELL_8_IID_STR);
+	public static final nsID NS_IDOCSHELL_10_IID =
+		new nsID(NS_IDOCSHELL_10_IID_STR);
 
 	public nsIDocShell_1_8(int /*long*/ address) {
 		super(address);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
index e7efb9a1b5..b841fadbae 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIFilePicker_1_8.java
@@ -29,19 +29,19 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIFilePicker_1_8 extends nsISupports {
 
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (Is8 ? 17 : 15);
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15);
 
 	public static final String NS_IFILEPICKER_IID_STR =
 		"80faf095-c807-4558-a2cc-185ed70754ea";
 
-	public static final String NS_IFILEPICKER_8_IID_STR =
+	public static final String NS_IFILEPICKER_10_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_8_IID =
-		new nsID(NS_IFILEPICKER_8_IID_STR);
+	public static final nsID NS_IFILEPICKER_10_IID =
+		new nsID(NS_IFILEPICKER_10_IID_STR);
 	
 	public nsIFilePicker_1_8(int /*long*/ address) {
 		super(address);
@@ -124,16 +124,16 @@ public class nsIFilePicker_1_8 extends nsISupports {
 	}
 
 	public int Show(int /*long*/ _retval) {
-		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (Is8 ? 17 : 15), getAddress(), _retval);
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 15), getAddress(), _retval);
 	}
 	
 	public int GetAddToRecentDocs(int[] aAddToRecentDocs) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 15, getAddress(), aAddToRecentDocs);
 	}
 
 	public int SetAddToRecentDocs(int aAddToRecentDocs) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 16, getAddress(), aAddToRecentDocs);
 	}
 }
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 bc5c4eaf59..eb5f5a6449 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
@@ -34,14 +34,14 @@ public class nsIPrefBranch extends nsISupports {
 	public static final String NS_IPREFBRANCH_IID_STR =
 		"56c35506-f14b-11d3-99d3-ddbfac2ccf65";
 
-	public static final String NS_IPREFBRANCH_8_IID_STR =
-		"e0b6e170-691b-11e0-ae3e-0800200c9a66";
+	public static final String NS_IPREFBRANCH_10_IID_STR =
+		"e162bfa0-01bd-4e9f-9843-8fb2efcd6d1f";
 	
 	public static final nsID NS_IPREFBRANCH_IID =
 		new nsID(NS_IPREFBRANCH_IID_STR);
 
-	public static final nsID NS_IPREFBRANCH_8_IID =
-		new nsID(NS_IPREFBRANCH_8_IID_STR);
+	public static final nsID NS_IPREFBRANCH_10_IID =
+		new nsID(NS_IPREFBRANCH_10_IID_STR);
 	
 	public nsIPrefBranch(int /*long*/ 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 1de7212b75..2095996b6d 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 + (Is8 ? 26 : 23);
+	static final int LAST_METHOD_ID = nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 26 : 23);
 
 	public static final String NS_IPRINCIPAL_IID_STR =
 		"b8268b9a-2403-44ed-81e3-614075c92034";
@@ -37,11 +37,11 @@ public class nsIPrincipal extends nsISerializable {
 	public static final nsID NS_IPRINCIPAL_IID =
 		new nsID(NS_IPRINCIPAL_IID_STR);
 
-	public static final String NS_IPRINCIPAL_8_IID_STR =
+	public static final String NS_IPRINCIPAL_10_IID_STR =
 		"b406a2db-e547-4c95-b8e2-ad09ecb54ce0";
 
-	public static final nsID NS_IPRINCIPAL_8_IID =
-		new nsID(NS_IPRINCIPAL_8_IID_STR);
+	public static final nsID NS_IPRINCIPAL_10_IID =
+		new nsID(NS_IPRINCIPAL_10_IID_STR);
 
 	public nsIPrincipal(int /*long*/ address) {
 		super(address);
@@ -61,101 +61,101 @@ public class nsIPrincipal extends nsISerializable {
 	}
 
 	public int EqualsIgnoringDomain(int /*long*/ other, int[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 3, getAddress(), other, _retval);
 	}
 
 	public int GetHashValue(int[] aHashValue) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 4 : 3), getAddress(), aHashValue);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 3), getAddress(), aHashValue);
 	}
 
 	public int GetJSPrincipals(int /*long*/ cx, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 5 : 4), getAddress(), cx, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 4), getAddress(), cx, _retval);
 	}
 
 	public int GetSecurityPolicy(int /*long*/[] aSecurityPolicy) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 6 : 5), getAddress(), aSecurityPolicy);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 5), getAddress(), aSecurityPolicy);
 	}
 
 	public int SetSecurityPolicy(int /*long*/ aSecurityPolicy) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 7 : 6), getAddress(), aSecurityPolicy);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 6), getAddress(), aSecurityPolicy);
 	}
 
 	public int CanEnableCapability(byte[] capability, int /*long*/ _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 8 : 7), getAddress(), capability, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7), getAddress(), capability, _retval);
 	}
 
 	public int SetCanEnableCapability(byte[] capability, short canEnable) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 9 : 8), getAddress(), capability, canEnable);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 8), getAddress(), capability, canEnable);
 	}
 
 	public int IsCapabilityEnabled(byte[] capability, int /*long*/ annotation, int[] _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 10 : 9), getAddress(), capability, annotation, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 9), getAddress(), capability, annotation, _retval);
 	}
 
 	public int EnableCapability(byte[] capability, int /*long*/[] annotation) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 11 : 10), getAddress(), capability, annotation);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 11 : 10), getAddress(), capability, annotation);
 	}
 
 	public int RevertCapability(byte[] capability, int /*long*/[] annotation) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 12 : 11), getAddress(), capability, annotation);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 11), getAddress(), capability, annotation);
 	}
 
 	public int DisableCapability(byte[] capability, int /*long*/[] annotation) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 13 : 12), getAddress(), capability, annotation);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 13 : 12), getAddress(), capability, annotation);
 	}
 
 	public int GetURI(int /*long*/[] aURI) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 14 : 13), getAddress(), aURI);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 13), getAddress(), aURI);
 	}
 
 	public int GetDomain(int /*long*/[] aDomain) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 15 : 14), getAddress(), aDomain);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 14), getAddress(), aDomain);
 	}
 
 	public int SetDomain(int /*long*/ aDomain) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 16 : 15), getAddress(), aDomain);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 15), getAddress(), aDomain);
 	}
 
 	public int GetOrigin(int /*long*/[] aOrigin) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 17 : 16), getAddress(), aOrigin);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 16), getAddress(), aOrigin);
 	}
 
 	public int GetHasCertificate(int[] aHasCertificate) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 18 : 17), getAddress(), aHasCertificate);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 18 : 17), getAddress(), aHasCertificate);
 	}
 
 	public int GetFingerprint(int /*long*/ aFingerprint) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 19 : 18), getAddress(), aFingerprint);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 18), getAddress(), aFingerprint);
 	}
 
 	public int GetPrettyName(int /*long*/ aPrettyName) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 20 : 19), getAddress(), aPrettyName);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 19), getAddress(), aPrettyName);
 	}
 
 	public int Subsumes(int /*long*/ other, int[] _retval) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 21 : 20), getAddress(), other, _retval);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 20), getAddress(), other, _retval);
 	}
 
 	public int CheckMayLoad(int /*long*/ uri, int report) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 22 : 21), getAddress(), uri, report);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 21), getAddress(), uri, report);
 	}
 
 	public int GetSubjectName(int /*long*/ aSubjectName) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 23 : 22), getAddress(), aSubjectName);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 22), getAddress(), aSubjectName);
 	}
 
 	public int GetCertificate(int /*long*/[] aCertificate) {
-		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (Is8 ? 24 : 23), getAddress(), aCertificate);
+		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 23), getAddress(), aCertificate);
 	}
 	
 	public int GetCsp(int /*long*/[] aCsp) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 25, getAddress(), aCsp);
 	}
 
 	public int SetCsp(int /*long*/ aCsp) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISerializable.LAST_METHOD_ID + 26, getAddress(), aCsp);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
index d26735714e..e10d26f7f0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsISSLStatus.java
@@ -29,14 +29,20 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsISSLStatus extends nsISupports {
 
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + 7;
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 7);
 
 	public static final String NS_ISSLSTATUS_IID_STR =
 		"cfede939-def1-49be-81ed-d401b3a07d1c";
 
+	public static final String NS_ISSLSTATUS_10_IID_STR =
+		"3f1fcd83-c5a9-4cd1-a250-7676ca7c7e34";
+	
 	public static final nsID NS_ISSLSTATUS_IID =
 		new nsID(NS_ISSLSTATUS_IID_STR);
 
+	public static final nsID NS_ISSLSTATUS_10_IID =
+		new nsID(NS_ISSLSTATUS_10_IID_STR);
+
 	public nsISSLStatus(int /*long*/ address) {
 		super(address);
 	}
@@ -68,4 +74,9 @@ public class nsISSLStatus extends nsISupports {
 	public int GetIsUntrusted(int[] aIsUntrusted) {
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 7, getAddress(), aIsUntrusted);
 	}
+	
+	public int GetIsExtendedValidation(int[] aIsExtendedValidation) {
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aIsExtendedValidation);
+	}
 }
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 b0aba4ae17..0151fbffc3 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 + (Is8 ? 27 : 26);
+	static final int LAST_METHOD_ID = nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 27 : 26);
 
 	public static final String NS_ISCRIPTSECURITYMANAGER_IID_STR =
 		"3fffd8e8-3fea-442e-a0ed-2ba81ae197d5";
@@ -43,11 +43,11 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 	public static final nsID NS_ISCRIPTSECURITYMANAGER_191_IID =
 		new nsID(NS_ISCRIPTSECURITYMANAGER_191_IID_STR);
 
-	public static final String NS_ISCRIPTSECURITYMANAGER_8_IID_STR =
+	public static final String NS_ISCRIPTSECURITYMANAGER_10_IID_STR =
 		"50eda256-4dd2-4c7c-baed-96983910af9f";
 
-	public static final nsID NS_ISCRIPTSECURITYMANAGER_8_IID =
-		new nsID(NS_ISCRIPTSECURITYMANAGER_8_IID_STR);
+	public static final nsID NS_ISCRIPTSECURITYMANAGER_10_IID =
+		new nsID(NS_ISCRIPTSECURITYMANAGER_10_IID_STR);
 
 	public nsIScriptSecurityManager(int /*long*/ address) {
 		super(address);
@@ -58,12 +58,12 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 //	}
 
 	public int CheckConnect(int /*long*/ aJSContext, int /*long*/ aTargetURI, byte[] aClassName, byte[] aProperty) {
-		if (Is8) return XPCOM.NS_COMFALSE;
+		if (IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 2, getAddress(), aJSContext, aTargetURI, aClassName, aProperty);
 	}
 
 	public int CheckLoadURIFromScript(int /*long*/ cx, int /*long*/ uri) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 2 : 3), getAddress(), cx, uri);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 2 : 3), getAddress(), cx, uri);
 	}
 
 	public static final int STANDARD = 0;
@@ -74,35 +74,35 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 	public static final int DISALLOW_SCRIPT = 8;
 
 	public int CheckLoadURIWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 3 : 4), getAddress(), aPrincipal, uri, flags);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 3 : 4), getAddress(), aPrincipal, uri, flags);
 	}
 
 	public int CheckLoadURI(int /*long*/ from, int /*long*/ uri, int flags) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 4 : 5), getAddress(), from, uri, flags);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 4 : 5), getAddress(), from, uri, flags);
 	}
 
 	public int CheckLoadURIStrWithPrincipal(int /*long*/ aPrincipal, int /*long*/ uri, int flags) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 5 : 6), getAddress(), aPrincipal, uri, flags);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 5 : 6), getAddress(), aPrincipal, uri, flags);
 	}
 
 	public int CheckLoadURIStr(int /*long*/ from, int /*long*/ uri, int flags) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 6 : 7), getAddress(), from, uri, flags);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 6 : 7), getAddress(), from, uri, flags);
 	}
 
 	public int CheckFunctionAccess(int /*long*/ cx, int /*long*/ funObj, int /*long*/ targetObj) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 7 : 8), getAddress(), cx, funObj, targetObj);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 7 : 8), getAddress(), cx, funObj, targetObj);
 	}
 
 	public int CanExecuteScripts(int /*long*/ cx, int /*long*/ principal, int[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 8 : 9), getAddress(), cx, principal, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 8 : 9), getAddress(), cx, principal, _retval);
 	}
 
 	public int GetSubjectPrincipal(int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 9 : 10), getAddress(), _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 10), getAddress(), _retval);
 	}
 
 	public int GetSystemPrincipal(int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 10 : 11), getAddress(), _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 10 : 11), getAddress(), _retval);
 	}
 
 //	public int GetCertificatePrincipal(int /*long*/ aCertFingerprint, int /*long*/ aSubjectName, int /*long*/ aPrettyName, int /*long*/ aCert, int /*long*/ aURI, int /*long*/[] _retval) {
@@ -110,7 +110,7 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 //	}
 
 	public int GetCodebasePrincipal(int /*long*/ aURI, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 12 : 13), getAddress(), aURI, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 12 : 13), getAddress(), aURI, _retval);
 	}
 
 //	public int RequestCapability(int /*long*/ principal, byte[] capability, int /*long*/ _retval) {
@@ -118,19 +118,19 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 //	}
 
 	public int IsCapabilityEnabled(byte[] capability, int[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 14 : 15), getAddress(), capability, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 14 : 15), getAddress(), capability, _retval);
 	}
 	
 	public int EnableCapability(byte[] capability) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 15 : 16), getAddress(), capability);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 15 : 16), getAddress(), capability);
 	}
 	
 	public int RevertCapability(byte[] capability) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 16 : 17), getAddress(), capability);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 16 : 17), getAddress(), capability);
 	}
 	
 	public int DisableCapability(byte[] capability) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 17 : 18), getAddress(), capability);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 17 : 18), getAddress(), capability);
 	}
 
 //	public int SetCanEnableCapability(int /*long*/ certificateFingerprint, byte[] capability, !ERROR UNKNOWN C TYPE <PRInt16 >! canEnable) {
@@ -138,40 +138,40 @@ public class nsIScriptSecurityManager extends nsIXPCSecurityManager {
 //	}
 
 	public int GetObjectPrincipal(int /*long*/ cx, int /*long*/ obj, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 19 : 20), getAddress(), cx, obj, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 19 : 20), getAddress(), cx, obj, _retval);
 	}
 	
 	public int SubjectPrincipalIsSystem(int[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 20 : 21), getAddress(), _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 20 : 21), getAddress(), _retval);
 	}
 	
 	public int CheckSameOrigin(int /*long*/ aJSContext, int /*long*/ aTargetURI) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 21 : 22), getAddress(), aJSContext, aTargetURI);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 21 : 22), getAddress(), aJSContext, aTargetURI);
 	}
 	
 	public int CheckSameOriginURI(int /*long*/ aSourceURI, int /*long*/ aTargetURI, int reportError) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 22 : 23), getAddress(), aSourceURI, aTargetURI, reportError);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 22 : 23), getAddress(), aSourceURI, aTargetURI, reportError);
 	}
 	
 	public int GetPrincipalFromContext(int /*long*/ cx, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 23 : 24), getAddress(), cx, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 23 : 24), getAddress(), cx, _retval);
 	}
 	
 	public int GetChannelPrincipal(int /*long*/ aChannel, int /*long*/[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 24 : 25), getAddress(), aChannel, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 24 : 25), getAddress(), aChannel, _retval);
 	}
 	
 	public int IsSystemPrincipal(int /*long*/ aPrincipal, int[] _retval) {
-		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (Is8 ? 25 : 26), getAddress(), aPrincipal, _retval);
+		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + (IsXULRunner10 ? 25 : 26), getAddress(), aPrincipal, _retval);
 	}
 	
 	public int PushContextPrincipal(int /*long*/ cx, int /*long*/ fp, int /*long*/ principal) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 26, getAddress(), cx, fp, principal);
 	}
 	
 	public int PopContextPrincipal(int /*long*/ cx) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsIXPCSecurityManager.LAST_METHOD_ID + 27, getAddress(), cx);
 	}
 }
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 6b85b54a4e..4aaaf810af 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 Is8;
+	public static boolean IsXULRunner10;
 	
 	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/nsIURI.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
index d8c85a508c..98710ab518 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIURI.java
@@ -29,19 +29,19 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIURI extends nsISupports {
 	
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (Is8 ? 32 : 26);
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 32 : 26);
 
 	public static final String NS_IURI_IID_STR =
 		"07a22cc0-0ce5-11d3-9331-00104ba0fd40";
 
-	public static final String NS_IURI_8_IID_STR =
+	public static final String NS_IURI_10_IID_STR =
 		"395fe045-7d18-4adb-a3fd-af98c8a1af11";
 
 	public static final nsID NS_IURI_IID =
 		new nsID(NS_IURI_IID_STR);
 	
-	public static final nsID NS_IURI_8_IID =
-			new nsID(NS_IURI_8_IID_STR);
+	public static final nsID NS_IURI_10_IID =
+			new nsID(NS_IURI_10_IID_STR);
 
 	public nsIURI(int /*long*/ address) {
 		super(address);
@@ -152,32 +152,32 @@ public class nsIURI extends nsISupports {
 	}
 	
 	public int GetRef(int /*long*/ aRef) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 27, getAddress(), aRef);
 	}
 
 	public int SetRef(int /*long*/ aRef) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 28, getAddress(), aRef);
 	}
 
 	public int EqualsExceptRef(int /*long*/ other, int[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 29, getAddress(), other, _retval);
 	}
 
 	public int CloneIgnoringRef(int /*long*/[] _retval) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 30, getAddress(), _retval);
 	}
 
 	public int GetSpecIgnoringRef(int /*long*/ aSpecIgnoringRef) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 31, getAddress(), aSpecIgnoringRef);
 	}
 
 	public int GetHasRef(int[] aHasRef) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 32, getAddress(), aHasRef);
 	}
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
index da52ada08d..41da750e52 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIWebBrowser.java
@@ -29,19 +29,19 @@ package org.eclipse.swt.internal.mozilla;
 
 public class nsIWebBrowser extends nsISupports {
 
-	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (Is8 ? 9 : 7);
+	static final int LAST_METHOD_ID = nsISupports.LAST_METHOD_ID + (IsXULRunner10 ? 9 : 7);
 
 	public static final String NS_IWEBBROWSER_IID_STR =
 		"69e5df00-7b8b-11d3-af61-00a024ffc08c";
 
-	public static final String NS_IWEBBROWSER_8_IID_STR =
+	public static final String NS_IWEBBROWSER_10_IID_STR =
 		"33e9d001-caab-4ba9-8961-54902f197202";
 	
 	public static final nsID NS_IWEBBROWSER_IID =
 		new nsID(NS_IWEBBROWSER_IID_STR);
 
-	public static final nsID NS_IWEBBROWSER_8_IID =
-		new nsID(NS_IWEBBROWSER_8_IID_STR);
+	public static final nsID NS_IWEBBROWSER_10_IID =
+		new nsID(NS_IWEBBROWSER_10_IID_STR);
 	
 	public nsIWebBrowser(int /*long*/ address) {
 		super(address);
@@ -76,12 +76,12 @@ public class nsIWebBrowser extends nsISupports {
 	}
 
 	public int GetIsActive(int[] aIsActive) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 8, getAddress(), aIsActive);
 	}
 
 	public int SetIsActive(int aIsActive) {
-		if (!Is8) return XPCOM.NS_COMFALSE;
+		if (!IsXULRunner10) return XPCOM.NS_COMFALSE;
 		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 9, getAddress(), aIsActive);
 	}
 }