diff options
| author | Alexander Kurtakov | 2016-06-30 19:47:27 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2016-06-30 19:47:27 +0000 |
| commit | e6fc993be61a1318c6f22e627ab88c1c54a5d0ff (patch) | |
| tree | f900921f058d89922d35fae6cec8ba697c466c22 | |
| parent | d087a6b7e24c09db8fa729b985383ba168fb4055 (diff) | |
| download | eclipse.platform.swt-e6fc993be61a1318c6f22e627ab88c1c54a5d0ff.tar.gz eclipse.platform.swt-e6fc993be61a1318c6f22e627ab88c1c54a5d0ff.tar.xz eclipse.platform.swt-e6fc993be61a1318c6f22e627ab88c1c54a5d0ff.zip | |
Bug 497122 - org.eclipse.swt.tests.junit.browser.Browser6 crashes with
Webkit2
On dispose webkit_web_context_finalize makes
WebCore::IconDatabase::~IconDatabase() crash due to SWT calling
webkit_web_context_set_favicon_database_directory. This has been added
as Webkit2 replacement for webkit_favicon_database_set_path with null
path which disabled favicon database but calling
webkit_web_context_set_favicon_database_directory in Webkit2 actually
enables the database which is disabled otherwise.
Change-Id: I58db6faa473d09f6532b7f77aba5a19c475f7eba
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java | 4 |
1 files changed, 1 insertions, 3 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 9675d82487..1d0cb8957b 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 @@ -597,9 +597,7 @@ public void create (Composite parent, int style) { * thread. Work around this crash by disabling the use of WebKitGTK's * icon database, which should not affect the Browser in any way. */ - if (WEBKIT2){ - WebKitGTK.webkit_web_context_set_favicon_database_directory(WebKitGTK.webkit_web_context_get_default(), 0); - } else { + if (!WEBKIT2){ long /*int*/ database = WebKitGTK.webkit_get_favicon_database (); if (database != 0) { /* WebKitGTK version is >= 1.8.x */ |