Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/e2056974ca152a9c2cd14...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/e2056974ca152a9c2cd1454...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/e2056974ca152a9c2cd14545b...
The branch, master has been updated
via e2056974ca152a9c2cd14545bc610546c59264cc (commit)
from 22ce03aed6e011a53a8adbbbf2cf4df798d8cc45 (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=e2056974ca152a9c2cd...
commit e2056974ca152a9c2cd14545bc610546c59264cc
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
fixup script message handling
diff --git a/render/html_script.c b/render/html_script.c
index 89d6741..4aa8aff 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -285,12 +285,6 @@ convert_script_sync_cb(hlcache_handle *script,
assert(i != parent->scripts_count);
switch (event->type) {
- case CONTENT_MSG_LOADING:
- break;
-
- case CONTENT_MSG_READY:
- break;
-
case CONTENT_MSG_DONE:
LOG(("script %d done '%s'", i,
nsurl_access(hlcache_handle_get_url(script))));
@@ -339,10 +333,18 @@ convert_script_sync_cb(hlcache_handle *script,
break;
+ case CONTENT_MSG_LOADING:
+ case CONTENT_MSG_READY:
case CONTENT_MSG_STATUS:
+ case CONTENT_MSG_REDIRECT:
+ /* messages content handler will legitamately recive
+ * but does not need to handle
+ */
break;
default:
+ /* all other messages are unexpected and fatal */
+ LOG(("Unhandled message type %d", event->type));
assert(0);
}
-----------------------------------------------------------------------
Summary of changes:
render/html_script.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/render/html_script.c b/render/html_script.c
index 89d6741..4aa8aff 100644
--- a/render/html_script.c
+++ b/render/html_script.c
@@ -285,12 +285,6 @@ convert_script_sync_cb(hlcache_handle *script,
assert(i != parent->scripts_count);
switch (event->type) {
- case CONTENT_MSG_LOADING:
- break;
-
- case CONTENT_MSG_READY:
- break;
-
case CONTENT_MSG_DONE:
LOG(("script %d done '%s'", i,
nsurl_access(hlcache_handle_get_url(script))));
@@ -339,10 +333,18 @@ convert_script_sync_cb(hlcache_handle *script,
break;
+ case CONTENT_MSG_LOADING:
+ case CONTENT_MSG_READY:
case CONTENT_MSG_STATUS:
+ case CONTENT_MSG_REDIRECT:
+ /* messages content handler will legitamately recive
+ * but does not need to handle
+ */
break;
default:
+ /* all other messages are unexpected and fatal */
+ LOG(("Unhandled message type %d", event->type));
assert(0);
}
--
NetSurf Browser