feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '3.2'

Browse Source 
Change-Id: I15f9db0dd9d65ceaff9503c535abd7abcbd1eccc
This commit is contained in:
Ulf Hermann
2014-07-09 13:01:34 +02:00
parent cc4602b3f8 114c1dbc88
commit 645ee14ce4
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/qmlprofilerextension/memoryusagemodel.cpp
View File

@@ -269,10 +269,10 @@ void MemoryUsageModel::loadData()
} }
if (currentJSHeapIndex != -1) if (currentJSHeapIndex != -1)
d->insertEnd(currentJSHeapIndex, simpleModel->lastTimeMark() - d->insertEnd(currentJSHeapIndex, traceEndTime() -
d->range(currentJSHeapIndex).start - 1); d->range(currentJSHeapIndex).start - 1);
if (currentUsageIndex != -1) if (currentUsageIndex != -1)
d->insertEnd(currentUsageIndex, simpleModel->lastTimeMark() - d->insertEnd(currentUsageIndex, traceEndTime() -
d->range(currentUsageIndex).start - 1); d->range(currentUsageIndex).start - 1);

15
plugins/qmlprofilerextension/pixmapcachemodel.cpp
View File

@@ -456,6 +456,21 @@ void PixmapCacheModel::loadData()
if (state.loadState == Initial) { if (state.loadState == Initial) {
newEvent.pixmapEventType = PixmapLoadingStarted; newEvent.pixmapEventType = PixmapLoadingStarted;
state.started = d->insert(traceStartTime(), startTime - traceStartTime(), newEvent); state.started = d->insert(traceStartTime(), startTime - traceStartTime(), newEvent);
// All other indices are wrong now as we've prepended. Fix them ...
if (lastCacheSizeEvent >= state.started)
++lastCacheSizeEvent;
for (int pixmapIndex = 0; pixmapIndex < d->pixmaps.count(); ++pixmapIndex) {
Pixmap &brokenPixmap = d->pixmaps[pixmapIndex];
for (int sizeIndex = 0; sizeIndex < brokenPixmap.sizes.count(); ++sizeIndex) {
PixmapState &brokenSize = brokenPixmap.sizes[sizeIndex];
if ((pixmapIndex != newEvent.urlIndex || sizeIndex != newEvent.sizeIndex) &&
brokenSize.started >= state.started) {
++brokenSize.started;
}
}
}
} }
d->insertEnd(state.started, startTime - d->range(state.started).start); d->insertEnd(state.started, startTime - d->range(state.started).start);