diff options
| author | Dirk-Jan C. Binnema | 2026-04-03 09:41:13 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2026-04-12 14:22:26 +0300 |
| commit | 4e855f90d1b1c3996b408d3f5d9e02d0ca7fd792 (patch) | |
| tree | 43433402ca3abe18109220b1d218b5c004f08a9f /src | |
| parent | be2b4a983192efc0f5f7ce99a95e3bb648f3984a (diff) | |
| download | emacs-4e855f90d1b1c3996b408d3f5d9e02d0ca7fd792.tar.gz emacs-4e855f90d1b1c3996b408d3f5d9e02d0ca7fd792.zip | |
xwidgets: re-enable with newer webkit2gtk
By disabling hw-acceleration we can re-enable xwidgets with newer
webkit2gtk versions (Bug#80728).
Newer versions were disallowed (Bug#66068) since they abort when a
webkit view is created; however, they work fine as long as we disable
hw-acceleration, since the off-screen windows that xwidgets uses do not
support that.
* configure.ac: Remove upper-bound for webkit2gtk version check.
* src/xwidget.c (Fmake_xwidget): Turn off hardware-acceleration.
Copyright-paperwork-exempt: yes
Diffstat (limited to 'src')
| -rw-r--r-- | src/xwidget.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/xwidget.c b/src/xwidget.c index 0efb3466c34..503b554696d 100644 --- a/src/xwidget.c +++ b/src/xwidget.c | |||
| @@ -380,6 +380,15 @@ fails. */) | |||
| 380 | g_object_set (G_OBJECT (settings), "enable-developer-extras", TRUE, NULL); | 380 | g_object_set (G_OBJECT (settings), "enable-developer-extras", TRUE, NULL); |
| 381 | g_object_set (G_OBJECT (settings), "enable-javascript", | 381 | g_object_set (G_OBJECT (settings), "enable-javascript", |
| 382 | (gboolean) (!xwidget_webkit_disable_javascript), NULL); | 382 | (gboolean) (!xwidget_webkit_disable_javascript), NULL); |
| 383 | #if WEBKIT_CHECK_VERSION (2, 16, 0) | ||
| 384 | /* the webkit view is created on an *offscreen* window, on | ||
| 385 | which hardware acceleration is not supported; we need to | ||
| 386 | tell webkitgtk _not_ to try that, since it will fail & abort() | ||
| 387 | with recent versions. */ | ||
| 388 | |||
| 389 | webkit_settings_set_hardware_acceleration_policy | ||
| 390 | (settings, WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER); | ||
| 391 | #endif | ||
| 383 | } | 392 | } |
| 384 | 393 | ||
| 385 | gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, | 394 | gtk_widget_set_size_request (GTK_WIDGET (xw->widget_osr), xw->width, |