← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/unit-tests/scene/test_basic_surface.cpp

  • Committer: Daniel van Vugt
  • Date: 2016-07-18 07:38:38 UTC
  • mfrom: (3595 development-branch)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: daniel.van.vugt@canonical.com-20160718073838-tclt9c441h505wck
Merge latest trunk.  No conflicts in 7+ weeks?!

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unit-tests/scene/test_basic_surface.cpp
93
93
    ms::BasicSurface surface{
94
94
        name,
95
95
        rect,
 
96
        mir_pointer_unconfined,
96
97
        false,
97
98
        streams,
98
99
        std::shared_ptr<mi::InputChannel>(),
121
122
    for (auto& surface : surfaces)
122
123
    {
123
124
        surface = std::make_unique<ms::BasicSurface>(
124
 
                name, rect, false, 
 
125
                name, rect, mir_pointer_unconfined, false, 
125
126
                std::list<ms::StreamInfo> {
126
127
                    { std::make_shared<testing::NiceMock<mtd::MockBufferStream>>(), {}, {} } },
127
128
                std::shared_ptr<mi::InputChannel>(), stub_input_sender,
142
143
    for (auto& surface : surfaces)
143
144
    {
144
145
        surface = std::make_unique<ms::BasicSurface>(
145
 
                name, rect, false, streams,
 
146
                name, rect, mir_pointer_unconfined, false, streams,
146
147
                std::shared_ptr<mi::InputChannel>(), stub_input_sender,
147
148
                std::shared_ptr<mg::CursorImage>(), report);
148
149
 
265
266
    ms::BasicSurface surface{
266
267
        name,
267
268
        rect,
 
269
        mir_pointer_unconfined,
268
270
        false,
269
271
        streams,
270
272
        std::shared_ptr<mi::InputChannel>(),
305
307
    ms::BasicSurface surface{
306
308
        name,
307
309
        geom::Rectangle{pt, one_by_one},
 
310
        mir_pointer_unconfined,
308
311
        false,
309
312
        streams,
310
313
        std::shared_ptr<mi::InputChannel>(),
346
349
    ms::BasicSurface surface{
347
350
        name,
348
351
        geom::Rectangle{{0,0}, {100,100}},
 
352
        mir_pointer_unconfined,
349
353
        false,
350
354
        streams,
351
355
        std::shared_ptr<mi::InputChannel>(),
486
490
        name,
487
491
        geom::Rectangle{{0,0}, {100,100}},
488
492
        parent,
 
493
        mir_pointer_unconfined,
489
494
        false,
490
495
        streams,
491
496
        std::shared_ptr<mi::InputChannel>(),
673
678
    ms::BasicSurface surface{
674
679
        name,
675
680
        rect,
 
681
        mir_pointer_unconfined,
676
682
        false,
677
683
        streams,
678
684
        std::shared_ptr<mi::InputChannel>(),