Commit ae949b9d21470a9b9bf200774c246a0b86a69ff6

Alexis Menard
Mon Apr 27 14:35:53 GMT 2009

Tree SHA1: f2361cd
Parent SHA1: e7fdaf4 (Doc - cleaning up some documentation for QFileDialog and obsolete)
raw diff | raw patch

QPixmapCache:Remove the old pixmap if you insert one with the same key.

If you insert a new pixmap in the cache with a key that was already in
the cache then we remove the old pixmap and add the new one. This avoid
to fill the memory with garbage even if the cache has a protection to
avoid running out of memory. This was discovered with QraphicsView
and its cache. We don't need to keep old cached pixmaps for an item.

Task-number: KDE
Reviewed-by: Trond

Diff rendering mode:
inline
side by side


187	187	cacheKeys.insert(key, cacheKey);
188	188	return true;
189	189	}
	190	qint64 oldCacheKey = cacheKeys.value(key, -1);
	191	//If for the same key we add already a pixmap we should delete it
	192	if (oldCacheKey != -1)
	193	QCache<qint64, QDetachedPixmap>::remove(oldCacheKey);
	194
190	195	bool success = QCache<qint64, QDetachedPixmap>::insert(cacheKey, new QDetachedPixmap(pixmap), cost);
191	196	if (success) {
192	197	cacheKeys.insert(key, cacheKey);


166	166	QVERIFY(estimatedNum - 1 <= num <= estimatedNum + 1);
167	167	QPixmap p3;
168	168	QPixmapCache::insert("null", p3);
	169
	170	QPixmap c1(10, 10);
	171	c1.fill(Qt::yellow);
	172	QPixmapCache::insert("custom", c1);
	173	QVERIFY(!c1.isDetached());
	174	QPixmap c2(10, 10);
	175	c2.fill(Qt::red);
	176	QPixmapCache::insert("custom", c2);
	177	//We have deleted the old pixmap in the cache for the same key
	178	QVERIFY(c1.isDetached());
169	179	}
170	180
171	181	void tst_QPixmapCache::remove()

Commit ae949b9d21470a9b9bf200774c246a0b86a69ff6

Comments

Add a new comment:

Add your comment