From 2d53524635c6fbc7eba339d1c3901b485fc4ec16 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 13 Aug 2015 09:39:04 +0100 Subject: Fix crash when JS context is required from a frame. --- desktop/browser.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'desktop') diff --git a/desktop/browser.c b/desktop/browser.c index 2d7257bd4..5f488002e 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -794,11 +794,6 @@ nserror browser_window_create(enum browser_window_create_flags flags, return NSERROR_NOMEM; } - /* new javascript context for window */ - ret->jsctx = js_newcontext(nsoption_int(script_timeout), - slow_script, - NULL); - /* Initialise common parts */ err = browser_window_initialise_common(flags, ret, existing); if (err != NSERROR_OK) { @@ -858,6 +853,12 @@ nserror browser_window_initialise_common(enum browser_window_create_flags flags, nserror err; assert(bw); + /* new javascript context for each window/frame + * TODO: is this correct? */ + bw->jsctx = js_newcontext(nsoption_int(script_timeout), + slow_script, + NULL); + if (flags & BW_CREATE_CLONE) { assert(existing != NULL); -- cgit v1.2.3