Attachment 249588 Details for Bug 429739 – git diff for Chrome code execution support

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

[patch] git diff for Chrome code execution support

SWT-429739-Chrome-Fixes.diff (text/plain), 2.35 KB, created by Matt Painter

on 2014-12-22 05:43:30 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Painter

Created: 2014-12-22 05:43:30 EST

Size: 2.35 KB

patch

obsolete

>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 8ce3b1c..c1c7b2c 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	
>@@ -1876,6 +1876,8 @@ public Object getWebBrowser () {
> 		webBrowser.AddRef ();
> 		return webBrowserObject;
> 	} catch (ClassNotFoundException e) {
>+		webBrowserObject = webBrowser;
>+		return webBrowserObject;
> 	} catch (NoSuchMethodException e) {
> 	} catch (IllegalArgumentException e) {
> 	} catch (IllegalAccessException e) {
>diff --git a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java
>index 87ab615..59bcff1 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java	
>+++ b/bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/org/eclipse/swt/internal/mozilla/Execute.java	
>@@ -26,6 +26,10 @@ public class Execute extends nsISupports {
> 	}
> 
> 	public int EvalInWindow(nsIDOMWindow aWindow, nsEmbedString code, long /*int*/[] aVariant) {
>-    return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow.getAddress(), code.getAddress(), aVariant);
>+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 1, getAddress(), aWindow.getAddress(), code.getAddress(), aVariant);
> 	}
>+	
>+	public int EvalAsChrome(nsIDOMWindow aWindow, nsEmbedString code, long /*int*/[] aVariant) {
>+		return XPCOM.VtblCall(nsISupports.LAST_METHOD_ID + 2, getAddress(), aWindow.getAddress(), code.getAddress(), aVariant);
>+ 	}
> }
>diff --git a/bundles/org.eclipse.swt/components/swt.js b/bundles/org.eclipse.swt/components/swt.js
>index 058555b..8b120b6 100644
>--- a/bundles/org.eclipse.swt/components/swt.js
>+++ b/bundles/org.eclipse.swt/components/swt.js
>@@ -25,9 +25,8 @@ execute.prototype.evalInWindow = function(aWindow, aString) {
> };
> 
> execute.prototype.evalAsChrome = function(aWindow, aString) {
>-    with (aWindow) {
>-        return eval(aString);
>-    }
>+    var window = XPCNativeWrapper.unwrap(aWindow);
>+    return eval(aString);
> };
> 
> execute.prototype.evalAsync = function(aWindow, aString) {

Actions: View | Diff

Attachments on bug 429739: 241635 | 248258 | 248966 | 249588