← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to tests/mir_test_framework/stubbed_graphics_platform.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mir_test_framework/stubbed_graphics_platform.cpp
316
316
    std::shared_ptr<mg::NestedContext> const& context)
317
317
{
318
318
    auto graphics_platform = the_graphics_platform.lock();
 
319
    if (!graphics_platform)
 
320
    {
 
321
        static std::vector<geom::Rectangle> const default_display_rects{geom::Rectangle{{0,0},{1600,1600}}};
 
322
        the_graphics_platform = graphics_platform = create_stub_platform(default_display_rects);
 
323
    }
319
324
    return std::make_shared<GuestPlatformAdapter>(context, graphics_platform);
320
325
}
321
326