summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2020-03-21 18:07:50 +0000
committerDaniel Silverstone <dsilvers@digital-scurf.org>2020-03-21 18:07:50 +0000
commit313dc9b099a172914f312120f0f9d0260a3588cf (patch)
treec669bd46f251eee054d70cad07814877c999f750
parent2503b17f02588e7e3705ccd62fa4b80ce256dcbe (diff)
downloadnetsurf-313dc9b099a172914f312120f0f9d0260a3588cf.tar.gz
netsurf-313dc9b099a172914f312120f0f9d0260a3588cf.tar.bz2
JS: Remove unused slow script callback
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
-rw-r--r--content/handlers/javascript/duktape/dukky.c2
-rw-r--r--content/handlers/javascript/js.h6
-rw-r--r--content/handlers/javascript/none/none.c3
-rw-r--r--desktop/browser_window.c19
4 files changed, 4 insertions, 26 deletions
diff --git a/content/handlers/javascript/duktape/dukky.c b/content/handlers/javascript/duktape/dukky.c
index dcbff6854..560a12f56 100644
--- a/content/handlers/javascript/duktape/dukky.c
+++ b/content/handlers/javascript/duktape/dukky.c
@@ -608,7 +608,7 @@ void js_finalise(void)
/* exported interface documented in js.h */
nserror
-js_newcontext(int timeout, jscallback *cb, void *cbctx, jscontext **jsctx)
+js_newcontext(int timeout, jscontext **jsctx)
{
duk_context *ctx;
jscontext *ret = calloc(1, sizeof(*ret));
diff --git a/content/handlers/javascript/js.h b/content/handlers/javascript/js.h
index d5af7211a..522dd9879 100644
--- a/content/handlers/javascript/js.h
+++ b/content/handlers/javascript/js.h
@@ -28,8 +28,6 @@
typedef struct jscontext jscontext;
typedef struct jsobject jsobject;
-typedef bool(jscallback)(void *ctx);
-
struct dom_event;
struct dom_document;
struct dom_node;
@@ -52,12 +50,10 @@ void js_finalise(void);
* There is usually one context per browsing context (browser window)
*
* \param timeout elapsed wallclock time (in seconds) before \a callback is called
- * \param cb the callback when the runtime exceeds the timeout
- * \param cbctx The context to pass to the callback
* \param jsctx Updated to the created JS context
* \return NSERROR_OK on success, appropriate error otherwise.
*/
-nserror js_newcontext(int timeout, jscallback *cb, void *cbctx, jscontext **jsctx);
+nserror js_newcontext(int timeout, jscontext **jsctx);
/**
* Destroy a previously created context
diff --git a/content/handlers/javascript/none/none.c b/content/handlers/javascript/none/none.c
index 80a9ce49c..26b9b5300 100644
--- a/content/handlers/javascript/none/none.c
+++ b/content/handlers/javascript/none/none.c
@@ -35,8 +35,7 @@ void js_finalise(void)
{
}
-nserror js_newcontext(int timeout, jscallback *cb, void *cbctx,
- jscontext **jsctx)
+nserror js_newcontext(int timeout, jscontext **jsctx)
{
*jsctx = NULL;
return NSERROR_OK;
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 3c072ef0f..3d1a19f60 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -330,22 +330,6 @@ browser_window__get_contextual_content(struct browser_window *bw,
/**
- * slow script handler
- */
-static bool slow_script(void *ctx)
-{
- static int count = 0;
- NSLOG(netsurf, INFO, "Continuing execution %d", count);
- count++;
- if (count > 1) {
- count = 0;
- return false;
- }
- return true;
-}
-
-
-/**
* implements the download operation of a window navigate
*/
static nserror
@@ -3101,8 +3085,7 @@ browser_window_initialise_common(enum browser_window_create_flags flags,
assert(bw);
/* new javascript context for each window/(i)frame */
- err = js_newcontext(nsoption_int(script_timeout),
- slow_script, NULL, &bw->jsctx);
+ err = js_newcontext(nsoption_int(script_timeout), &bw->jsctx);
if (err != NSERROR_OK)
return err;