1
=== modified file 'src/modules/Unity/Application/mirsurfacelistmodel.cpp'
2
--- src/modules/Unity/Application/mirsurfacelistmodel.cpp	2016-04-05 18:58:38 +0000
3
+++ src/modules/Unity/Application/mirsurfacelistmodel.cpp	2016-05-10 21:06:43 +0000
4
@@ -28,6 +28,11 @@
5
28
{
28
{
6
29
}
29
}
7
30
30
8
31
MirSurfaceListModel::~MirSurfaceListModel()
9
32
{
10
33
    Q_EMIT destroyed(this); // Early warning, while MirSurfaceListModel methods can still be accessed.
11
34
}
12
35
13
31
int MirSurfaceListModel::rowCount(const QModelIndex &parent) const
36
int MirSurfaceListModel::rowCount(const QModelIndex &parent) const
14
32
{
37
{
15
33
    return !parent.isValid() ? m_surfaceList.size() : 0;
38
    return !parent.isValid() ? m_surfaceList.size() : 0;
16
34
39
17
=== modified file 'src/modules/Unity/Application/mirsurfacelistmodel.h'
18
--- src/modules/Unity/Application/mirsurfacelistmodel.h	2016-04-05 18:58:38 +0000
19
+++ src/modules/Unity/Application/mirsurfacelistmodel.h	2016-05-10 21:06:43 +0000
20
@@ -41,6 +41,7 @@
21
41
    Q_OBJECT
41
    Q_OBJECT
22
42
public:
42
public:
23
43
    explicit MirSurfaceListModel(QObject *parent = 0);
43
    explicit MirSurfaceListModel(QObject *parent = 0);
24
44
    virtual ~MirSurfaceListModel();
25
44
45
26
45
    Q_INVOKABLE unity::shell::application::MirSurfaceInterface *get(int index) override;
46
    Q_INVOKABLE unity::shell::application::MirSurfaceInterface *get(int index) override;
27
46
    const unity::shell::application::MirSurfaceInterface *get(int index) const;
47
    const unity::shell::application::MirSurfaceInterface *get(int index) const;
28
47
48
29
=== modified file 'src/modules/Unity/Application/session.cpp'
30
--- src/modules/Unity/Application/session.cpp	2016-04-06 16:52:49 +0000
31
+++ src/modules/Unity/Application/session.cpp	2016-05-10 21:06:43 +0000
32
@@ -199,8 +199,17 @@
33
199
    if (newSurface->isFirstFrameDrawn()) {
199
    if (newSurface->isFirstFrameDrawn()) {
34
200
        prependSurface(newSurface);
200
        prependSurface(newSurface);
35
201
    } else {
201
    } else {
38
202
        connect(newSurface, &MirSurfaceInterface::firstFrameDrawn,
202
        m_blankSurfaces.append(newSurface);
39
203
                this, [this, newSurface]() { this->prependSurface(newSurface); });
203
        connect(newSurface, &QObject::destroyed, this, [this, newSurface]()
40
204
            {
41
205
                this->m_blankSurfaces.removeAll(newSurface);
42
206
            });
43
207
        connect(newSurface, &MirSurfaceInterface::firstFrameDrawn, this, [this, newSurface]()
44
208
            {
45
209
                this->m_blankSurfaces.removeAll(newSurface);
46
210
                newSurface->disconnect(this);
47
211
                this->prependSurface(newSurface);
48
212
            });
49
204
    }
213
    }
50
205
}
214
}
51
206
215
52
@@ -389,6 +398,18 @@
53
389
        // we assume that the top-most surface is the one that caused the prompt session to show up.
398
        // we assume that the top-most surface is the one that caused the prompt session to show up.
54
390
        auto promptSurfaceList = static_cast<MirSurfaceListModel*>(m_surfaceList.get(0)->promptSurfaceList());
399
        auto promptSurfaceList = static_cast<MirSurfaceListModel*>(m_surfaceList.get(0)->promptSurfaceList());
55
391
        promptSurfaceList->addSurfaceList(session->surfaceList());
400
        promptSurfaceList->addSurfaceList(session->surfaceList());
56
401
    } else if (m_blankSurfaces.count() > 0) {
57
402
        // Prompt session came in too early.
58
403
        // Parent session might be blocked until the prompt session is dismissed.
59
404
        // So we cannot wait anymore and must put that blank surface on the surface list so that the
60
405
        // user can see the prompt surface on top of that it and interact.
61
406
        auto blankSurface = m_blankSurfaces.takeFirst();
62
407
63
408
        auto promptSurfaceList = static_cast<MirSurfaceListModel*>(blankSurface->promptSurfaceList());
64
409
        promptSurfaceList->addSurfaceList(session->surfaceList());
65
410
66
411
        blankSurface->disconnect(this);
67
412
        prependSurface(blankSurface);
68
392
    }
413
    }
69
393
}
414
}
70
394
415
71
395
416
72
=== modified file 'src/modules/Unity/Application/session.h'
73
--- src/modules/Unity/Application/session.h	2016-03-28 18:02:26 +0000
74
+++ src/modules/Unity/Application/session.h	2016-05-10 21:06:43 +0000
75
@@ -107,6 +107,12 @@
76
107
    std::shared_ptr<mir::scene::Session> m_session;
107
    std::shared_ptr<mir::scene::Session> m_session;
77
108
    Application* m_application;
108
    Application* m_application;
78
109
    MirSurfaceListModel m_surfaceList;
109
    MirSurfaceListModel m_surfaceList;
79
110
80
111
    // Registered surfaces that haven't yet drawn their first frames.
81
112
    // Once they do, they get moved to m_surfaceList.
82
113
    // So this list is just a temporary holder and most of the time it's gonna be empty.
83
114
    QList<MirSurfaceInterface*> m_blankSurfaces;
84
115
85
110
    SessionModel* m_children;
116
    SessionModel* m_children;
86
111
    bool m_fullscreen;
117
    bool m_fullscreen;
87
112
    State m_state;
118
    State m_state;
88
113
119
89
=== modified file 'tests/modules/SessionManager/session_test.cpp'
90
--- tests/modules/SessionManager/session_test.cpp	2016-03-28 18:02:26 +0000
91
+++ tests/modules/SessionManager/session_test.cpp	2016-05-10 21:06:43 +0000
92
@@ -311,3 +311,46 @@
93
311
    EXPECT_EQ(Session::Stopped, session->state());
311
    EXPECT_EQ(Session::Stopped, session->state());
94
312
    EXPECT_FALSE(session->m_suspendTimer->isRunning());
312
    EXPECT_FALSE(session->m_suspendTimer->isRunning());
95
313
}
313
}
96
314
97
315
/*
98
316
    Regression test for https://bugs.launchpad.net/ubuntu/+source/qtmir/+bug/1578665
99
317
100
318
    A child prompt session was arriving before the application surface got a chance to draw
101
319
    its first frame. And on top of that, the application was blocked from drawing anything
102
320
    until that prompt session gone away.
103
321
 */
104
322
TEST_F(SessionTests, ChildSessionArrivesBeforeSurfaceDrawnFirstFrame)
105
323
{
106
324
    using namespace testing;
107
325
108
326
    const QString appId("test-app");
109
327
    const pid_t procId = 5551;
110
328
111
329
    auto mirSession = std::make_shared<MockSession>(appId.toStdString(), procId);
112
330
113
331
    auto session = std::make_shared<qtmir::Session>(mirSession, promptSessionManager);
114
332
115
333
    FakeMirSurface *blankSurface = new FakeMirSurface;
116
334
    session->registerSurface(blankSurface);
117
335
118
336
    // Surface doesn't appear in this list as it has not drawn its first frame yet
119
337
    EXPECT_EQ(0, session->surfaceList()->count());
120
338
121
339
    Session* childSession = new Session(mirSession, promptSessionManager);
122
340
    session->addChildSession(childSession);
123
341
124
342
    FakeMirSurface *promptSurface = new FakeMirSurface;
125
343
    childSession->registerSurface(promptSurface);
126
344
    promptSurface->drawFirstFrame();
127
345
128
346
    // Even though blankSurface still hasn't drawn its first frame (ie, it's still blank),
129
347
    // it should now appear in this list as it now has a child prompt surface, which the
130
348
    // user must interact with.
131
349
    auto sessionSurfaceList = static_cast<MirSurfaceListModel*>(session->surfaceList());
132
350
    EXPECT_EQ(1, sessionSurfaceList->count());
133
351
    EXPECT_TRUE(sessionSurfaceList->contains(blankSurface));
134
352
135
353
    auto promptSurfaceList = static_cast<MirSurfaceListModel*>(blankSurface->promptSurfaceList());
136
354
    EXPECT_EQ(1, promptSurfaceList->count());
137
355
    EXPECT_TRUE(promptSurfaceList->contains(promptSurface));
138
356
}
Reviewer	Review Type	Date Requested	Status
Nick Dedekind (community)		2016-05-10	Approve on 2016-05-11
Unity8 CI Bot (community)	continuous-integration		Approve on 2016-05-10
Review via email: mp+294297@code.launchpad.net