Commit 1ab6dd1f authored by Michael Catanzaro's avatar Michael Catanzaro
Browse files

Assert window object is truly cleared in window_object_cleared

See #1435 for discussion of why we can't do this with older WebKit.
parent a9c662cc
Pipeline #272168 passed with stages
in 21 minutes and 18 seconds
......@@ -689,6 +689,10 @@ window_object_cleared_cb (WebKitScriptWorld *world,
return;
}
result = jsc_context_get_value (js_context, "Ephy");
g_assert (jsc_value_is_undefined (result));
g_clear_object (&result);
bytes = g_resources_lookup_data ("/org/gnome/epiphany-web-process-extension/js/ephy.js", G_RESOURCE_LOOKUP_FLAGS_NONE, NULL);
data = g_bytes_get_data (bytes, &data_size);
result = jsc_context_evaluate_with_source_uri (js_context, data, data_size, "resource:///org/gnome/epiphany-web-process-extension/js/ephy.js", 1);
......
......@@ -90,12 +90,9 @@ set_up_webextensions (EphyWebProcessExtension *extension,
g_autoptr (JSCValue) result = NULL;
const char *data;
gsize data_size;
static gboolean setup = FALSE;
if (setup)
return;
setup = TRUE;
result = jsc_context_get_value (js_context, "browser");
g_assert (jsc_value_is_undefined (result));
js_browser = jsc_value_new_object (js_context, NULL, NULL);
jsc_context_set_value (js_context, "browser", js_browser);
......
......@@ -75,7 +75,7 @@ conf.set10('ENABLE_GSB', gsb_api_key != '')
glib_requirement = '>= 2.64.0'
gtk_requirement = '>= 3.24.0'
nettle_requirement = '>= 3.4'
webkitgtk_requirement = '>= 2.31.1'
webkitgtk_requirement = '>= 2.31.2'
cairo_dep = dependency('cairo', version: '>= 1.2')
gcr_dep = dependency('gcr-3', version: '>= 3.5.5')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment