1
=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
2
--- src/modules/Unity/Application/mirsurface.cpp	2016-11-25 15:23:36 +0000
3
+++ src/modules/Unity/Application/mirsurface.cpp	2017-01-10 18:01:14 +0000
4
@@ -845,6 +845,7 @@
5
845
    if (!m_ready) {
845
    if (!m_ready) {
6
846
        DEBUG_MSG << "()";
846
        DEBUG_MSG << "()";
7
847
        m_ready = true;
847
        m_ready = true;
8
848
        updateVisible(); // as Mir can change m_surface->visible() to true after first frame swap
9
848
        Q_EMIT ready();
849
        Q_EMIT ready();
10
849
        updateExposure();
850
        updateExposure();
11
850
    }
851
    }
12
851
852
13
=== modified file 'tests/modules/WindowManager/mirsurface_test.cpp'
14
--- tests/modules/WindowManager/mirsurface_test.cpp	2016-11-03 20:17:46 +0000
15
+++ tests/modules/WindowManager/mirsurface_test.cpp	2017-01-10 18:01:14 +0000
16
@@ -61,6 +61,8 @@
17
61
struct MockSurface : public StubSurface
61
struct MockSurface : public StubSurface
18
62
{
62
{
19
63
    MOCK_CONST_METHOD1(buffers_ready_for_compositor, int(void const*));
63
    MOCK_CONST_METHOD1(buffers_ready_for_compositor, int(void const*));
20
64
    MOCK_CONST_METHOD0(visible, bool());
21
65
    MOCK_CONST_METHOD0(state, MirSurfaceState());
22
64
};
66
};
23
65
67
24
66
class MirSurfaceTest : public ::testing::Test
68
class MirSurfaceTest : public ::testing::Test
25
@@ -159,6 +161,34 @@
26
159
}
161
}
27
160
162
28
161
/*
163
/*
29
164
 * Test that MirSurface.visible is recalculated after the client swaps the first frame.
30
165
 * A surface is not considered visible unless it has a non-hidden & non-minimized state, and
31
166
 * it has drawn at least one frame.
32
167
 */
33
168
TEST_F(MirSurfaceTest, EnsureVisiblePropertyRecalculatedAfterFrameSwap)
34
169
{
35
170
    auto mockSurface = std::make_shared<NiceMock<MockSurface>>();
36
171
    miral::Window mockWindow(stubSession, mockSurface);
37
172
    ms::SurfaceCreationParameters spec;
38
173
    miral::WindowInfo mockWindowInfo(mockWindow, spec);
39
174
40
175
    EXPECT_CALL(*mockSurface.get(),state())
41
176
        .WillRepeatedly(Return(mir_surface_state_maximized));
42
177
    EXPECT_CALL(*mockSurface.get(),visible())
43
178
        .WillOnce(Return(false));
44
179
45
180
    MirSurface surface(mockWindowInfo, nullptr);
46
181
47
182
    EXPECT_FALSE(surface.visible());
48
183
49
184
    EXPECT_CALL(*mockSurface.get(),visible())
50
185
        .WillOnce(Return(true));
51
186
52
187
    surface.setReady();
53
188
    EXPECT_TRUE(surface.visible());
54
189
}
55
190
56
191
/*
57
162
 * Test that a surface whose client fails to comply with a close request will eventually comply.
192
 * Test that a surface whose client fails to comply with a close request will eventually comply.
58
163
 */
193
 */
59
164
struct MockWindowModelController : public StubWindowModelController
194
struct MockWindowModelController : public StubWindowModelController
Reviewer	Review Type	Date Requested	Status
Nick Dedekind (community)		2017-01-10	Approve on 2017-01-11
Unity8 CI Bot (community)	continuous-integration		Approve on 2017-01-10
Review via email: mp+314458@code.launchpad.net