diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/content.c | 6 | ||||
| -rw-r--r-- | content/content_factory.c | 2 | ||||
| -rw-r--r-- | content/content_protected.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/content/content.c b/content/content.c index db186e8cc..4c87f0eb5 100644 --- a/content/content.c +++ b/content/content.c @@ -733,7 +733,7 @@ content_type content_get_type(hlcache_handle *h) if (c == NULL) return CONTENT_NONE; - return c->handler->type(c->mime_type); + return c->handler->type(); } /** @@ -977,7 +977,7 @@ struct bitmap *content__get_bitmap(struct content *c) if ((c != NULL) && (c->handler != NULL) && (c->handler->type != NULL) && - (c->handler->type(NULL) == CONTENT_IMAGE) && + (c->handler->type() == CONTENT_IMAGE) && (c->handler->get_internal != NULL) ) { bitmap = c->handler->get_internal(c, NULL); } @@ -1012,7 +1012,7 @@ bool content__get_opaque(struct content *c) if ((c != NULL) && (c->handler != NULL) && (c->handler->type != NULL) && - (c->handler->type(NULL) == CONTENT_IMAGE) && + (c->handler->type() == CONTENT_IMAGE) && (c->handler->get_internal != NULL) ) { struct bitmap *bitmap = NULL; bitmap = c->handler->get_internal(c, NULL); diff --git a/content/content_factory.c b/content/content_factory.c index 0b9d44b7d..d3a69c34d 100644 --- a/content/content_factory.c +++ b/content/content_factory.c @@ -135,7 +135,7 @@ content_type content_factory_type_from_mime_type(lwc_string *mime_type) handler = content_lookup(mime_type); if (handler != NULL) { - type = handler->type(mime_type); + type = handler->type(); } return type; diff --git a/content/content_protected.h b/content/content_protected.h index fd854a0bc..a1d6c7076 100644 --- a/content/content_protected.h +++ b/content/content_protected.h @@ -67,7 +67,7 @@ struct content_handler { struct selection * (*get_selection)(struct content *c); nserror (*clone)(const struct content *old, struct content **newc); bool (*matches_quirks)(const struct content *c, bool quirks); - content_type (*type)(lwc_string *mime_type); + content_type (*type)(void); /** handler dependant content sensitive internal data interface. */ void * (*get_internal)(const struct content *c, void *context); |