diff options
| author | Grant Gayed | 2010-01-12 19:34:33 +0000 |
|---|---|---|
| committer | Grant Gayed | 2010-01-12 19:34:33 +0000 |
| commit | 26ced1c8621f54efb927dff924b41de1e09708b7 (patch) | |
| tree | a8e47c027f0b9794283327dd182614fcea2dccd7 | |
| parent | 0a6979e81e23cd1a193805ba12faa02a59cc8481 (diff) | |
| download | eclipse.platform.swt-26ced1c8621f54efb927dff924b41de1e09708b7.tar.gz eclipse.platform.swt-26ced1c8621f54efb927dff924b41de1e09708b7.tar.xz eclipse.platform.swt-26ced1c8621f54efb927dff924b41de1e09708b7.zip | |
296284 - xulrunner 1.9.2 changes
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/browser/Mozilla.java | 19 |
1 files changed, 15 insertions, 4 deletions
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 108e550964..7f20d9776e 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 @@ -1773,8 +1773,13 @@ public boolean execute (String script) { nsIInterfaceRequestor interfaceRequestor = new nsIInterfaceRequestor (result[0]); result[0] = 0; - nsID scriptGlobalObjectNSID = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$ - rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID, result); + nsID scriptGlobalObjectNSID_1_9 = new nsID ("6afecd40-0b9a-4cfd-8c42-0f645cd91829"); /* nsIScriptGlobalObject */ //$NON-NLS-1$ + rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9, result); + if (!(rc == XPCOM.NS_OK && result[0] != 0)) { + result[0] = 0; + nsID scriptGlobalObjectNSID_1_9_2 = new nsID ("e9f3f2c1-2d94-4722-bbd4-2bf6fdf42f48"); /* nsIScriptGlobalObject */ //$NON-NLS-1$ + rc = interfaceRequestor.GetInterface (scriptGlobalObjectNSID_1_9_2, result); + } interfaceRequestor.Release (); if (rc == XPCOM.NS_OK && result[0] != 0) { @@ -1788,8 +1793,14 @@ public boolean execute (String script) { if (scriptContext != 0 && globalJSObject != 0) { /* ensure that the received nsIScriptContext implements the expected interface */ - nsID scriptContextNSID = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$ - rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID, result); + nsID scriptContextNSID_1_9 = new nsID ("e7b9871d-3adc-4bf7-850d-7fb9554886bf"); /* nsIScriptContext */ //$NON-NLS-1$ + rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID_1_9, result); + if (!(rc == XPCOM.NS_OK && result[0] != 0)) { + result[0] = 0; + nsID scriptContextNSID_1_9_2 = new nsID ("87482b5e-e019-4df5-9bc2-b2a51b1f2d28"); /* nsIScriptContext */ //$NON-NLS-1$ + rc = new nsISupports (scriptContext).QueryInterface (scriptContextNSID_1_9_2, result); + } + if (rc == XPCOM.NS_OK && result[0] != 0) { new nsISupports (result[0]).Release (); result[0] = 0; |