Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/9318ee5d6a668a4c816cc82af9cd86ae826e30b7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/9318ee5d6a668a4c816cc82af9cd86ae826e30b7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/9318ee5d6a668a4c816cc82af9cd86ae826e30b7
The branch, master has been updated
via 9318ee5d6a668a4c816cc82af9cd86ae826e30b7 (commit)
via 99984dfc57a5562a5f2fc624e143b24fd5543af3 (commit)
from be23d522db03f412bc9a855aac7598419336d4f1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=9318ee5d6a668a4c816cc82af9cd86ae826e30b7
commit 9318ee5d6a668a4c816cc82af9cd86ae826e30b7
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
html_begin_conversion: If we pause in completing parse, try again later.
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index ec4ff35..bcbd438 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -1358,6 +1358,13 @@ html_begin_conversion(html_content *htmlc)
NSLOG(netsurf, INFO, "Completing parse (%p)", htmlc);
/* complete parsing */
error = dom_hubbub_parser_completed(htmlc->parser);
+ if (error == DOM_HUBBUB_HUBBUB_ERR_PAUSED && htmlc->base.active
> 0) {
+ /* The act of completing the parse failed because we've
+ * encountered a sync script which needs to run
+ */
+ NSLOG(netsurf, INFO, "Completing parse brought
synchronous JS to light, cannot complete yet");
+ return true;
+ }
if (error != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "Parsing failed");
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=99984dfc57a5562a5f2fc624e143b24fd5543af3
commit 99984dfc57a5562a5f2fc624e143b24fd5543af3
Author: Daniel Silverstone <[email protected]>
Commit: Daniel Silverstone <[email protected]>
browser_window: Stop the throbber right at the end of handling errors
Signed-off-by: Daniel Silverstone <[email protected]>
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index debb4fa..922a219 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -889,8 +889,6 @@ browser_window__handle_error(struct browser_window *bw,
hlcache_handle_release(c);
- browser_window_stop_throbber(bw);
-
switch (code) {
case NSERROR_BAD_AUTH:
res = netsurf__handle_login(message, url,
@@ -911,6 +909,8 @@ browser_window__handle_error(struct browser_window *bw,
break;
}
+ browser_window_stop_throbber(bw);
+
return NSERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/html.c | 7 +++++++
desktop/browser_window.c | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index ec4ff35..bcbd438 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -1358,6 +1358,13 @@ html_begin_conversion(html_content *htmlc)
NSLOG(netsurf, INFO, "Completing parse (%p)", htmlc);
/* complete parsing */
error = dom_hubbub_parser_completed(htmlc->parser);
+ if (error == DOM_HUBBUB_HUBBUB_ERR_PAUSED && htmlc->base.active
> 0) {
+ /* The act of completing the parse failed because we've
+ * encountered a sync script which needs to run
+ */
+ NSLOG(netsurf, INFO, "Completing parse brought
synchronous JS to light, cannot complete yet");
+ return true;
+ }
if (error != DOM_HUBBUB_OK) {
NSLOG(netsurf, INFO, "Parsing failed");
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index debb4fa..922a219 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -889,8 +889,6 @@ browser_window__handle_error(struct browser_window *bw,
hlcache_handle_release(c);
- browser_window_stop_throbber(bw);
-
switch (code) {
case NSERROR_BAD_AUTH:
res = netsurf__handle_login(message, url,
@@ -911,6 +909,8 @@ browser_window__handle_error(struct browser_window *bw,
break;
}
+ browser_window_stop_throbber(bw);
+
return NSERROR_OK;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
