1
=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.cpp'
2
--- src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-01-29 07:43:58 +0000
3
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-02-18 12:20:49 +0000
4
@@ -30,7 +30,6 @@
5
30
    QObject(parent),
30
    QObject(parent),
6
31
    m_framesAboveThreshold(0),
31
    m_framesAboveThreshold(0),
7
32
    m_warningCount(0),
32
    m_warningCount(0),
8
33
    m_timer(NULL),
9
34
    m_window(NULL)
33
    m_window(NULL)
10
35
{
34
{
11
36
    QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,
35
    QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,
12
@@ -92,16 +91,17 @@
13
92
91
14
93
void UCPerformanceMonitor::startTimer()
92
void UCPerformanceMonitor::startTimer()
15
94
{
93
{
20
95
    if (!m_timer) {
94
    m_timer.start();
17
96
        m_timer.reset(new QElapsedTimer);
18
97
    }
19
98
    m_timer->start();
21
99
}
95
}
22
100
96
23
101
void UCPerformanceMonitor::stopTimer()
97
void UCPerformanceMonitor::stopTimer()
24
102
{
98
{
27
103
    int totalTimeInMs = m_timer->elapsed();
99
    if (!m_timer.isValid()) {
28
104
    m_timer->invalidate();
100
        return;
29
101
    }
30
102
31
103
    const int totalTimeInMs = m_timer.elapsed();
32
104
    m_timer.invalidate();
33
105
105
34
106
    if (totalTimeInMs >= singleFrameThreshold) {
106
    if (totalTimeInMs >= singleFrameThreshold) {
35
107
        qCWarning(ucPerformance, "Last frame took %d ms to render.", totalTimeInMs);
107
        qCWarning(ucPerformance, "Last frame took %d ms to render.", totalTimeInMs);
36
108
108
37
=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.h'
38
--- src/Ubuntu/Components/plugin/ucperformancemonitor.h	2016-01-19 13:01:44 +0000
39
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.h	2016-02-18 12:20:49 +0000
40
@@ -45,7 +45,7 @@
41
45
private:
45
private:
42
46
    int m_framesAboveThreshold;
46
    int m_framesAboveThreshold;
43
47
    int m_warningCount;
47
    int m_warningCount;
45
48
    QSharedPointer<QElapsedTimer> m_timer;
48
    QElapsedTimer m_timer;
46
49
    QQuickWindow* m_window;
49
    QQuickWindow* m_window;
47
50
};
50
};
48
51
51
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-02-18
Zoltan Balogh		2016-02-18	Approve on 2016-02-18
Review via email: mp+286493@code.launchpad.net