Attachment 253457 Details for Bug 465757 – modified evaluate(script)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] modified evaluate(script)

Bug-465757--When-browser-is-using-XULRunner-the-brow.patch (text/plain), 4.05 KB, created by Lakshmi P Shanmugam

on 2015-05-13 14:08:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Lakshmi P Shanmugam

Created: 2015-05-13 14:08:43 EDT

Size: 4.05 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
>index 866dd45..aeef3f9 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
>+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/Browser.java
>@@ -600,23 +600,28 @@
> * <li>ERROR_WIDGET_DISPOSED when the widget has been disposed</li>
> * </ul>
> * 
>+ * @see Browser#evaluate(String,boolean)
> * @see ProgressListener#completed(ProgressEvent)
> * 
> * @since 3.5
> */
> public Object evaluate (String script) throws SWTException {
> 	checkWidget();
>-	return evaluate (script, true);
>+	return evaluate (script, false);
> }
> 
> /**
> * Returns the result, if any, of executing the specified script.
> * 
>- * Evaluates a script containing javascript commands in the context of
>- * the current document. If document-defined functions or properties
>- * are accessed by the script then this method should not be invoked
>- * until the document has finished loading (<code>ProgressListener.completed()</code>
>- * gives notification of this).
>+ * Evaluates a script containing javascript commands.
>+ * When <code>trusted</code> is <code>true</code> script is executed in the context of Chrome 
>+ * with Chrome security privileges.
>+ * When <code>trusted</code> is <code>false</code> script is executed in the context of the 
>+ * current document with normal privileges.
>+ * 
>+ * If document-defined functions or properties are accessed by the script then
>+ * this method should not be invoked until the document has finished loading 
>+ * (<code>ProgressListener.completed()</code> gives notification of this).
> * 
> * If the script returns a value with a supported type then a java
> * representation of the value is returned. The supported
>@@ -628,16 +633,12 @@
> * <li>javascript boolean -> <code>java.lang.Boolean</code></li>
> * <li>javascript array whose elements are all of supported types -> <code>java.lang.Object[]</code></li>
> * </ul>
>- * The <code>trusted</code> parameter affects the security context the script will be executed in.
>- * Specifying <code>true</code> for trusted executes the script in Chrome security context <code>false</code> for trusted
>- * executes script in normal security context.
>- * 
>- * Note: Chrome security context is applicable only to Browsers with style <code>SWT.Mozilla</code>
>- * 
> * An <code>SWTException</code> is thrown if the return value has an
> * unsupported type, or if evaluating the script causes a javascript
> * error to be thrown.
>- *
>+ * 
>+ * Note: Chrome security context is applicable only to Browsers with style <code>SWT.Mozilla</code>.
>+ * 
> * @param script the script with javascript commands
> * @param trusted <code>true> or <code>false</code> depending on the security context to be used
> * 
>diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
>index 2fcddeb..512872f 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
>+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/nsIHelperAppLauncher_1_8.java
>@@ -41,7 +41,7 @@
> 		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_BASE, new nsID(NS_IHELPERAPPLAUNCHER_IID_STR));
> 		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR1_9, new nsID(NS_IHELPERAPPLAUNCHER_1_9_IID_STR));
> 		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR10, new nsID(NS_IHELPERAPPLAUNCHER_10_IID_STR));
>-		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR31, new nsID(NS_IHELPERAPPLAUNCHER_24_IID_STR));
>+		IIDStore.RegisterIID(nsIHelperAppLauncher_1_8.class, MozillaVersion.VERSION_XR24, new nsID(NS_IHELPERAPPLAUNCHER_24_IID_STR));
> 	}
> 	
> 	/*

Actions: View | Diff

Attachments on bug 465757: 253457