diff options
| author | Nikita Nemkin | 2020-01-22 09:13:14 +0000 |
|---|---|---|
| committer | Nikita Nemkin | 2020-01-25 13:59:05 +0000 |
| commit | 552c841cdec57d1445d04f981fead6cc3fbd21c8 (patch) | |
| tree | 478c387292557500d676f7c55b280b3f9d7aa8ab /bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java | |
| parent | 6f075fa49f18eda277b49fd97bdcba8079b38a28 (diff) | |
| download | eclipse.platform.swt-552c841cdec57d1445d04f981fead6cc3fbd21c8.tar.gz eclipse.platform.swt-552c841cdec57d1445d04f981fead6cc3fbd21c8.tar.xz eclipse.platform.swt-552c841cdec57d1445d04f981fead6cc3fbd21c8.zip | |
Bug 559392 - Put ERROR_NO_MORE_CALLBACKS check into Callback constructor
It matches SWT convention better and saves many checks in client code.
Change-Id: I058cde090966befa564f9ba53b4a613928321f50
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java')
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java index c9a363a280..6271e9ced7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java +++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java @@ -208,20 +208,14 @@ class WebKit extends WebBrowser { static { Proc2 = new Callback (WebKit.class, "Proc", 2); //$NON-NLS-1$ - if (Proc2.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); Proc3 = new Callback (WebKit.class, "Proc", 3); //$NON-NLS-1$ - if (Proc3.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); Proc4 = new Callback (WebKit.class, "Proc", 4); //$NON-NLS-1$ - if (Proc4.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); Proc5 = new Callback (WebKit.class, "Proc", 5); //$NON-NLS-1$ - if (Proc5.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); - new Webkit2AsyncToSync(); WebKitExtension.init(); JSDOMEventProc = new Callback (WebKit.class, "JSDOMEventProc", 3); //$NON-NLS-1$ - if (JSDOMEventProc.getAddress () == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); NativeClearSessions = () -> { if (!WebKitGTK.LibraryLoaded) return; @@ -377,7 +371,6 @@ class WebKit extends WebBrowser { System.err.println("SWT WebKit: error initializing DBus server, dBusServer == 0"); } initializeWebExtensions_callback = new Callback(WebKitExtension.class, "initializeWebExtensions_callback", void.class, new Type [] {long.class, long.class}); - if (initializeWebExtensions_callback.getAddress() == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); if (WebKitGTK.webkit_get_minor_version() >= 4) { // Callback exists only since 2.04 OS.g_signal_connect (WebKitGTK.webkit_web_context_get_default(), WebKitGTK.initialize_web_extensions, initializeWebExtensions_callback.getAddress(), 0); } @@ -1052,16 +1045,9 @@ private static class Webkit2AsyncToSync { static { runjavascript_callback = new Callback(Webkit2AsyncToSync.class, "runjavascript_callback", void.class, new Type[] {long.class, long.class, long.class}); - if (runjavascript_callback.getAddress() == 0) SWT.error (SWT.ERROR_NO_MORE_CALLBACKS); - getText_callback = new Callback(Webkit2AsyncToSync.class, "getText_callback", void.class, new Type[] {long.class, long.class, long.class}); - if (getText_callback.getAddress() == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); - setCookie_callback = new Callback(Webkit2AsyncToSync.class, "setCookie_callback", void.class, new Type[] {long.class, long.class, long.class}); - if (setCookie_callback.getAddress() == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); - getCookie_callback = new Callback(Webkit2AsyncToSync.class, "getCookie_callback", void.class, new Type[] {long.class, long.class, long.class}); - if (getCookie_callback.getAddress() == 0) SWT.error(SWT.ERROR_NO_MORE_CALLBACKS); } /** Object used to return data from callback to original call */ |