[epiphany] Suggestion Model: Replace object ref'ing with a cancellable for favicon loading

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 1b83b02fdf2aa71234ca091e742b42b505a4dec1
Author: Jan-Michael Brummer <jan brummer tabos org>
Date:   Tue Aug 7 21:48:37 2018 +0200

    Suggestion Model: Replace object ref'ing with a cancellable for favicon loading

 src/ephy-suggestion-model.c | 55 +++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 19 deletions(-)
---
diff --git a/src/ephy-suggestion-model.c b/src/ephy-suggestion-model.c
index f9c82a81b..5f84ba83e 100644
--- a/src/ephy-suggestion-model.c
+++ b/src/ephy-suggestion-model.c
@@ -34,6 +34,7 @@ struct _EphySuggestionModel {
   EphyBookmarksManager *bookmarks_manager;
   GSequence            *items;
   GSList               *search_terms;
+  GCancellable         *icon_cancellable;
 };
 
 enum {
@@ -59,6 +60,9 @@ ephy_suggestion_model_finalize (GObject *object)
   g_clear_object (&self->history_service);
   g_clear_pointer (&self->items, g_sequence_free);
 
+  g_cancellable_cancel (self->icon_cancellable);
+  g_clear_object (&self->icon_cancellable);
+
   g_slist_free_full (self->search_terms, (GDestroyNotify)g_regex_unref);
 
   G_OBJECT_CLASS (ephy_suggestion_model_parent_class)->finalize (object);
@@ -298,35 +302,43 @@ icon_loaded_cb (GObject      *source,
                 gpointer      user_data)
 {
   WebKitFaviconDatabase *database = WEBKIT_FAVICON_DATABASE (source);
-  EphySuggestion *suggestion = EPHY_SUGGESTION (user_data);
-  cairo_surface_t *favicon = webkit_favicon_database_get_favicon_finish (database, result, NULL);
+  EphySuggestion *suggestion;
+  GError *error = NULL;
+  cairo_surface_t *favicon;
+  gdouble x_scale, y_scale;
+  int x, y;
 
-  if (favicon != NULL) {
-    gdouble x_scale, y_scale;
-    int x, y;
+  favicon = webkit_favicon_database_get_favicon_finish (database, result, &error);
 
-    x = cairo_image_surface_get_width (favicon);
-    y = cairo_image_surface_get_height (favicon);
-    x_scale = (gdouble)x / 16;
-    y_scale = (gdouble)y / 16;
+  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) || favicon == NULL)
+    return;
 
-    cairo_surface_set_device_scale (favicon, x_scale, y_scale);
+  suggestion = EPHY_SUGGESTION (user_data);
 
-    ephy_suggestion_set_favicon (suggestion, favicon);
-  }
+  x = cairo_image_surface_get_width (favicon);
+  y = cairo_image_surface_get_height (favicon);
+  x_scale = (gdouble)x / 16;
+  y_scale = (gdouble)y / 16;
+
+  cairo_surface_set_device_scale (favicon, x_scale, y_scale);
 
-  g_object_unref (suggestion);
+  ephy_suggestion_set_favicon (suggestion, favicon);
 }
 
 static void
-load_favicon (EphySuggestion *suggestion,
-              const char     *url)
+load_favicon (EphySuggestionModel *model,
+              EphySuggestion      *suggestion,
+              const char          *url)
 {
   EphyEmbedShell *shell = ephy_embed_shell_get_default ();
   WebKitWebContext *context = ephy_embed_shell_get_web_context (shell);
   WebKitFaviconDatabase *database = webkit_web_context_get_favicon_database (context);
 
-  webkit_favicon_database_get_favicon (database, url, NULL, icon_loaded_cb, g_object_ref (suggestion));
+  webkit_favicon_database_get_favicon (database,
+                                       url,
+                                       model->icon_cancellable,
+                                       icon_loaded_cb,
+                                       suggestion);
 }
 
 static guint
@@ -353,7 +365,7 @@ add_bookmarks (EphySuggestionModel *self,
       EphySuggestion *suggestion;
 
       suggestion = ephy_suggestion_new (title, url);
-      load_favicon (suggestion, url);
+      load_favicon (self, suggestion, url);
 
       g_sequence_append (self->items, suggestion);
       added++;
@@ -375,7 +387,7 @@ add_history (EphySuggestionModel *self,
     EphySuggestion *suggestion;
 
     suggestion = ephy_suggestion_new (url->title, url->url);
-    load_favicon (suggestion, url->url);
+    load_favicon (self, suggestion, url->url);
 
     g_sequence_append (self->items, suggestion);
     added++;
@@ -403,7 +415,7 @@ add_search_engines (EphySuggestionModel *self,
 
     address = ephy_search_engine_manager_build_search_address (manager, engines[i], query);
     suggestion = ephy_suggestion_new_without_subtitle (engines[i], address);
-    load_favicon (suggestion, address);
+    load_favicon (self, suggestion, address);
 
     g_sequence_append (self->items, suggestion);
     added++;
@@ -438,6 +450,11 @@ query_completed_cb (EphyHistoryService *service,
   g_clear_pointer (&self->items, g_sequence_free);
   self->items = g_sequence_new (g_object_unref);
 
+  g_cancellable_cancel (self->icon_cancellable);
+  g_clear_object (&self->icon_cancellable);
+
+  self->icon_cancellable = g_cancellable_new ();
+
   if (strlen (query) > 0) {
     added = add_bookmarks (self, query);
     added += add_history (self, urls, query);