Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c
...commit
http://git.netsurf-browser.org/netsurf.git/commit/11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c
...tree
http://git.netsurf-browser.org/netsurf.git/tree/11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c
The branch, master has been updated
via 11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c (commit)
via 562979ee141ebd30dae0d2c2fbeb425293251a30 (commit)
via be77f764e296d18f9d463adbddf3950a5a316010 (commit)
from c512b2f054ce14321c8f6fae66696f880a74bbf1 (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=11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c
commit 11f9a84e7a253d3f34ff5e98a6e35d3df40d2f8c
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
HTML content handler: Don't let aborted contents get stuck in LOADING.
Previously, aborted HTML fetches left the content in LOADING state,
and the hlcache clean code does not clean contents in the LOADING
state. They, and their child contents ended up stuck in the
cache forever.
diff --git a/render/html.c b/render/html.c
index 544b7b6..62b7f3e 100644
--- a/render/html.c
+++ b/render/html.c
@@ -1220,6 +1220,7 @@ html_begin_conversion(html_content *htmlc)
if (htmlc->aborted) {
LOG("Conversion aborted (%p) (active: %u)", htmlc,
htmlc->base.active);
+ content_set_error(&htmlc->base);
content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
return false;
}
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=562979ee141ebd30dae0d2c2fbeb425293251a30
commit 562979ee141ebd30dae0d2c2fbeb425293251a30
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
HTML object fetch handler: Remove bogus parent content state assertion.
diff --git a/render/html_object.c b/render/html_object.c
index bc35124..e20cd6d 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -124,8 +124,6 @@ html_object_callback(hlcache_handle *object,
int x, y;
struct box *box;
- assert(c->base.status != CONTENT_STATUS_ERROR);
-
box = o->box;
if (box == NULL && event->type != CONTENT_MSG_ERROR) {
return NSERROR_OK;
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=be77f764e296d18f9d463adbddf3950a5a316010
commit be77f764e296d18f9d463adbddf3950a5a316010
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Improve content logging with content IDs (pointer values).
This makes it easier to track a content by its ID through a log.
diff --git a/content/content.c b/content/content.c
index 70df87e..7a8bb01 100644
--- a/content/content.c
+++ b/content/content.c
@@ -757,7 +757,7 @@ void content_broadcast(struct content *c, content_msg msg,
{
struct content_user *user, *next;
assert(c);
-// LOG("%p %s -> %d", c, c->url, msg);
+// LOG("%p -> msg:%d", c, msg);
for (user = c->user_list->next; user != 0; user = next) {
next = user->next; /* user may be destroyed during callback */
if (user->callback != 0)
diff --git a/render/html.c b/render/html.c
index 6f7ad62..544b7b6 100644
--- a/render/html.c
+++ b/render/html.c
@@ -686,8 +686,9 @@ dom_default_action_DOMNodeInserted_cb(struct dom_event
*evt, void *pw)
content_broadcast(&htmlc->base,
CONTENT_MSG_GETCTX,
msg_data);
- LOG("javascript context: %p",
- htmlc->jscontext);
+ LOG("javascript context: %p (htmlc:
%p)",
+ htmlc->jscontext,
+ htmlc);
}
if (htmlc->jscontext != NULL) {
js_handle_new_element(htmlc->jscontext,
@@ -1142,7 +1143,7 @@ static bool html_convert(struct content *c)
}
htmlc->base.active--; /* the html fetch is no longer active */
- LOG("%d fetches active", htmlc->base.active);
+ LOG("%d fetches active (%p)", htmlc->base.active, c);
/* The parse cannot be completed here because it may be paused
* untill all the resources being fetched have completed.
@@ -1195,7 +1196,7 @@ html_begin_conversion(html_content *htmlc)
* complete to avoid repeating the completion pointlessly.
*/
if (htmlc->parse_completed == false) {
- LOG("Completing parse");
+ LOG("Completing parse (%p)", htmlc);
/* complete parsing */
error = dom_hubbub_parser_completed(htmlc->parser);
if (error != DOM_HUBBUB_OK) {
@@ -1210,12 +1211,15 @@ html_begin_conversion(html_content *htmlc)
}
if (html_can_begin_conversion(htmlc) == false) {
+ LOG("Can't begin conversion (%p)", htmlc);
/* We can't proceed (see commentary above) */
return true;
}
/* Give up processing if we've been aborted */
if (htmlc->aborted) {
+ LOG("Conversion aborted (%p) (active: %u)", htmlc,
+ htmlc->base.active);
content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
return false;
}
@@ -1366,7 +1370,7 @@ static void html_stop(struct content *c)
break;
default:
- LOG("Unexpected status %d", c->status);
+ LOG("Unexpected status %d (%p)", c->status, c);
assert(0);
}
}
-----------------------------------------------------------------------
Summary of changes:
content/content.c | 2 +-
render/html.c | 15 ++++++++++-----
render/html_object.c | 2 --
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/content/content.c b/content/content.c
index 70df87e..7a8bb01 100644
--- a/content/content.c
+++ b/content/content.c
@@ -757,7 +757,7 @@ void content_broadcast(struct content *c, content_msg msg,
{
struct content_user *user, *next;
assert(c);
-// LOG("%p %s -> %d", c, c->url, msg);
+// LOG("%p -> msg:%d", c, msg);
for (user = c->user_list->next; user != 0; user = next) {
next = user->next; /* user may be destroyed during callback */
if (user->callback != 0)
diff --git a/render/html.c b/render/html.c
index 6f7ad62..62b7f3e 100644
--- a/render/html.c
+++ b/render/html.c
@@ -686,8 +686,9 @@ dom_default_action_DOMNodeInserted_cb(struct dom_event
*evt, void *pw)
content_broadcast(&htmlc->base,
CONTENT_MSG_GETCTX,
msg_data);
- LOG("javascript context: %p",
- htmlc->jscontext);
+ LOG("javascript context: %p (htmlc:
%p)",
+ htmlc->jscontext,
+ htmlc);
}
if (htmlc->jscontext != NULL) {
js_handle_new_element(htmlc->jscontext,
@@ -1142,7 +1143,7 @@ static bool html_convert(struct content *c)
}
htmlc->base.active--; /* the html fetch is no longer active */
- LOG("%d fetches active", htmlc->base.active);
+ LOG("%d fetches active (%p)", htmlc->base.active, c);
/* The parse cannot be completed here because it may be paused
* untill all the resources being fetched have completed.
@@ -1195,7 +1196,7 @@ html_begin_conversion(html_content *htmlc)
* complete to avoid repeating the completion pointlessly.
*/
if (htmlc->parse_completed == false) {
- LOG("Completing parse");
+ LOG("Completing parse (%p)", htmlc);
/* complete parsing */
error = dom_hubbub_parser_completed(htmlc->parser);
if (error != DOM_HUBBUB_OK) {
@@ -1210,12 +1211,16 @@ html_begin_conversion(html_content *htmlc)
}
if (html_can_begin_conversion(htmlc) == false) {
+ LOG("Can't begin conversion (%p)", htmlc);
/* We can't proceed (see commentary above) */
return true;
}
/* Give up processing if we've been aborted */
if (htmlc->aborted) {
+ LOG("Conversion aborted (%p) (active: %u)", htmlc,
+ htmlc->base.active);
+ content_set_error(&htmlc->base);
content_broadcast_errorcode(&htmlc->base, NSERROR_STOPPED);
return false;
}
@@ -1366,7 +1371,7 @@ static void html_stop(struct content *c)
break;
default:
- LOG("Unexpected status %d", c->status);
+ LOG("Unexpected status %d (%p)", c->status, c);
assert(0);
}
}
diff --git a/render/html_object.c b/render/html_object.c
index bc35124..e20cd6d 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -124,8 +124,6 @@ html_object_callback(hlcache_handle *object,
int x, y;
struct box *box;
- assert(c->base.status != CONTENT_STATUS_ERROR);
-
box = o->box;
if (box == NULL && event->type != CONTENT_MSG_ERROR) {
return NSERROR_OK;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
