← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to tests/integration-tests/test_surfaceloop.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration-tests/test_surfaceloop.cpp
42
42
namespace mc = mir::compositor;
43
43
namespace mg = mir::graphics;
44
44
namespace geom = mir::geometry;
 
45
namespace mf = mir::frontend;
45
46
namespace mtf = mir_test_framework;
46
47
namespace mtd = mir::test::doubles;
47
48
 
140
141
    }
141
142
    void pause() {}
142
143
    void resume() {}
 
144
    std::weak_ptr<mg::Cursor> the_cursor() { return {}; }
143
145
};
144
146
 
145
147
struct SurfaceSync
354
356
            return std::make_shared<mg::PlatformIPCPackage>();
355
357
        }
356
358
 
357
 
        EGLNativeDisplayType shell_egl_display()
 
359
        std::shared_ptr<mg::InternalClient> create_internal_client(std::shared_ptr<mf::Surface> const&)
358
360
        {
359
 
            return static_cast<EGLNativeDisplayType>(0);
360
 
        }
 
361
            return std::shared_ptr<mg::InternalClient>();   
 
362
        } 
361
363
    };
362
364
 
363
365
    std::shared_ptr<mg::Platform> the_graphics_platform()
486
488
            return std::make_shared<mg::PlatformIPCPackage>();
487
489
        }
488
490
 
489
 
        EGLNativeDisplayType shell_egl_display()
 
491
        std::shared_ptr<mg::InternalClient> create_internal_client(std::shared_ptr<mf::Surface> const&)
490
492
        {
491
 
            return (EGLNativeDisplayType) 0;
 
493
            return std::shared_ptr<mg::InternalClient>();   
492
494
        }
493
495
    };
494
496