From 8fb2fc6fc347ddd68db0ce70648e9a2d25ef88e3 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 10 Sep 2017 16:05:41 +0100 Subject: rationalise history icon bitmap handling to ensure correct lifetime --- content/urldb.c | 47 ----------------------------------------------- content/urldb.h | 10 ---------- 2 files changed, 57 deletions(-) (limited to 'content') diff --git a/content/urldb.c b/content/urldb.c index add2a1d80..cacc475f2 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -202,7 +202,6 @@ struct path_data { char **fragment; /**< Array of fragments */ bool persistent; /**< This entry should persist */ - struct bitmap *thumb; /**< Thumbnail image of resource */ struct url_internal_data urld; /**< URL data for resource */ /** @@ -2702,10 +2701,6 @@ static void urldb_destroy_path_node_content(struct path_data *node) free(node->fragment[i]); free(node->fragment); - if (node->thumb) { - guit->bitmap->destroy(node->thumb); - } - free(node->urld.title); for (a = node->cookies; a; a = b) { @@ -3465,48 +3460,6 @@ bool urldb_get_cert_permissions(nsurl *url) } -/* exported interface documented in content/urldb.h */ -bool urldb_set_thumbnail(nsurl *url, struct bitmap *bitmap) -{ - struct path_data *p; - - assert(url); - - /* add url, in case it's missing */ - urldb_add_url(url); - - p = urldb_find_url(url); - if (p == NULL) { - return false; - } - - NSLOG(netsurf, INFO, "Setting bitmap on %s", nsurl_access(url)); - - if ((p->thumb) && (p->thumb != bitmap)) { - guit->bitmap->destroy(p->thumb); - } - - p->thumb = bitmap; - - return true; -} - - -/* exported interface documented in netsurf/url_db.h */ -struct bitmap *urldb_get_thumbnail(nsurl *url) -{ - struct path_data *p; - - assert(url); - - p = urldb_find_url(url); - if (!p) - return NULL; - - return p->thumb; -} - - /* exported interface documented in netsurf/url_db.h */ void urldb_iterate_partial(const char *prefix, diff --git a/content/urldb.h b/content/urldb.h index b2c233194..4aa548704 100644 --- a/content/urldb.h +++ b/content/urldb.h @@ -110,16 +110,6 @@ struct nsurl *urldb_get_url(struct nsurl *url); bool urldb_get_cert_permissions(struct nsurl *url); -/** - * Set thumbnail for url, replacing any existing thumbnail - * - * \param url Absolute URL to consider - * \param bitmap Opaque pointer to thumbnail data, or NULL to invalidate - * \return true on successful setting else false - */ -bool urldb_set_thumbnail(struct nsurl *url, struct bitmap *bitmap); - - /** * Parse Set-Cookie header and insert cookie(s) into database * -- cgit v1.2.3