← Back to branch summary

~vanvugt/mir/heresy

~vanvugt/mir/heresy

« back to all changes in this revision

Viewing changes to include/server/mir/scene/surface.h

Committer: Daniel van Vugt
Date: 2015-06-03 07:35:16 UTC
mfrom: (2600.2.13 development-branch)
Revision ID: daniel.van.vugt@canonical.com-20150603073516-av54iqy9ngrkrf2t

Merge latest trunk

files removed:
include/client/mir_toolkit/mir_client_library_drm.h

include/server/mir/scene/surface_buffer_access.h

tests/integration-tests/test_drm_auth_magic.cpp

files renamed:
debian/libmirclient8.install => debian/libmirclient9.install

debian/libmircommon4.install => debian/libmircommon5.install

files modified:
debian/changelog

debian/control

include/client/mir_toolkit/mir_connection.h

include/client/mir_toolkit/mir_screencast.h

include/client/mir_toolkit/mir_surface.h

include/server/mir/scene/surface.h

src/client/CMakeLists.txt

src/client/mir_connection.h

src/client/mir_connection_api.cpp

src/client/mir_screencast_api.cpp

src/client/mir_surface_api.cpp

src/client/symbols-debug.map

src/client/symbols.map

src/common/CMakeLists.txt

src/common/symbols.map

src/include/platform/mir/options/default_configuration.h

src/platform/options/default_configuration.cpp

src/platforms/android/server/android_alloc_adaptor.cpp

src/platforms/android/server/android_alloc_adaptor.h

src/platforms/android/server/android_buffer_allocator.cpp

src/platforms/android/server/android_graphic_buffer_allocator.h

src/platforms/android/server/device_quirks.cpp

src/platforms/android/server/device_quirks.h

src/platforms/android/server/hal_component_factory.cpp

src/platforms/android/server/hal_component_factory.h

src/platforms/android/server/platform.cpp

src/platforms/android/server/platform.h

src/server/scene/application_session.cpp

src/server/scene/basic_surface.cpp

src/server/scene/basic_surface.h

src/server/scene/snapshot_strategy.h

src/server/scene/threaded_snapshot_strategy.cpp

src/server/scene/threaded_snapshot_strategy.h

src/server/server.cpp

src/server/symbols.map

tests/acceptance-tests/test_client_library.cpp

tests/client-language/c99.c

tests/include/mir_test_doubles/null_snapshot_strategy.h

tests/integration-tests/CMakeLists.txt

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

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

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

tests/mir_test_framework/command_line_server_configuration.cpp

tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp

tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp

tests/unit-tests/graphics/android/test_device_detection.cpp

tests/unit-tests/graphics/android/test_output_builder.cpp

tests/unit-tests/graphics/android/test_platform.cpp

tests/unit-tests/scene/test_application_session.cpp

tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp

Show diffs side-by-side

added added

removed removed

include/server/mir/scene/surface.h

21

21

22

22

#include "mir/graphics/renderable.h"

23

23

#include "mir/input/surface.h"

24

#include "mir/scene/surface_buffer_access.h"

25

24

#include "mir/frontend/surface.h"

26

25

27

26

#include <vector>

39

38

40

39

class Surface :

41

40

public input::Surface,

42

public frontend::Surface,

43

public SurfaceBufferAccess

41

public frontend::Surface

44

42

{

45

43

public:

46

44

// resolve ambiguous member function names

Older »