WebSVN – Kolibri OS – Diff – /programs/develop/libraries/cairo/src/cairo-toy-font-face.c

     /* 1607 and 1451 are just a couple of arbitrary primes. */
     hash = _cairo_hash_string (family);
     hash += ((unsigned long) slant) * 1607;
     hash += ((unsigned long) weight) * 1451;
     assert (hash != 0);
     key->base.hash_entry.hash = hash;
+}
     /* Return existing font_face if it exists in the hash table. */
     font_face = _cairo_hash_table_lookup (hash_table,
 					  &key.base.hash_entry);
     if (font_face != NULL) {
 	if (font_face->base.status == CAIRO_STATUS_SUCCESS) {
-	    /* We increment the reference count here manually to avoid
-	       double-locking. */
-	    _cairo_reference_count_inc (&font_face->base.ref_count);
+	    cairo_font_face_reference (&font_face->base);
 	    _cairo_toy_font_face_hash_table_unlock ();
 	    return &font_face->base;
+	}
 	/* remove the bad font from the hash table */
-	_cairo_hash_table_remove (hash_table, &font_face->base.hash_entry);
-	font_face->base.hash_entry.hash = 0;
+	_cairo_hash_table_remove (hash_table, &font_face->base.hash_entry);
+    }
     /* Otherwise create it and insert into hash table. */
 _cairo_toy_font_face_destroy (void *abstract_face)
+{
     cairo_toy_font_face_t *font_face = abstract_face;
     cairo_hash_table_t *hash_table;
-    if (font_face == NULL ||
-	    CAIRO_REFERENCE_COUNT_IS_INVALID (&font_face->base.ref_count))
-	return;
     hash_table = _cairo_toy_font_face_hash_table_lock ();
     /* All created objects must have been mapped in the hash table. */
     assert (hash_table != NULL);
     if (CAIRO_REFERENCE_COUNT_HAS_REFERENCE (&font_face->base.ref_count)) {
 	/* somebody recreated the font whilst we waited for the lock */
 	_cairo_toy_font_face_hash_table_unlock ();
+	return;
+    }
+    /* Font faces in SUCCESS status are guaranteed to be in the
-	return;
+     * hashtable. Font faces in an error status are removed from the
+     * hashtable if they are found during a lookup, thus they should
      * only be removed if they are in the hashtable. */
     if (likely (font_face->base.status == CAIRO_STATUS_SUCCESS) ||
-    if (font_face->base.hash_entry.hash != 0)
+	_cairo_hash_table_lookup (hash_table, &font_face->base.hash_entry) == font_face)

Subversion Repositories Kolibri OS

(root)/programs/develop/libraries/cairo/src/cairo-toy-font-face.c – Rev 1892 → 3959