mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-22 12:12:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Unlock the content when transitioning into the READY state.

Browse Source 
svn path=/trunk/netsurf/; revision=11859
This commit is contained in:
John Mark Bell 2011-02-28 19:58:08 +00:00
parent 4a174fd670
commit abbf958b4c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
content/content.c
View File

@ -688,24 +688,37 @@ void content_convert(struct content *c)
if (handler_map[c->type].convert) {
c->locked = true;
if (!handler_map[c->type].convert(c)) {
if (handler_map[c->type].convert(c) == false) {
c->locked = false;
c->status = CONTENT_STATUS_ERROR;
}
c->locked = false;
/* Conversion to the READY state will unlock the content */
} else {
content_set_ready(c);
content_set_done(c);
}
/* After conversion, the content must be in error or either the
* READY or DONE state and must not be locked */
assert(c->status == CONTENT_STATUS_READY ||
c->status == CONTENT_STATUS_DONE ||
c->status == CONTENT_STATUS_ERROR);
assert(c->locked == false);
}
/**
* Put a content in status CONTENT_STATUS_READY.
* Put a content in status CONTENT_STATUS_READY and unlock the content.
*/
void content_set_ready(struct content *c)
{
union content_msg_data msg_data;
/* The content must be locked at this point, as it can only
* become READY after conversion. */
assert(c->locked);
c->locked = false;
c->status = CONTENT_STATUS_READY;
content_update_status(c);
content_broadcast(c, CONTENT_MSG_READY, msg_data);
@ -743,7 +756,7 @@ void content__reformat(struct content *c, int width, int height)
assert(c != 0);
assert(c->status == CONTENT_STATUS_READY ||
c->status == CONTENT_STATUS_DONE);
assert(!c->locked);
assert(c->locked == false);
LOG(("%p %s", c, llcache_handle_get_url(c->llcache)));
c->locked = true;
c->available_width = width;
@ -765,7 +778,7 @@ void content_destroy(struct content *c)
{
assert(c);
LOG(("content %p %s", c, llcache_handle_get_url(c->llcache)));
assert(!c->locked);
assert(c->locked == false);
if (c->type < HANDLER_MAP_COUNT && handler_map[c->type].destroy)
handler_map[c->type].destroy(c);