Changeset 846 for trunk/src/gui/image/qpixmapcache.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qpixmapcache.cpp (modified) (11 diffs)

trunk/src/gui/image/qpixmapcache.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -40 +40 @@
 ****************************************************************************/
 
+
 #include "qpixmapcache.h"
 #include "qobject.h"
@@ -195 +196 @@
     static QPixmapCache::KeyData* getKeyData(QPixmapCache::Key *key);
 
+
+
+
 private:
+
     int *keyArray;
     int theid;
@@ -233 +238 @@
   cache is in active use.
 
-  When the last pixmap has been deleted from the cache, kill the
-  timer so Qt won't keep the CPU from going into sleep mode.
-*/
-void QPMCache::timerEvent(QTimerEvent *)
+  When the last detached pixmap has been deleted from the cache, kill the
+  timer so Qt won't keep the CPU from going into sleep mode. Currently
+  the timer is not restarted when the pixmap becomes unused, but it does
+  restart once something else is added (i.e. the cache space is actually needed).
+
+  Returns true if any were removed.
+*/
+bool QPMCache::flushDetachedPixmaps(bool nt)
 {
     int mc = maxCost();
-    bool nt = totalCost() == ps;
     setMaxCost(nt ? totalCost() * 3 / 4 : totalCost() -1);
     setMaxCost(mc);
     ps = totalCost();
 
+
     QHash<QString, QPixmapCache::Key>::iterator it = cacheKeys.begin();
     while (it != cacheKeys.end()) {
@@ -249 +258 @@
             releaseKey(it.value());
             it = cacheKeys.erase(it);
+
         } else {
             ++it;
@@ -254 +264 @@
     }
 
-    if (!size()) {
+    return any;
+}
+
+void QPMCache::timerEvent(QTimerEvent *)
+{
+    bool nt = totalCost() == ps;
+    if (!flushDetachedPixmaps(nt)) {
         killTimer(theid);
         theid = 0;
     } else if (nt != t) {
         killTimer(theid);
-        theid = startTimer(nt ? 10000 : 30000);
+        theid = startTimer(nt ? );
         t = nt;
     }
 }
+
 
 QPixmap *QPMCache::object(const QString &key) const
@@ -306 +323 @@
         cacheKeys.insert(key, cacheKey);
         if (!theid) {
-            theid = startTimer(30000);
+            theid = startTimer();
             t = false;
         }
@@ -322 +339 @@
     if (success) {
         if (!theid) {
-            theid = startTimer(30000);
+            theid = startTimer();
             t = false;
         }
@@ -343 +360 @@
     if (success) {
         if(!theid) {
-            theid = startTimer(30000);
+            theid = startTimer();
             t = false;
         }
@@ -423 +440 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 Q_GLOBAL_STATIC(QPMCache, pm_cache)
 
@@ -634 +665 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_END_NAMESPACE