diff options
Diffstat (limited to 'content/handlers/javascript/duktape/Window.bnd')
| -rw-r--r-- | content/handlers/javascript/duktape/Window.bnd | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/content/handlers/javascript/duktape/Window.bnd b/content/handlers/javascript/duktape/Window.bnd index 489587899..98ba39df8 100644 --- a/content/handlers/javascript/duktape/Window.bnd +++ b/content/handlers/javascript/duktape/Window.bnd @@ -15,8 +15,8 @@ class Window { #include "utils/nsurl.h" #include "netsurf/browser_window.h" #include "content/hlcache.h" -#include "render/html.h" -#include "render/html_internal.h" +#include "html/html.h" +#include "html/html_internal.h" %}; }; @@ -25,9 +25,10 @@ init Window(struct browser_window *win, struct html_content *htmlc) /* element window */ priv->win = win; priv->htmlc = htmlc; - LOG("win=%p htmlc=%p", priv->win, priv->htmlc); + NSLOG(netsurf, INFO, "win=%p htmlc=%p", priv->win, priv->htmlc); - LOG("URL is %s", nsurl_access(browser_window_get_url(priv->win))); + NSLOG(netsurf, INFO, + "URL is %s", nsurl_access(browser_window_access_url(priv->win))); %} prototype Window() @@ -72,8 +73,7 @@ getter Window::console() if (duk_is_undefined(ctx, -1)) { duk_pop(ctx); if (dukky_create_object(ctx, PROTO_NAME(CONSOLE), 0) != DUK_EXEC_SUCCESS) { - duk_error(ctx, DUK_ERR_ERROR, "Unable to create console object"); - return 0; + return duk_error(ctx, DUK_ERR_ERROR, "Unable to create console object"); } duk_dup(ctx, -1); duk_put_prop_string(ctx, -3, MAGIC(Console)); @@ -91,8 +91,7 @@ getter Window::location() duk_push_pointer(ctx, llcache_handle_get_url(priv->htmlc->base.llcache)); if (dukky_create_object(ctx, PROTO_NAME(LOCATION), 1) != DUK_EXEC_SUCCESS) { - duk_error(ctx, DUK_ERR_ERROR, "Unable to create location object"); - return 0; + return duk_error(ctx, DUK_ERR_ERROR, "Unable to create location object"); } duk_dup(ctx, -1); duk_put_prop_string(ctx, -3, MAGIC(Location)); @@ -110,10 +109,9 @@ getter Window::navigator() if (dukky_create_object(ctx, PROTO_NAME(NAVIGATOR), 0) != DUK_EXEC_SUCCESS) { - duk_error(ctx, + return duk_error(ctx, DUK_ERR_ERROR, "Unable to create navigator object"); - return 0; } duk_dup(ctx, -1); duk_put_prop_string(ctx, -3, MAGIC(Navigator)); @@ -141,6 +139,6 @@ method Window::alert() %{ duk_size_t msg_len; const char *msg = duk_safe_to_lstring(ctx, 0, &msg_len); - LOG("JS ALERT: %*s", (int)msg_len, msg); + NSLOG(netsurf, INFO, "JS ALERT: %*s", (int)msg_len, msg); return 0; %} |