eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

html_script: Count sync scripts to prevent unpausing early 

If there is more than one incomplete sync script then it's
important that we don't unpause hubbub too early.  This commit
adds a counter so that if there're unfinished sync scripts in
the set, we don't unpause until the last one completes.

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-12-19 20:50:33 +00:00
parent 918b1d0fed
commit eba05b0d38
No known key found for this signature in database
GPG Key ID: C30DF439F2987D74
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
content/handlers/html/html_script.c
View File

@ -284,6 +284,15 @@ convert_script_sync_cb(hlcache_handle *script,
struct html_script *s;
script_handler_t *script_handler;
dom_hubbub_error err;
unsigned int active_sync_scripts = 0;
/* Count sync scripts which have yet to complete (other than us) */
for (i = 0, s = parent->scripts; i != parent->scripts_count; i++, s++) {
if (s->type == HTML_SCRIPT_SYNC &&
s->data.handle != script && s->already_started == false) {
active_sync_scripts++;
}
}
/* Find script */
for (i = 0, s = parent->scripts; i != parent->scripts_count; i++, s++) {
@ -314,7 +323,7 @@ convert_script_sync_cb(hlcache_handle *script,
}
/* continue parse */
if (parent->parser != NULL) {
if (parent->parser != NULL && active_sync_scripts == 0) {
err = dom_hubbub_parser_pause(parent->parser, false);
if (err != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "unpause returned 0x%x", err);
@ -338,7 +347,7 @@ convert_script_sync_cb(hlcache_handle *script,
s->already_started = true;
/* continue parse */
if (parent->parser != NULL) {
if (parent->parser != NULL && active_sync_scripts == 0) {
err = dom_hubbub_parser_pause(parent->parser, false);
if (err != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "unpause returned 0x%x", err);