Revert "Make sure that all pixmap URLs have a some event in the timeline"

This reverts commit 727f9436718002cf9bd3cdf651e5b174f34cedd3.
It was accidentally pushed without review and is broken, too.

2 files changed, 22 insertions, 35 deletions

diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.cpp b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
index 0266a1bf30..d1fec8d171 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.cpp
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.cpp
@@ -368,16 +368,6 @@ bool compareStartTimes(const PixmapCacheModel::PixmapCacheEvent&t1, const Pixmap
     return t1.startTime < t2.startTime;
 }
 
-void PixmapCacheModel::synthesizeLoadStart(PixmapCacheEvent &newEvent)
-{
-    // if it's a new entry it means that we don't have a corresponding start
-    newEvent.pixmapEventType = PixmapLoadingStarted;
-    newEvent.rowNumberExpanded = newEvent.urlIndex + 2;
-    newEvent.duration = newEvent.startTime - traceStartTime();
-    newEvent.startTime = traceStartTime();
-    d->eventList << newEvent;
-}
-
 void PixmapCacheModel::loadData()
 {
     clear();
@@ -403,24 +393,22 @@ void PixmapCacheModel::loadData()
         if (newEvent.urlIndex == -1) {
             isNewEntry = true;
             newEvent.urlIndex = d->pixmapUrls.count();
-            qDebug() << "url: " << event.location.filename << " type: " << newEvent.pixmapEventType;
             d->pixmapUrls << event.location.filename;
             d->pixmapSizes << QPair<int, int>(0,0); // default value
             pixmapStartPoints << d->eventList.count(); // index to the starting point
         }
 
+        if (newEvent.pixmapEventType == PixmapSizeKnown) { // pixmap size
+            d->pixmapSizes[newEvent.urlIndex] = QPair<int,int>((int)event.numericData1, (int)event.numericData2);
+        }
+
         newEvent.eventId = newEvent.urlIndex + 1;
-        newEvent.rowNumberExpanded = newEvent.urlIndex + 2;
 
-        switch (newEvent.pixmapEventType) {
-        case PixmapSizeKnown: // pixmap size
-            d->pixmapSizes[newEvent.urlIndex] = QPair<int,int>((int)event.numericData1, (int)event.numericData2);
-            if (isNewEntry)
-                synthesizeLoadStart(newEvent);
-            break;
-        case PixmapCacheCountChanged: {// Cache Size Changed Event
+        // Cache Size Changed Event
+        if (newEvent.pixmapEventType == PixmapCacheCountChanged) {
             newEvent.startTime = event.startTime + 1; // delay 1 ns for proper sorting
             newEvent.eventId = 0;
+            newEvent.rowNumberExpanded = 1;
             newEvent.rowNumberCollapsed = 1;
 
             qint64 pixSize = d->pixmapSizes[newEvent.urlIndex].first * d->pixmapSizes[newEvent.urlIndex].second;
@@ -436,34 +424,35 @@ void PixmapCacheModel::loadData()
             newEvent.cacheSize = prevSize + pixSize;
             d->eventList << newEvent;
             lastCacheSizeEvent = d->eventList.count() - 1;
-            break;
         }
-        case PixmapLoadingStarted: // Load
+
+        // Load
+        if (newEvent.pixmapEventType == PixmapLoadingStarted) {
             pixmapStartPoints[newEvent.urlIndex] = d->eventList.count();
+            newEvent.rowNumberExpanded = newEvent.urlIndex + 2;
             d->eventList << newEvent;
-            break;
-        case PixmapLoadingFinished:
-        case PixmapLoadingError: {
+        }
+
+        if (newEvent.pixmapEventType == PixmapLoadingFinished || newEvent.pixmapEventType == PixmapLoadingError) {
             int loadIndex = pixmapStartPoints[newEvent.urlIndex];
             if (!isNewEntry) {
                 d->eventList[loadIndex].duration = event.startTime - d->eventList[loadIndex].startTime;
             } else {
-                synthesizeLoadStart(newEvent);
+                // if it's a new entry it means that we don't have a corresponding start
+                newEvent.pixmapEventType = PixmapLoadingStarted;
+                newEvent.rowNumberExpanded = newEvent.urlIndex + 2;
+                newEvent.startTime = traceStartTime();
+                newEvent.duration = event.startTime - traceStartTime();
+                d->eventList << newEvent;
             }
             if (event.bindingType == PixmapLoadingFinished)
                 d->eventList[loadIndex].cacheSize = 1;  // use count to mark success
             else
                 d->eventList[loadIndex].cacheSize = -1; // ... or failure
-            break;
         }
-        default:
-            if (isNewEntry)
-                synthesizeLoadStart(newEvent);
-            break;
-        }
-    }
 
-    m_modelManager->modelProxyCountUpdated(m_modelId, d->eventList.count(), 2*simpleModel->getEvents().count());
+        m_modelManager->modelProxyCountUpdated(m_modelId, d->eventList.count(), 2*simpleModel->getEvents().count());
+    }
 
     if (lastCacheSizeEvent != -1) {
         d->eventList[lastCacheSizeEvent].duration = traceEndTime() - d->eventList[lastCacheSizeEvent].startTime;
diff --git a/plugins/qmlprofilerextension/pixmapcachemodel.h b/plugins/qmlprofilerextension/pixmapcachemodel.h
index 2e63f5996f..8ac8d42218 100644
--- a/plugins/qmlprofilerextension/pixmapcachemodel.h
+++ b/plugins/qmlprofilerextension/pixmapcachemodel.h
@@ -114,8 +114,6 @@ protected slots:
     void dataChanged();
 
 private:
-    void synthesizeLoadStart(PixmapCacheEvent &newEvent);
-
     class PixmapCacheModelPrivate;
     PixmapCacheModelPrivate *d;