~mir-team/mir/development-branch

« back to all changes in this revision

Viewing changes to tests/mir_test_framework/stubbed_server_configuration.cpp

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
17
17
 */
18
18
 
 
19
#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
 
20
 
19
21
#include "mir_test_framework/stubbed_server_configuration.h"
20
22
#include "mir_test_framework/command_line_server_configuration.h"
21
23
 
22
 
#include "stubbed_graphics_platform.h"
 
24
#include "mir_test_framework/stub_server_platform_factory.h"
23
25
 
24
26
#include "mir/options/default_configuration.h"
25
27
#include "mir/graphics/cursor.h"
92
94
{
93
95
    if (!graphics_platform)
94
96
    {
95
 
        graphics_platform = std::make_shared<StubGraphicPlatform>(display_rects);
 
97
        graphics_platform = mtf::make_stubbed_server_graphics_platform(display_rects);
96
98
    }
97
99
 
98
100
    return graphics_platform;