diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-05 14:29:53 +0100 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-08-05 14:30:30 +0100 |
| commit | 6ba199c7d7bee1909107ee0b8cbaf749c575b310 (patch) | |
| tree | 9932d32f3fd90c341022257d6c22061fe990725c /content/handlers/html/html_object.c | |
| parent | 2171f13ab334716250ca2bc53946806f7a88c8a3 (diff) | |
| download | netsurf-6ba199c7d7bee1909107ee0b8cbaf749c575b310.tar.gz netsurf-6ba199c7d7bee1909107ee0b8cbaf749c575b310.tar.bz2 | |
Content messages: Remove ERRORCODE, rework ERROR
This reworks CONTENT_MSG_ERROR to be structured data and
removes the CONTENT_MSG_ERRORCODE message kind.
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'content/handlers/html/html_object.c')
| -rw-r--r-- | content/handlers/html/html_object.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/handlers/html/html_object.c b/content/handlers/html/html_object.c index f49af6505..dc8524499 100644 --- a/content/handlers/html/html_object.c +++ b/content/handlers/html/html_object.c @@ -137,9 +137,7 @@ html_object_callback(hlcache_handle *object, struct box *box; box = o->box; - if (box == NULL && - event->type != CONTENT_MSG_ERROR && - event->type != CONTENT_MSG_ERRORCODE) { + if (box == NULL && event->type != CONTENT_MSG_ERROR) { return NSERROR_OK; } @@ -195,7 +193,6 @@ html_object_callback(hlcache_handle *object, } break; - case CONTENT_MSG_ERRORCODE: case CONTENT_MSG_ERROR: hlcache_handle_release(object); @@ -472,8 +469,7 @@ html_object_callback(hlcache_handle *object, c->base.active == 0 && (event->type == CONTENT_MSG_LOADING || event->type == CONTENT_MSG_DONE || - event->type == CONTENT_MSG_ERROR || - event->type == CONTENT_MSG_ERRORCODE)) { + event->type == CONTENT_MSG_ERROR)) { /* all objects have arrived */ content__reformat(&c->base, false, c->base.available_width, c->base.available_height); |