~kdub/mir/fix-1301040

Viewing changes to include/test/mir_test_doubles/mock_surface_factory.h

Committer: Tarmac
Author(s): Alan Griffiths
Date: 2014-04-01 17:40:49 UTC
mfrom: (1513.3.10 mir1)
Revision ID: tarmac-20140401174049-vj1jmakptw9v31qg

scene: Simplify BasicSurface creation by separating out an initial cut of SurfaceObserver.

Approved by Andreas Pokorny, Alexandros Frantzis, Gerry Boland, PS Jenkins bot.

files added:
include/server/mir/scene/surface_event_source.h

include/server/mir/scene/surface_observer.h

src/server/scene/surface_event_source.cpp

files modified:
examples/render_surfaces.cpp

include/server/mir/scene/surface.h

include/server/mir/scene/surface_coordinator.h

include/server/mir/scene/surface_factory.h

include/server/mir/shell/surface_factory.h

include/test/mir_test_doubles/mock_surface.h

include/test/mir_test_doubles/mock_surface_factory.h

src/server/scene/CMakeLists.txt

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/surface_allocator.cpp

src/server/scene/surface_allocator.h

src/server/scene/surface_controller.cpp

src/server/scene/surface_controller.h

src/server/shell/organising_surface_factory.cpp

src/server/shell/organising_surface_factory.h

tests/acceptance-tests/test_client_input.cpp

tests/integration-tests/graphics/android/test_internal_client.cpp

tests/integration-tests/test_session_manager.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_basic_surface.cpp

tests/unit-tests/scene/test_session_manager.cpp

tests/unit-tests/scene/test_surface.cpp

tests/unit-tests/scene/test_surface_controller.cpp

tests/unit-tests/scene/test_surface_impl.cpp

tests/unit-tests/scene/test_surface_stack.cpp

tests/unit-tests/shell/test_organising_surface_factory.cpp

Show diffs side-by-side

added added

removed removed

include/test/mir_test_doubles/mock_surface_factory.h

struct MockSurfaceFactory : public shell::SurfaceFactory

{

MOCK_METHOD4(create_surface, std::shared_ptr<shell::Surface>(

MOCK_METHOD3(create_surface, std::shared_ptr<shell::Surface>(

shell::Session*,

const shell::SurfaceCreationParameters&,

frontend::SurfaceId,

std::shared_ptr<frontend::EventSink> const&));

std::shared_ptr<scene::SurfaceObserver> const&));

void destroy_surface(std::shared_ptr<shell::Surface> const& /*surface*/) override {}

};

Older »