← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/unit-tests/scene/test_surface_stack.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_surface_stack.cpp
127
127
        stub_surface1 = std::make_shared<ms::BasicSurface>(
128
128
            std::string("stub"),
129
129
            geom::Rectangle{{},{}},
 
130
            mir_pointer_unconfined,
130
131
            false,
131
132
            std::list<ms::StreamInfo> { { stub_buffer_stream1, {}, {} } },
132
133
            std::shared_ptr<mir::input::InputChannel>(),
137
138
        stub_surface2 = std::make_shared<ms::BasicSurface>(
138
139
            std::string("stub"),
139
140
            geom::Rectangle{{},{}},
 
141
            mir_pointer_unconfined,
140
142
            false,
141
143
            std::list<ms::StreamInfo> { { stub_buffer_stream2, {}, {} } },
142
144
            std::shared_ptr<mir::input::InputChannel>(),
148
150
        stub_surface3 = std::make_shared<ms::BasicSurface>(
149
151
            std::string("stub"),
150
152
            geom::Rectangle{{},{}},
 
153
            mir_pointer_unconfined,
151
154
            false,
152
155
            std::list<ms::StreamInfo> { { stub_buffer_stream3, {}, {} } },
153
156
            std::shared_ptr<mir::input::InputChannel>(),
159
162
        invisible_stub_surface = std::make_shared<ms::BasicSurface>(
160
163
            std::string("stub"),
161
164
            geom::Rectangle{{},{}},
 
165
            mir_pointer_unconfined,
162
166
            false,
163
167
            std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
164
168
            std::shared_ptr<mir::input::InputChannel>(),
274
278
    auto surface = std::make_shared<ms::BasicSurface>(
275
279
        std::string("Mary had a little lamb"),
276
280
        geom::Rectangle{{},{}},
 
281
        mir_pointer_unconfined,
277
282
        false,
278
283
        std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
279
284
        std::shared_ptr<mir::input::InputChannel>(),
303
308
    auto surface = std::make_shared<ms::BasicSurface>(
304
309
        std::string("username@hostname: /"),
305
310
        geom::Rectangle{{},{}},
 
311
        mir_pointer_unconfined,
306
312
        false,
307
313
        std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
308
314
        std::shared_ptr<mir::input::InputChannel>(),
346
352
    auto surface = std::make_shared<ms::BasicSurface>(
347
353
        std::string("stub"),
348
354
        geom::Rectangle{{},{}},
 
355
        mir_pointer_unconfined,
349
356
        false,
350
357
        std::list<ms::StreamInfo> { { stream, {}, {} } },
351
358
        std::shared_ptr<mir::input::InputChannel>(),
383
390
    auto surface = std::make_shared<ms::BasicSurface>(
384
391
        std::string("stub"),
385
392
        geom::Rectangle{{},{}},
 
393
        mir_pointer_unconfined,
386
394
        false,
387
395
        std::list<ms::StreamInfo> { { stream, {}, {} } },
388
396
        std::shared_ptr<mir::input::InputChannel>(),
417
425
    auto surface = std::make_shared<ms::BasicSurface>(
418
426
        std::string("stub"),
419
427
        geom::Rectangle{{},{}},
 
428
        mir_pointer_unconfined,
420
429
        false,
421
430
        std::list<ms::StreamInfo> { { stream, {}, {} } },
422
431
        std::shared_ptr<mir::input::InputChannel>(),
531
540
        auto const surface = std::make_shared<ms::BasicSurface>(
532
541
            std::string("stub"),
533
542
            geom::Rectangle{geom::Point{3 * i, 4 * i},geom::Size{1 * i, 2 * i}},
 
543
            mir_pointer_unconfined,
534
544
            true,
535
545
            std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
536
546
            std::shared_ptr<mir::input::InputChannel>(),
716
726
        auto const surface = std::make_shared<ms::BasicSurface>(
717
727
            std::string("stub"),
718
728
            geom::Rectangle{geom::Point{3 * i, 4 * i},geom::Size{1 * i, 2 * i}},
 
729
            mir_pointer_unconfined,
719
730
            true,
720
731
            std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
721
732
            std::shared_ptr<mir::input::InputChannel>(),
749
760
    auto const surface = std::make_shared<ms::BasicSurface>(
750
761
        std::string("stub"),
751
762
        geom::Rectangle{geom::Point{3, 4},geom::Size{1, 2}},
 
763
        mir_pointer_unconfined,
752
764
        true,
753
765
        std::list<ms::StreamInfo> { { mock_stream, {}, {} } },
754
766
        std::shared_ptr<mir::input::InputChannel>(),
779
791
    auto const surface = std::make_shared<ms::BasicSurface>(
780
792
        std::string("stub"),
781
793
        geom::Rectangle{geom::Point{3, 4},geom::Size{1, 2}},
 
794
        mir_pointer_unconfined,
782
795
        true,
783
796
        std::list<ms::StreamInfo> { { mock_stream, {}, {} } },
784
797
        std::shared_ptr<mir::input::InputChannel>(),
802
815
        ms::BasicSurface(
803
816
            {},
804
817
            {{},{}},
 
818
            mir_pointer_unconfined,
805
819
            true,
806
820
            std::list<ms::StreamInfo> { { std::make_shared<mtd::StubBufferStream>(), {}, {} } },
807
821
            {},