diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2011-07-19 13:43:48 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2011-07-19 13:43:48 +0000 |
| commit | 5fd24d75577e66c356e80c15ccb3eb24b7b05fc0 (patch) | |
| tree | 234ff59bba9858ce7fd85f00a1974854e2068123 /render | |
| parent | d66afbca4aae98d5d3fbf1902adb3dc270501013 (diff) | |
| download | netsurf-5fd24d75577e66c356e80c15ccb3eb24b7b05fc0.tar.gz netsurf-5fd24d75577e66c356e80c15ccb3eb24b7b05fc0.tar.bz2 | |
Revert r12609 and assert parent content state.
svn path=/trunk/netsurf/; revision=12610
Diffstat (limited to 'render')
| -rw-r--r-- | render/html.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/render/html.c b/render/html.c index b39224970..88177159c 100644 --- a/render/html.c +++ b/render/html.c @@ -1483,6 +1483,9 @@ nserror html_object_callback(hlcache_handle *object, int x, y; struct box *box; + assert(c->base.status == CONTENT_STATUS_READY || + c->base.status == CONTENT_STATUS_DONE); + box = o->box; switch (event->type) { @@ -1509,10 +1512,7 @@ nserror html_object_callback(hlcache_handle *object, c->base.active--; html_object_done(box, object, o->background); - if (c->base.status != CONTENT_STATUS_LOADING && - box->flags & REPLACE_DIM) { - /* Redraw newly available object if parent content is - * displayable, and the object's box size is known */ + if (box->flags & REPLACE_DIM) { union content_msg_data data; if (!box_visible(box)) |