From 8a99b045bc48e0c5eb89129ea8ee034c72b955de Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 15 Mar 2015 00:00:45 +0000 Subject: Remove url from content thumbnailers API The content thumbnailers for each frontend were being provided the contents url. This was only ever used to call the urldb thumbnail setting API. This changes it so the single callsite that passed a valid url adds the bitmap to that url itself in desktop_history.c instead of forcing every frontend to require the urldb API. Additionally the old API could pass the url as NULL which was causing asserts where this was not an expected parameter value. Because of this this fixes bug #2286 which was also present in the monkey frontend as both called nsurl_access() on the url without the NULL check and caused an assertion. --- desktop/browser_history.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'desktop/browser_history.c') diff --git a/desktop/browser_history.c b/desktop/browser_history.c index fb76097ed..dc04a16c1 100644 --- a/desktop/browser_history.c +++ b/desktop/browser_history.c @@ -512,13 +512,21 @@ nserror browser_window_history_add(struct browser_window *bw, if (bitmap == NULL) { LOG(("Creating thumbnail for %s", nsurl_access(nsurl))); bitmap = bitmap_create(WIDTH, HEIGHT, - BITMAP_NEW | BITMAP_CLEAR_MEMORY | - BITMAP_OPAQUE); - if ((bitmap != NULL) && - (thumbnail_create(content, bitmap, nsurl) == false)) { - /* Thumbnailing failed. Ignore it silently */ - bitmap_destroy(bitmap); - bitmap = NULL; + BITMAP_NEW | BITMAP_CLEAR_MEMORY | + BITMAP_OPAQUE); + if (bitmap != NULL) { + if (thumbnail_create(content, bitmap)) { + /* Successful thumbnail so register it + * with the url. + */ + urldb_set_thumbnail(nsurl, bitmap); + } else { + /* Thumbnailing failed. Ignore it + * silently but clean up bitmap. + */ + bitmap_destroy(bitmap); + bitmap = NULL; + } } } entry->bitmap = bitmap; @@ -555,7 +563,7 @@ nserror browser_window_history_update(struct browser_window *bw, free(history->current->page.title); history->current->page.title = title; - thumbnail_create(content, history->current->bitmap, NULL); + thumbnail_create(content, history->current->bitmap); return NSERROR_OK; } -- cgit v1.2.3