Skip to content

Support Native Image for Edge #2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Native Image for Edge #2041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Edge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,15 +233,24 @@ static void error(int code, int hr) {
SWT.error(code, null, String.format(" [0x%08x]", hr));
}

static IUnknown newCallback(ICoreWebView2SwtCallback handler) {
long punk = COM.CreateSwtWebView2Callback((arg0, arg1) -> {
static class HandleCoreWebView2SwtCallback implements ICoreWebView2SwtCallback {
private final ICoreWebView2SwtCallback handler;
public HandleCoreWebView2SwtCallback(ICoreWebView2SwtCallback handler) {
this.handler = handler;
}
@Override
public int Invoke(long arg0, long arg1) {
inCallback++;
try {
return handler.Invoke(arg0, arg1);
} finally {
inCallback--;
}
});
}
}

static IUnknown newCallback(ICoreWebView2SwtCallback handler) {
long punk = COM.CreateSwtWebView2Callback(new HandleCoreWebView2SwtCallback(handler));
if (punk == 0) error(SWT.ERROR_NO_HANDLES, COM.E_OUTOFMEMORY);
return new IUnknown(punk);
}
Expand Down Expand Up @@ -789,7 +798,7 @@ void setupBrowser(int hr, long pv) {
handler.Release();
}

IUnknown hostDisp = newHostObject(this::handleCallJava);
IUnknown hostDisp = newHostObject(new HandleCoreWebView2SwtHost(this.functions));
long[] hostObj = { COM.VT_DISPATCH, hostDisp.getAddress(), 0 }; // VARIANT
webView.AddHostObjectToScript("swt\0".toCharArray(), hostObj);
hostDisp.Release();
Expand Down Expand Up @@ -1012,24 +1021,31 @@ int handleDocumentTitleChanged(long pView, long pArgs) {
return COM.S_OK;
}

long handleCallJava(int index, long bstrToken, long bstrArgsJson) {
Object result = null;
String token = bstrToString(bstrToken);
BrowserFunction function = functions.get(index);
if (function != null && token.equals (function.token)) {
inCallback++;
try {
String argsJson = bstrToString(bstrArgsJson);
Object args = JSON.parse(argsJson.toCharArray());
result = function.function ((Object[]) args);
} catch (Throwable e) {
result = WebBrowser.CreateErrorString(e.getLocalizedMessage());
} finally {
inCallback--;
static class HandleCoreWebView2SwtHost implements ICoreWebView2SwtHost {
private final Map<Integer, BrowserFunction> functions;
public HandleCoreWebView2SwtHost(Map<Integer, BrowserFunction> functions) {
this.functions = functions;
}
@Override
public long CallJava(int index, long bstrToken, long bstrArgsJson) {
Object result = null;
String token = bstrToString(bstrToken);
BrowserFunction function = functions.get(index);
if (function != null && token.equals (function.token)) {
inCallback++;
try {
String argsJson = bstrToString(bstrArgsJson);
Object args = JSON.parse(argsJson.toCharArray());
result = function.function ((Object[]) args);
} catch (Throwable e) {
result = WebBrowser.CreateErrorString(e.getLocalizedMessage());
} finally {
inCallback--;
}
}
}
String json = JSON.stringify(result);
return COM.SysAllocStringLen(json.toCharArray(), json.length());
String json = JSON.stringify(result);
return COM.SysAllocStringLen(json.toCharArray(), json.length());
}
}

int handleFrameNavigationStarting(long pView, long pArgs) {
Expand Down