Revert r12609 and assert parent content state.

svn path=/trunk/netsurf/; revision=12610
This commit is contained in:
Michael Drake 2011-07-19 13:43:48 +00:00
parent d66afbca4a
commit 5fd24d7557

View File

@ -1483,6 +1483,9 @@ nserror html_object_callback(hlcache_handle *object,
int x, y; int x, y;
struct box *box; struct box *box;
assert(c->base.status == CONTENT_STATUS_READY ||
c->base.status == CONTENT_STATUS_DONE);
box = o->box; box = o->box;
switch (event->type) { switch (event->type) {
@ -1509,10 +1512,7 @@ nserror html_object_callback(hlcache_handle *object,
c->base.active--; c->base.active--;
html_object_done(box, object, o->background); html_object_done(box, object, o->background);
if (c->base.status != CONTENT_STATUS_LOADING && if (box->flags & REPLACE_DIM) {
box->flags & REPLACE_DIM) {
/* Redraw newly available object if parent content is
* displayable, and the object's box size is known */
union content_msg_data data; union content_msg_data data;
if (!box_visible(box)) if (!box_visible(box))