summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.swt/Eclipse SWT Browser
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2011-01-25 20:51:19 +0000
committerGrant Gayed <ggayed>2011-01-25 20:51:19 +0000
commit2d20e469d41f4ad41ce63ee64f3dfda6dcc59b37 (patch)
treea6ea698022b04b00e7ac94ee87e2ce3e5269ca09 /bundles/org.eclipse.swt/Eclipse SWT Browser
parente35d6aee41c222c15df583c9ed33006b5e2bb456 (diff)
downloadeclipse.platform.swt-2d20e469d41f4ad41ce63ee64f3dfda6dcc59b37.tar.gz
eclipse.platform.swt-2d20e469d41f4ad41ce63ee64f3dfda6dcc59b37.tar.xz
eclipse.platform.swt-2d20e469d41f4ad41ce63ee64f3dfda6dcc59b37.zip
335382 - WebKitGTK can now throw exception with SWT.WEBKIT style
Diffstat (limited to 'bundles/org.eclipse.swt/Eclipse SWT Browser')
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java
index b97eeb6da9..ae86e384a1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/gtk/org/eclipse/swt/browser/BrowserFactory.java
@@ -15,9 +15,11 @@ import org.eclipse.swt.SWT;
class BrowserFactory {
WebBrowser createWebBrowser (int style) {
- if ((style & SWT.MOZILLA) != 0 || (!WebKit.isInstalled () && (style & SWT.WEBKIT) == 0)) {
+ boolean webkitInstalled = WebKit.isInstalled ();
+ if ((style & SWT.MOZILLA) != 0 || (!webkitInstalled && (style & SWT.WEBKIT) == 0)) {
return new Mozilla ();
}
+ if (!webkitInstalled) return null;
return new WebKit ();
}