[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a6e76fc: Port xwidget to -DCHECK_LISP_OBJECT_TYPE
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a6e76fc: Port xwidget to -DCHECK_LISP_OBJECT_TYPE |
Date: |
Mon, 20 Feb 2017 11:58:57 -0500 (EST) |
branch: master
commit a6e76fc7254ddac7729224a891feb8ed3f183efc
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Port xwidget to -DCHECK_LISP_OBJECT_TYPE
* src/xwidget.c (webkit_javascript_finished_cb)
(Fxwidget_webkit_execute_script): Don't assume Lisp_Object is an
integer. This fix is just a hack; I’ll file a bug report about
the underlying problem.
---
src/xwidget.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/xwidget.c b/src/xwidget.c
index 5c276b1..dc705bb 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -389,7 +389,10 @@ webkit_javascript_finished_cb (GObject *webview,
/* Register an xwidget event here, which then runs the callback.
This ensures that the callback runs in sync with the Emacs
event loop. */
- store_xwidget_js_callback_event (xw, (Lisp_Object)lisp_callback,
+ /* FIXME: This might lead to disaster if LISP_CALLBACK’s object
+ was garbage collected before now. See the FIXME in
+ Fxwidget_webkit_execute_script. */
+ store_xwidget_js_callback_event (xw, XIL ((intptr_t) lisp_callback),
lisp_value);
}
@@ -714,8 +717,13 @@ argument procedure FUN.*/)
if (!NILP (fun) && !FUNCTIONP (fun))
wrong_type_argument (Qinvalid_function, fun);
- void *callback = (FUNCTIONP (fun)) ?
- &webkit_javascript_finished_cb : NULL;
+ GAsyncReadyCallback callback
+ = FUNCTIONP (fun) ? webkit_javascript_finished_cb : NULL;
+
+ /* FIXME: This hack might lead to disaster if FUN is garbage
+ collected before store_xwidget_js_callback_event makes it visible
+ to Lisp again. See the FIXME in webkit_javascript_finished_cb. */
+ gpointer callback_arg = (gpointer) (intptr_t) XLI (fun);
/* JavaScript execution happens asynchronously. If an elisp
callback function is provided we pass it to the C callback
@@ -723,8 +731,7 @@ argument procedure FUN.*/)
webkit_web_view_run_javascript (WEBKIT_WEB_VIEW (xw->widget_osr),
SSDATA (script),
NULL, /* cancelable */
- callback,
- (gpointer) fun);
+ callback, callback_arg);
return Qnil;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a6e76fc: Port xwidget to -DCHECK_LISP_OBJECT_TYPE,
Paul Eggert <=