Mir

Merge lp:~andreas-pokorny/mir/expose-client-platform-headers into lp:mir

  1. expose-client-platform-headers
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 4167
Proposed branch: lp:~andreas-pokorny/mir/expose-client-platform-headers
Merge into: lp:mir
Diff against target: 938 lines (+97/-95)
64 files modified
include/client/mir_toolkit/extensions/hardware_buffer_stream.h (+4/-4)
include/test/mir/test/doubles/mock_client_buffer.h (+1/-1)
include/test/mir/test/doubles/mock_client_context.h (+1/-1)
include/test/mir/test/doubles/mock_egl_native_surface.h (+1/-1)
src/client/CMakeLists.txt (+1/-0)
src/client/buffer.cpp (+1/-1)
src/client/buffer_factory.cpp (+1/-1)
src/client/buffer_stream.cpp (+1/-1)
src/client/buffer_stream.h (+2/-2)
src/client/buffer_vault.cpp (+2/-2)
src/client/default_connection_configuration.cpp (+1/-1)
src/client/mir_buffer_api.cpp (+1/-2)
src/client/mir_buffer_stream_api.cpp (+1/-1)
src/client/mir_connection.cpp (+2/-2)
src/client/mir_connection.h (+2/-2)
src/client/mir_surface.cpp (+1/-1)
src/client/mir_surface.h (+1/-1)
src/client/presentation_chain.cpp (+2/-2)
src/client/probing_client_platform_factory.cpp (+1/-1)
src/client/probing_client_platform_factory.h (+1/-1)
src/client/render_surface.cpp (+1/-1)
src/client/screencast_stream.cpp (+2/-2)
src/client/screencast_stream.h (+2/-2)
src/platforms/CMakeLists.txt (+2/-0)
src/platforms/common/client/mir/CMakeLists.txt (+1/-1)
src/platforms/common/client/mir/aging_buffer.h (+1/-1)
src/platforms/eglstream-kms/client/client_buffer_factory.h (+1/-1)
src/platforms/eglstream-kms/client/client_platform.cpp (+2/-2)
src/platforms/eglstream-kms/client/client_platform.h (+1/-1)
src/platforms/eglstream-kms/client/client_platform_factory.cpp (+3/-3)
src/platforms/mesa/client/client_buffer_factory.h (+1/-1)
src/platforms/mesa/client/client_platform.cpp (+3/-3)
src/platforms/mesa/client/client_platform.h (+1/-1)
src/platforms/mesa/client/client_platform_factory.cpp (+3/-3)
src/platforms/mesa/client/mesa_native_display_container.cpp (+1/-1)
src/platforms/mesa/client/mesa_native_display_container.h (+1/-1)
src/platforms/mesa/client/native_surface.cpp (+1/-1)
src/platforms/mesa/client/native_surface.h (+1/-1)
tests/acceptance-tests/test_client_library_errors.cpp (+3/-3)
tests/include/mir/test/doubles/mock_client_buffer_factory.h (+1/-1)
tests/include/mir/test/doubles/mock_client_platform.h (+2/-2)
tests/include/mir/test/doubles/mock_mir_buffer.h (+1/-1)
tests/include/mir/test/doubles/mock_mir_buffer_stream.h (+1/-1)
tests/include/mir/test/doubles/null_client_buffer.h (+1/-1)
tests/include/mir/test/doubles/stub_client_buffer.h (+1/-1)
tests/include/mir/test/doubles/stub_client_buffer_factory.h (+1/-1)
tests/include/mir/test/doubles/stub_client_platform_factory.h (+1/-1)
tests/include/mir_test_framework/client_platform_factory.h (+1/-1)
tests/include/mir_test_framework/stub_client_platform_factory.h (+2/-2)
tests/mir_test_doubles/mock_egl.cpp (+1/-1)
tests/mir_test_framework/stub_client_platform_factory.cpp (+3/-3)
tests/mir_test_framework/stub_client_platform_module.cpp (+2/-2)
tests/unit-tests/client/test_buffer_vault.cpp (+1/-1)
tests/unit-tests/client/test_client_buffer_stream.cpp (+1/-1)
tests/unit-tests/client/test_client_mir_surface.cpp (+4/-4)
tests/unit-tests/client/test_client_platform.cpp (+3/-3)
tests/unit-tests/client/test_mir_connection.cpp (+3/-3)
tests/unit-tests/client/test_mir_render_surface.cpp (+1/-1)
tests/unit-tests/client/test_mir_screencast.cpp (+2/-2)
tests/unit-tests/client/test_presentation_chain.cpp (+1/-1)
tests/unit-tests/client/test_probing_client_platform_factory.cpp (+1/-1)
tests/unit-tests/client/test_screencast_stream.cpp (+1/-1)
tests/unit-tests/platforms/mesa/client/test_client_platform.cpp (+1/-1)
tests/unit-tests/platforms/mesa/client/test_native_surface.cpp (+1/-1)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/expose-client-platform-headers
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve
Alan Griffiths Approve
Andreas Pokorny (community) Abstain
Daniel van Vugt Pending
Review via email: mp+323717@code.launchpad.net

Commit message

Expose the necessary headers for out of source plaform library builds

* interfaces needed to implement a client platform
* interfaces that appear in the factory interface for a server platform
* common mocks required to test platform libraries

Description of the change

This exposes the previously private headers necessary to implement a graphics driver for mir

To post a comment you must log in.
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

I tested that MP with the code in https://launchpad.net/mir-android-platform

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

This needs consideration alongside the work Kevin was doing to tidy up these interfaces:

    https://code.launchpad.net/~kdub/mir/split-nested/+merge/321458
    https://code.launchpad.net/~kdub/mir/split-mesa/+merge/321058

Would it be useful to complete that work, or should we abandon it?

review: Needs Information
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

We should complete that work too, whatever comes in second needs to rebase.. and I need to apply that rework on the android platform too then.

Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> We should complete that work too, whatever comes in second needs to rebase..
> and I need to apply that rework on the android platform too then.

Actually, it seems to merge cleanly.

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/1300/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/4616/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/1385/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4745
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4734
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4734
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4648/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4648/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4648/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4648/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4648/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Packaging error:

12:31:36 dh_install: usr/include/mirclient/mir/mir_buffer_stream.h exists in debian/tmp but is not installed to anywhere
12:31:36 dh_install: usr/include/mirclient/mir/mir_buffer.h exists in debian/tmp but is not installed to anywhere

review: Needs Fixing
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

should I move include/mirclient/mir/mir_buffer.h to include/mirplatform/mir/? so it ends up in platform-dev?

Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

^

review: Needs Information
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

> should I move include/mirclient/mir/mir_buffer.h to include/mirplatform/mir/?
> so it ends up in platform-dev?

That seems a more sensible place. Really, include/mirclient/mir/ seems the wrong place for anything, but history...

PS
I'm also surprised that individual header files are listed in the package .install.

Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

Ok moved again..

review: Abstain
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

We may want to tidy up further before a release, but this is OK.

review: Approve
Revision history for this message
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'src/include/client/mir_toolkit/extensions/hardware_buffer_stream.h' => 'include/client/mir_toolkit/extensions/hardware_buffer_stream.h'
--- src/include/client/mir_toolkit/extensions/hardware_buffer_stream.h 2017-04-21 03:08:25 +0000
+++ include/client/mir_toolkit/extensions/hardware_buffer_stream.h 2017-05-12 15:59:26 +0000
@@ -1,16 +1,16 @@
1/*1/*
2 * Copyright © 2017 Canonical Ltd.2 * Copyright © 2017 Canonical Ltd.
3 *3 *
4 * This program is free software: you can redistribute it and/or modify it4 * This program is free software: you can redistribute it and/or modify
5 * under the terms of the GNU General Public License version 3,5 * it under the terms of the GNU Lesser General Public License version 3
6 * as published by the Free Software Foundation.6 * as published by the Free Software Foundation.
7 *7 *
8 * This program is distributed in the hope that it will be useful,8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.11 * GNU Lesser General Public License for more details.
12 *12 *
13 * You should have received a copy of the GNU General Public License13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 *15 *
16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
1717
=== added directory 'include/platform/mir/client'
=== renamed file 'src/include/client/mir/client_buffer.h' => 'include/platform/mir/client/client_buffer.h'
=== renamed file 'src/include/client/mir/client_buffer_factory.h' => 'include/platform/mir/client/client_buffer_factory.h'
=== renamed file 'src/include/client/mir/client_context.h' => 'include/platform/mir/client/client_context.h'
=== renamed file 'src/include/client/mir/client_platform.h' => 'include/platform/mir/client/client_platform.h'
=== renamed file 'src/include/client/mir/client_platform_factory.h' => 'include/platform/mir/client/client_platform_factory.h'
=== renamed file 'src/include/client/mir/egl_native_display_container.h' => 'include/platform/mir/client/egl_native_display_container.h'
=== renamed file 'src/include/client/mir/egl_native_surface.h' => 'include/platform/mir/client/egl_native_surface.h'
=== renamed file 'src/include/platform/mir/emergency_cleanup_registry.h' => 'include/platform/mir/emergency_cleanup_registry.h'
=== renamed file 'src/include/platform/mir/graphics/buffer_ipc_message.h' => 'include/platform/mir/graphics/buffer_ipc_message.h'
=== renamed file 'src/include/platform/mir/graphics/display_report.h' => 'include/platform/mir/graphics/display_report.h'
=== renamed file 'src/include/platform/mir/graphics/egl_error.h' => 'include/platform/mir/graphics/egl_error.h'
=== renamed file 'src/include/platform/mir/graphics/egl_extensions.h' => 'include/platform/mir/graphics/egl_extensions.h'
=== renamed file 'src/include/platform/mir/graphics/egl_resources.h' => 'include/platform/mir/graphics/egl_resources.h'
=== renamed file 'src/include/platform/mir/graphics/transformation.h' => 'include/platform/mir/graphics/transformation.h'
=== renamed file 'src/include/client/mir/mir_buffer.h' => 'include/platform/mir/mir_buffer.h'
=== renamed file 'src/include/client/mir/mir_buffer_stream.h' => 'include/platform/mir/mir_buffer_stream.h'
=== renamed file 'src/include/client/mir/mir_render_surface.h' => 'include/platform/mir/mir_render_surface.h'
=== renamed file 'src/include/platform/mir/options/program_option.h' => 'include/platform/mir/options/program_option.h'
=== added directory 'include/platform/mir/renderer'
=== added directory 'include/platform/mir/renderer/sw'
=== renamed file 'include/renderers/sw/mir/renderer/sw/pixel_source.h' => 'include/platform/mir/renderer/sw/pixel_source.h'
=== renamed file 'tests/include/mir/test/doubles/mock_client_buffer.h' => 'include/test/mir/test/doubles/mock_client_buffer.h'
--- tests/include/mir/test/doubles/mock_client_buffer.h 2017-04-28 03:49:54 +0000
+++ include/test/mir/test/doubles/mock_client_buffer.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_H_19#ifndef MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_H_
20#define MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_H_20#define MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_H_
2121
22#include "mir/client_buffer.h"22#include "mir/client/client_buffer.h"
2323
24#include <gtest/gtest.h>24#include <gtest/gtest.h>
25#include <gmock/gmock.h>25#include <gmock/gmock.h>
2626
=== renamed file 'tests/include/mir/test/doubles/mock_client_context.h' => 'include/test/mir/test/doubles/mock_client_context.h'
--- tests/include/mir/test/doubles/mock_client_context.h 2017-04-28 03:49:54 +0000
+++ include/test/mir/test/doubles/mock_client_context.h 2017-05-12 15:59:26 +0000
@@ -20,7 +20,7 @@
20#define MIR_TEST_DOUBLES_MOCK_CLIENT_CONTEXT_H_20#define MIR_TEST_DOUBLES_MOCK_CLIENT_CONTEXT_H_
2121
22#include "mir_toolkit/mir_client_library.h"22#include "mir_toolkit/mir_client_library.h"
23#include "mir/client_context.h"23#include "mir/client/client_context.h"
2424
25#include <gmock/gmock.h>25#include <gmock/gmock.h>
2626
2727
=== renamed file 'tests/include/mir/test/doubles/mock_egl_native_surface.h' => 'include/test/mir/test/doubles/mock_egl_native_surface.h'
--- tests/include/mir/test/doubles/mock_egl_native_surface.h 2017-04-28 03:49:54 +0000
+++ include/test/mir/test/doubles/mock_egl_native_surface.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_MOCK_EGL_NATIVE_SURFACE_H_19#ifndef MIR_TEST_DOUBLES_MOCK_EGL_NATIVE_SURFACE_H_
20#define MIR_TEST_DOUBLES_MOCK_EGL_NATIVE_SURFACE_H_20#define MIR_TEST_DOUBLES_MOCK_EGL_NATIVE_SURFACE_H_
2121
22#include "mir/egl_native_surface.h"22#include "mir/client/egl_native_surface.h"
2323
24#include <gmock/gmock.h>24#include <gmock/gmock.h>
2525
2626
=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt 2017-04-28 03:49:54 +0000
+++ src/client/CMakeLists.txt 2017-05-12 15:59:26 +0000
@@ -25,6 +25,7 @@
25include_directories(25include_directories(
26 ${PROTOBUF_INCLUDE_DIRS}26 ${PROTOBUF_INCLUDE_DIRS}
27 ${CMAKE_CURRENT_BINARY_DIR}27 ${CMAKE_CURRENT_BINARY_DIR}
28 ${PROJECT_SOURCE_DIR}/include/platform
28 ${PROJECT_SOURCE_DIR}/include/client29 ${PROJECT_SOURCE_DIR}/include/client
29 ${PROJECT_SOURCE_DIR}/src/include/client30 ${PROJECT_SOURCE_DIR}/src/include/client
30 ${PROJECT_SOURCE_DIR}/src/include/cookie31 ${PROJECT_SOURCE_DIR}/src/include/cookie
3132
=== modified file 'src/client/buffer.cpp'
--- src/client/buffer.cpp 2017-04-28 03:49:54 +0000
+++ src/client/buffer.cpp 2017-05-12 15:59:26 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17 */17 */
1818
19#include "mir/client_buffer.h"19#include "mir/client/client_buffer.h"
20#include "buffer.h"20#include "buffer.h"
21#include <boost/throw_exception.hpp>21#include <boost/throw_exception.hpp>
2222
2323
=== modified file 'src/client/buffer_factory.cpp'
--- src/client/buffer_factory.cpp 2017-04-28 03:49:54 +0000
+++ src/client/buffer_factory.cpp 2017-05-12 15:59:26 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17 */17 */
1818
19#include "mir/client_buffer_factory.h"19#include "mir/client/client_buffer_factory.h"
20#include "buffer_factory.h"20#include "buffer_factory.h"
21#include "error_buffer.h"21#include "error_buffer.h"
22#include <algorithm>22#include <algorithm>
2323
=== modified file 'src/client/buffer_stream.cpp'
--- src/client/buffer_stream.cpp 2017-05-08 04:12:58 +0000
+++ src/client/buffer_stream.cpp 2017-05-12 15:59:26 +0000
@@ -33,7 +33,7 @@
33#include "connection_surface_map.h"33#include "connection_surface_map.h"
3434
35#include "mir/log.h"35#include "mir/log.h"
36#include "mir/client_platform.h"36#include "mir/client/client_platform.h"
37#include "mir/frontend/client_constants.h"37#include "mir/frontend/client_constants.h"
38#include "mir_toolkit/mir_native_buffer.h"38#include "mir_toolkit/mir_native_buffer.h"
3939
4040
=== modified file 'src/client/buffer_stream.h'
--- src/client/buffer_stream.h 2017-05-08 04:12:58 +0000
+++ src/client/buffer_stream.h 2017-05-12 15:59:26 +0000
@@ -20,8 +20,8 @@
20#define MIR_CLIENT_BUFFER_STREAM_H20#define MIR_CLIENT_BUFFER_STREAM_H
2121
22#include "mir_wait_handle.h"22#include "mir_wait_handle.h"
23#include "mir/egl_native_surface.h"23#include "mir/client/egl_native_surface.h"
24#include "mir/client_buffer.h"24#include "mir/client/client_buffer.h"
25#include "mir/mir_buffer_stream.h"25#include "mir/mir_buffer_stream.h"
26#include "mir/geometry/size.h"26#include "mir/geometry/size.h"
27#include "mir/optional_value.h"27#include "mir/optional_value.h"
2828
=== modified file 'src/client/buffer_vault.cpp'
--- src/client/buffer_vault.cpp 2017-04-28 03:49:54 +0000
+++ src/client/buffer_vault.cpp 2017-05-12 15:59:26 +0000
@@ -16,8 +16,8 @@
16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17 */17 */
1818
19#include "mir/client_buffer_factory.h"19#include "mir/client/client_buffer_factory.h"
20#include "mir/client_buffer.h"20#include "mir/client/client_buffer.h"
21#include "mir/client/surface_map.h"21#include "mir/client/surface_map.h"
22#include "buffer_vault.h"22#include "buffer_vault.h"
23#include "buffer.h"23#include "buffer.h"
2424
=== modified file 'src/client/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp 2017-04-28 03:49:54 +0000
+++ src/client/default_connection_configuration.cpp 2017-05-12 15:59:26 +0000
@@ -33,7 +33,7 @@
33#include "lttng/shared_library_prober_report.h"33#include "lttng/shared_library_prober_report.h"
34#include "connection_surface_map.h"34#include "connection_surface_map.h"
35#include "lifecycle_control.h"35#include "lifecycle_control.h"
36#include "mir/client_platform_factory.h"36#include "mir/client/client_platform_factory.h"
37#include "probing_client_platform_factory.h"37#include "probing_client_platform_factory.h"
38#include "mir_event_distributor.h"38#include "mir_event_distributor.h"
39#include "buffer_factory.h"39#include "buffer_factory.h"
4040
=== modified file 'src/client/mir_buffer_api.cpp'
--- src/client/mir_buffer_api.cpp 2017-04-28 03:49:54 +0000
+++ src/client/mir_buffer_api.cpp 2017-05-12 15:59:26 +0000
@@ -22,11 +22,10 @@
22#include "presentation_chain.h"22#include "presentation_chain.h"
23#include "mir_connection.h"23#include "mir_connection.h"
24#include "buffer.h"24#include "buffer.h"
25#include "mir/client_buffer.h"25#include "mir/client/client_buffer.h"
26#include "mir/require.h"26#include "mir/require.h"
27#include "mir/uncaught.h"27#include "mir/uncaught.h"
28#include "mir/require.h"28#include "mir/require.h"
29#include "mir/client_buffer.h"
30#include <stdexcept>29#include <stdexcept>
31#include <boost/throw_exception.hpp>30#include <boost/throw_exception.hpp>
3231
3332
=== modified file 'src/client/mir_buffer_stream_api.cpp'
--- src/client/mir_buffer_stream_api.cpp 2017-05-08 04:12:58 +0000
+++ src/client/mir_buffer_stream_api.cpp 2017-05-12 15:59:26 +0000
@@ -25,7 +25,7 @@
25#include "render_surface.h"25#include "render_surface.h"
2626
27#include "mir_toolkit/mir_buffer.h"27#include "mir_toolkit/mir_buffer.h"
28#include "mir/client_buffer.h"28#include "mir/client/client_buffer.h"
2929
30#include "mir/uncaught.h"30#include "mir/uncaught.h"
31#include "mir/require.h"31#include "mir/require.h"
3232
=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp 2017-04-28 03:49:54 +0000
+++ src/client/mir_connection.cpp 2017-05-12 15:59:26 +0000
@@ -24,8 +24,8 @@
24#include "mir_protobuf.pb.h"24#include "mir_protobuf.pb.h"
25#include "make_protobuf_object.h"25#include "make_protobuf_object.h"
26#include "mir_toolkit/mir_platform_message.h"26#include "mir_toolkit/mir_platform_message.h"
27#include "mir/client_platform.h"27#include "mir/client/client_platform.h"
28#include "mir/client_platform_factory.h"28#include "mir/client/client_platform_factory.h"
29#include "rpc/mir_basic_rpc_channel.h"29#include "rpc/mir_basic_rpc_channel.h"
30#include "mir/dispatch/dispatchable.h"30#include "mir/dispatch/dispatchable.h"
31#include "mir/dispatch/threaded_dispatcher.h"31#include "mir/dispatch/threaded_dispatcher.h"
3232
=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h 2017-04-28 03:49:54 +0000
+++ src/client/mir_connection.h 2017-05-12 15:59:26 +0000
@@ -28,9 +28,9 @@
28#include "mir_toolkit/extensions/window_coordinate_translation.h"28#include "mir_toolkit/extensions/window_coordinate_translation.h"
29#include "mir_toolkit/extensions/graphics_module.h"29#include "mir_toolkit/extensions/graphics_module.h"
30#include "mir/geometry/size.h"30#include "mir/geometry/size.h"
31#include "mir/client_platform.h"31#include "mir/client/client_platform.h"
32#include "mir/frontend/surface_id.h"32#include "mir/frontend/surface_id.h"
33#include "mir/client_context.h"33#include "mir/client/client_context.h"
34#include "mir_toolkit/mir_client_library.h"34#include "mir_toolkit/mir_client_library.h"
35#include "mir_surface.h"35#include "mir_surface.h"
36#include "display_configuration.h"36#include "display_configuration.h"
3737
=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp 2017-04-28 03:49:54 +0000
+++ src/client/mir_surface.cpp 2017-05-12 15:59:26 +0000
@@ -26,7 +26,7 @@
26#include "mir_toolkit/mir_client_library.h"26#include "mir_toolkit/mir_client_library.h"
27#include "mir_toolkit/mir_blob.h"27#include "mir_toolkit/mir_blob.h"
28#include "mir/frontend/client_constants.h"28#include "mir/frontend/client_constants.h"
29#include "mir/client_buffer.h"29#include "mir/client/client_buffer.h"
30#include "mir/mir_buffer_stream.h"30#include "mir/mir_buffer_stream.h"
31#include "mir/dispatch/threaded_dispatcher.h"31#include "mir/dispatch/threaded_dispatcher.h"
32#include "mir/input/xkb_mapper.h"32#include "mir/input/xkb_mapper.h"
3333
=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h 2017-04-28 03:49:54 +0000
+++ src/client/mir_surface.h 2017-05-12 15:59:26 +0000
@@ -25,7 +25,7 @@
25#include "rpc/mir_display_server.h"25#include "rpc/mir_display_server.h"
26#include "rpc/mir_display_server_debug.h"26#include "rpc/mir_display_server_debug.h"
2727
28#include "mir/client_platform.h"28#include "mir/client/client_platform.h"
29#include "mir/frontend/surface_id.h"29#include "mir/frontend/surface_id.h"
30#include "mir/optional_value.h"30#include "mir/optional_value.h"
31#include "mir/geometry/dimensions.h"31#include "mir/geometry/dimensions.h"
3232
=== modified file 'src/client/presentation_chain.cpp'
--- src/client/presentation_chain.cpp 2017-04-28 03:49:54 +0000
+++ src/client/presentation_chain.cpp 2017-05-12 15:59:26 +0000
@@ -16,8 +16,8 @@
16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17 */17 */
1818
19#include "mir/client_buffer_factory.h"19#include "mir/client/client_buffer_factory.h"
20#include "mir/client_buffer.h"20#include "mir/client/client_buffer.h"
21#include "rpc/mir_display_server.h"21#include "rpc/mir_display_server.h"
22#include "presentation_chain.h"22#include "presentation_chain.h"
23#include "protobuf_to_native_buffer.h"23#include "protobuf_to_native_buffer.h"
2424
=== modified file 'src/client/probing_client_platform_factory.cpp'
--- src/client/probing_client_platform_factory.cpp 2017-04-28 03:49:54 +0000
+++ src/client/probing_client_platform_factory.cpp 2017-05-12 15:59:26 +0000
@@ -1,5 +1,5 @@
1#include "probing_client_platform_factory.h"1#include "probing_client_platform_factory.h"
2#include "mir/client_platform.h"2#include "mir/client/client_platform.h"
3#include "mir/shared_library.h"3#include "mir/shared_library.h"
4#include "mir/shared_library_prober.h"4#include "mir/shared_library_prober.h"
5#include "mir/shared_library_prober_report.h"5#include "mir/shared_library_prober_report.h"
66
=== modified file 'src/client/probing_client_platform_factory.h'
--- src/client/probing_client_platform_factory.h 2017-04-28 03:49:54 +0000
+++ src/client/probing_client_platform_factory.h 2017-05-12 15:59:26 +0000
@@ -3,7 +3,7 @@
33
4#include <vector>4#include <vector>
55
6#include "mir/client_platform_factory.h"6#include "mir/client/client_platform_factory.h"
7#include "mir/shared_library.h"7#include "mir/shared_library.h"
88
9namespace mir9namespace mir
1010
=== modified file 'src/client/render_surface.cpp'
--- src/client/render_surface.cpp 2017-04-28 03:49:54 +0000
+++ src/client/render_surface.cpp 2017-05-12 15:59:26 +0000
@@ -22,7 +22,7 @@
22#include "mir_wait_handle.h"22#include "mir_wait_handle.h"
23#include "rpc/mir_display_server.h"23#include "rpc/mir_display_server.h"
2424
25#include "mir/client_platform.h"25#include "mir/client/client_platform.h"
2626
27#include <boost/throw_exception.hpp>27#include <boost/throw_exception.hpp>
2828
2929
=== modified file 'src/client/screencast_stream.cpp'
--- src/client/screencast_stream.cpp 2017-05-08 04:12:58 +0000
+++ src/client/screencast_stream.cpp 2017-05-12 15:59:26 +0000
@@ -25,8 +25,8 @@
25#include "protobuf_to_native_buffer.h"25#include "protobuf_to_native_buffer.h"
2626
27#include "mir/log.h"27#include "mir/log.h"
28#include "mir/client_platform.h"28#include "mir/client/client_platform.h"
29#include "mir/client_buffer_factory.h"29#include "mir/client/client_buffer_factory.h"
30#include "mir/frontend/client_constants.h"30#include "mir/frontend/client_constants.h"
31#include "mir_toolkit/mir_native_buffer.h"31#include "mir_toolkit/mir_native_buffer.h"
3232
3333
=== modified file 'src/client/screencast_stream.h'
--- src/client/screencast_stream.h 2017-05-08 04:12:58 +0000
+++ src/client/screencast_stream.h 2017-05-12 15:59:26 +0000
@@ -20,8 +20,8 @@
20#define MIR_CLIENT_SCREENCAST_STREAM_H20#define MIR_CLIENT_SCREENCAST_STREAM_H
2121
22#include "mir_wait_handle.h"22#include "mir_wait_handle.h"
23#include "mir/egl_native_surface.h"23#include "mir/client/egl_native_surface.h"
24#include "mir/client_buffer.h"24#include "mir/client/client_buffer.h"
25#include "mir/mir_buffer_stream.h"25#include "mir/mir_buffer_stream.h"
26#include "mir/geometry/size.h"26#include "mir/geometry/size.h"
2727
2828
=== modified file 'src/platforms/CMakeLists.txt'
--- src/platforms/CMakeLists.txt 2017-04-28 03:49:54 +0000
+++ src/platforms/CMakeLists.txt 2017-05-12 15:59:26 +0000
@@ -50,11 +50,13 @@
50set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/common/server/symbols.map)50set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/common/server/symbols.map)
5151
52set(client_common_include_dirs52set(client_common_include_dirs
53 ${PROJECT_SOURCE_DIR}/include/platform
53 ${PROJECT_SOURCE_DIR}/include/client54 ${PROJECT_SOURCE_DIR}/include/client
54 ${CMAKE_CURRENT_SOURCE_DIR}/common/client55 ${CMAKE_CURRENT_SOURCE_DIR}/common/client
55)56)
5657
57# TODO client platform implementations shouldn't depend on private APIs58# TODO client platform implementations shouldn't depend on private APIs
59# - only needed for Hardware Buffer Stream in mesa client
58set(client_common_include_dirs60set(client_common_include_dirs
59 ${client_common_include_dirs}61 ${client_common_include_dirs}
60 ${PROJECT_SOURCE_DIR}/src/include/client62 ${PROJECT_SOURCE_DIR}/src/include/client
6163
=== modified file 'src/platforms/common/client/mir/CMakeLists.txt'
--- src/platforms/common/client/mir/CMakeLists.txt 2017-04-28 03:49:54 +0000
+++ src/platforms/common/client/mir/CMakeLists.txt 2017-05-12 15:59:26 +0000
@@ -1,4 +1,4 @@
1include_directories(${PROJECT_SOURCE_DIR}/src/include/client)1include_directories(${PROJECT_SOURCE_DIR}/include/platform)
2include_directories(${PROJECT_SOURCE_DIR}/include/client)2include_directories(${PROJECT_SOURCE_DIR}/include/client)
33
4add_library(client_platform_common STATIC4add_library(client_platform_common STATIC
55
=== modified file 'src/platforms/common/client/mir/aging_buffer.h'
--- src/platforms/common/client/mir/aging_buffer.h 2017-04-28 03:49:54 +0000
+++ src/platforms/common/client/mir/aging_buffer.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_CLIENT_AGING_BUFFER_H_19#ifndef MIR_CLIENT_AGING_BUFFER_H_
20#define MIR_CLIENT_AGING_BUFFER_H_20#define MIR_CLIENT_AGING_BUFFER_H_
2121
22#include "mir/client_buffer.h"22#include "mir/client/client_buffer.h"
2323
24namespace mir24namespace mir
25{25{
2626
=== modified file 'src/platforms/eglstream-kms/client/client_buffer_factory.h'
--- src/platforms/eglstream-kms/client/client_buffer_factory.h 2017-04-28 03:49:54 +0000
+++ src/platforms/eglstream-kms/client/client_buffer_factory.h 2017-05-12 15:59:26 +0000
@@ -20,7 +20,7 @@
20#ifndef MIR_CLIENT_EGLSTREAM_CLIENT_BUFFER_FACTORY_H_20#ifndef MIR_CLIENT_EGLSTREAM_CLIENT_BUFFER_FACTORY_H_
21#define MIR_CLIENT_EGLSTREAM_CLIENT_BUFFER_FACTORY_H_21#define MIR_CLIENT_EGLSTREAM_CLIENT_BUFFER_FACTORY_H_
2222
23#include "mir/client_buffer_factory.h"23#include "mir/client/client_buffer_factory.h"
2424
25namespace mir25namespace mir
26{26{
2727
=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
--- src/platforms/eglstream-kms/client/client_platform.cpp 2017-04-28 03:49:54 +0000
+++ src/platforms/eglstream-kms/client/client_platform.cpp 2017-05-12 15:59:26 +0000
@@ -19,8 +19,8 @@
19#include "mir_toolkit/mir_client_library.h"19#include "mir_toolkit/mir_client_library.h"
20#include "client_platform.h"20#include "client_platform.h"
21#include "client_buffer_factory.h"21#include "client_buffer_factory.h"
22#include "mir/client_buffer_factory.h"22#include "mir/client/client_buffer_factory.h"
23#include "mir/client_context.h"23#include "mir/client/client_context.h"
24#include "native_buffer.h"24#include "native_buffer.h"
2525
26#include <cstring>26#include <cstring>
2727
=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
--- src/platforms/eglstream-kms/client/client_platform.h 2017-04-28 03:49:54 +0000
+++ src/platforms/eglstream-kms/client/client_platform.h 2017-05-12 15:59:26 +0000
@@ -18,7 +18,7 @@
18#ifndef MIR_CLIENT_EGLSTREAM_CLIENT_PLATFORM_H_18#ifndef MIR_CLIENT_EGLSTREAM_CLIENT_PLATFORM_H_
19#define MIR_CLIENT_EGLSTREAM_CLIENT_PLATFORM_H_19#define MIR_CLIENT_EGLSTREAM_CLIENT_PLATFORM_H_
2020
21#include "mir/client_platform.h"21#include "mir/client/client_platform.h"
2222
23namespace mir23namespace mir
24{24{
2525
=== modified file 'src/platforms/eglstream-kms/client/client_platform_factory.cpp'
--- src/platforms/eglstream-kms/client/client_platform_factory.cpp 2017-04-28 03:49:54 +0000
+++ src/platforms/eglstream-kms/client/client_platform_factory.cpp 2017-05-12 15:59:26 +0000
@@ -16,11 +16,11 @@
16 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>16 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
17 */17 */
1818
19#include "mir/client_platform_factory.h"19#include "mir/client/client_platform_factory.h"
20#include "client_platform.h"20#include "client_platform.h"
21#include "mir_toolkit/client_types.h"21#include "mir_toolkit/client_types.h"
22#include "mir/client_context.h"22#include "mir/client/client_context.h"
23#include "mir/egl_native_display_container.h"23#include "mir/client/egl_native_display_container.h"
24#include "mir/assert_module_entry_point.h"24#include "mir/assert_module_entry_point.h"
25#include "mir/module_deleter.h"25#include "mir/module_deleter.h"
2626
2727
=== modified file 'src/platforms/mesa/client/client_buffer_factory.h'
--- src/platforms/mesa/client/client_buffer_factory.h 2017-04-28 03:49:54 +0000
+++ src/platforms/mesa/client/client_buffer_factory.h 2017-05-12 15:59:26 +0000
@@ -20,7 +20,7 @@
20#ifndef MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_20#ifndef MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_
21#define MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_21#define MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_
2222
23#include "mir/client_buffer_factory.h"23#include "mir/client/client_buffer_factory.h"
2424
25namespace mir25namespace mir
26{26{
2727
=== modified file 'src/platforms/mesa/client/client_platform.cpp'
--- src/platforms/mesa/client/client_platform.cpp 2017-05-03 08:16:12 +0000
+++ src/platforms/mesa/client/client_platform.cpp 2017-05-12 15:59:26 +0000
@@ -21,9 +21,9 @@
21#include "client_buffer_factory.h"21#include "client_buffer_factory.h"
22#include "mesa_native_display_container.h"22#include "mesa_native_display_container.h"
23#include "native_surface.h"23#include "native_surface.h"
24#include "mir/client_buffer_factory.h"24#include "mir/client/client_buffer_factory.h"
25#include "mir/client_context.h"25#include "mir/client/client_context.h"
26#include "mir/client_buffer.h"26#include "mir/client/client_buffer.h"
27#include "mir/mir_render_surface.h"27#include "mir/mir_render_surface.h"
28#include "mir/mir_buffer.h"28#include "mir/mir_buffer.h"
29#include "mir/weak_egl.h"29#include "mir/weak_egl.h"
3030
=== modified file 'src/platforms/mesa/client/client_platform.h'
--- src/platforms/mesa/client/client_platform.h 2017-04-28 03:49:54 +0000
+++ src/platforms/mesa/client/client_platform.h 2017-05-12 15:59:26 +0000
@@ -18,7 +18,7 @@
18#ifndef MIR_CLIENT_MESA_CLIENT_PLATFORM_H_18#ifndef MIR_CLIENT_MESA_CLIENT_PLATFORM_H_
19#define MIR_CLIENT_MESA_CLIENT_PLATFORM_H_19#define MIR_CLIENT_MESA_CLIENT_PLATFORM_H_
2020
21#include "mir/client_platform.h"21#include "mir/client/client_platform.h"
22#include "mir_toolkit/extensions/mesa_drm_auth.h"22#include "mir_toolkit/extensions/mesa_drm_auth.h"
23#include "mir_toolkit/extensions/set_gbm_device.h"23#include "mir_toolkit/extensions/set_gbm_device.h"
24#include "mir_toolkit/extensions/gbm_buffer.h"24#include "mir_toolkit/extensions/gbm_buffer.h"
2525
=== modified file 'src/platforms/mesa/client/client_platform_factory.cpp'
--- src/platforms/mesa/client/client_platform_factory.cpp 2017-04-28 03:49:54 +0000
+++ src/platforms/mesa/client/client_platform_factory.cpp 2017-05-12 15:59:26 +0000
@@ -16,12 +16,12 @@
16 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>16 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
17 */17 */
1818
19#include "mir/client_platform_factory.h"19#include "mir/client/client_platform_factory.h"
20#include "client_platform.h"20#include "client_platform.h"
21#include "mir_toolkit/client_types.h"21#include "mir_toolkit/client_types.h"
22#include "mir/client_context.h"22#include "mir/client/client_context.h"
23#include "buffer_file_ops.h"23#include "buffer_file_ops.h"
24#include "mir/egl_native_display_container.h"24#include "mir/client/egl_native_display_container.h"
25#include "mir/assert_module_entry_point.h"25#include "mir/assert_module_entry_point.h"
26#include "mir/module_deleter.h"26#include "mir/module_deleter.h"
2727
2828
=== modified file 'src/platforms/mesa/client/mesa_native_display_container.cpp'
--- src/platforms/mesa/client/mesa_native_display_container.cpp 2015-02-22 07:46:25 +0000
+++ src/platforms/mesa/client/mesa_native_display_container.cpp 2017-05-12 15:59:26 +0000
@@ -18,7 +18,7 @@
1818
19#include "mesa_native_display_container.h"19#include "mesa_native_display_container.h"
2020
21#include "mir/client_platform.h"21#include "mir/client/client_platform.h"
2222
23#include <cstring>23#include <cstring>
24#include <unordered_set>24#include <unordered_set>
2525
=== modified file 'src/platforms/mesa/client/mesa_native_display_container.h'
--- src/platforms/mesa/client/mesa_native_display_container.h 2015-02-22 07:46:25 +0000
+++ src/platforms/mesa/client/mesa_native_display_container.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_19#ifndef MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_
20#define MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_20#define MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_
2121
22#include "mir/egl_native_display_container.h"22#include "mir/client/egl_native_display_container.h"
2323
24#include "mir_toolkit/client_types.h"24#include "mir_toolkit/client_types.h"
25#include "mir_toolkit/mesa/native_display.h"25#include "mir_toolkit/mesa/native_display.h"
2626
=== modified file 'src/platforms/mesa/client/native_surface.cpp'
--- src/platforms/mesa/client/native_surface.cpp 2017-04-28 03:49:54 +0000
+++ src/platforms/mesa/client/native_surface.cpp 2017-05-12 15:59:26 +0000
@@ -21,7 +21,7 @@
21#include <cstring>21#include <cstring>
2222
23#include "native_buffer.h"23#include "native_buffer.h"
24#include "mir/client_buffer.h"24#include "mir/client/client_buffer.h"
25#include "mir/uncaught.h"25#include "mir/uncaught.h"
2626
27#include "native_surface.h"27#include "native_surface.h"
2828
=== modified file 'src/platforms/mesa/client/native_surface.h'
--- src/platforms/mesa/client/native_surface.h 2017-04-28 03:49:54 +0000
+++ src/platforms/mesa/client/native_surface.h 2017-05-12 15:59:26 +0000
@@ -20,7 +20,7 @@
20#define MIR_CLIENT_MESA_NATIVE_SURFACES_H_20#define MIR_CLIENT_MESA_NATIVE_SURFACES_H_
2121
22#include "mir_toolkit/mesa/native_display.h"22#include "mir_toolkit/mesa/native_display.h"
23#include "mir/egl_native_surface.h"23#include "mir/client/egl_native_surface.h"
2424
25namespace mir25namespace mir
26{26{
2727
=== modified file 'tests/acceptance-tests/test_client_library_errors.cpp'
--- tests/acceptance-tests/test_client_library_errors.cpp 2017-04-28 03:49:54 +0000
+++ tests/acceptance-tests/test_client_library_errors.cpp 2017-05-12 15:59:26 +0000
@@ -22,9 +22,9 @@
22#include "mir_toolkit/mir_screencast.h"22#include "mir_toolkit/mir_screencast.h"
23#include "mir_toolkit/debug/surface.h"23#include "mir_toolkit/debug/surface.h"
2424
25#include "src/include/client/mir/client_platform_factory.h"25#include "mir/client/client_platform_factory.h"
26#include "src/include/client/mir/client_platform.h"26#include "mir/client/client_platform.h"
27#include "src/include/client/mir/client_buffer_factory.h"27#include "mir/client/client_buffer_factory.h"
2828
29#include "mir/test/validity_matchers.h"29#include "mir/test/validity_matchers.h"
30#include "mir/test/death.h"30#include "mir/test/death.h"
3131
=== modified file 'tests/include/mir/test/doubles/mock_client_buffer_factory.h'
--- tests/include/mir/test/doubles/mock_client_buffer_factory.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir/test/doubles/mock_client_buffer_factory.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_FACTORY_H_19#ifndef MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_FACTORY_H_
20#define MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_FACTORY_H_20#define MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_FACTORY_H_
2121
22#include "mir/client_buffer_factory.h"22#include "mir/client/client_buffer_factory.h"
2323
24#include <gtest/gtest.h>24#include <gtest/gtest.h>
25#include <gmock/gmock.h>25#include <gmock/gmock.h>
2626
=== modified file 'tests/include/mir/test/doubles/mock_client_platform.h'
--- tests/include/mir/test/doubles/mock_client_platform.h 2017-04-13 07:00:27 +0000
+++ tests/include/mir/test/doubles/mock_client_platform.h 2017-05-12 15:59:26 +0000
@@ -20,8 +20,8 @@
20#define MIR_TEST_DOUBLES_MOCK_CLIENT_PLATFOM_H_20#define MIR_TEST_DOUBLES_MOCK_CLIENT_PLATFOM_H_
2121
22#include "stub_client_buffer_factory.h"22#include "stub_client_buffer_factory.h"
23#include "mir/client_platform.h"23#include "mir/client/client_platform.h"
24#include "mir/client_platform_factory.h"24#include "mir/client/client_platform_factory.h"
25#include <gmock/gmock.h>25#include <gmock/gmock.h>
2626
27namespace mir27namespace mir
2828
=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer.h'
--- tests/include/mir/test/doubles/mock_mir_buffer.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir/test/doubles/mock_mir_buffer.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_H_19#ifndef MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_H_
20#define MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_H_20#define MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_H_
2121
22#include "src/include/client/mir/mir_buffer.h"22#include "mir/mir_buffer.h"
2323
24#include <gtest/gtest.h>24#include <gtest/gtest.h>
25#include <gmock/gmock.h>25#include <gmock/gmock.h>
2626
=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer_stream.h'
--- tests/include/mir/test/doubles/mock_mir_buffer_stream.h 2017-05-08 04:12:58 +0000
+++ tests/include/mir/test/doubles/mock_mir_buffer_stream.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_STREAM_H_19#ifndef MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_STREAM_H_
20#define MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_STREAM_H_20#define MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_STREAM_H_
2121
22#include "src/include/client/mir/mir_buffer_stream.h"22#include "mir/mir_buffer_stream.h"
2323
24#include <gmock/gmock.h>24#include <gmock/gmock.h>
2525
2626
=== modified file 'tests/include/mir/test/doubles/null_client_buffer.h'
--- tests/include/mir/test/doubles/null_client_buffer.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir/test/doubles/null_client_buffer.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_NULL_CLIENT_BUFFER_H_19#ifndef MIR_TEST_DOUBLES_NULL_CLIENT_BUFFER_H_
20#define MIR_TEST_DOUBLES_NULL_CLIENT_BUFFER_H_20#define MIR_TEST_DOUBLES_NULL_CLIENT_BUFFER_H_
2121
22#include "mir/client_buffer.h"22#include "mir/client/client_buffer.h"
2323
24namespace mir24namespace mir
25{25{
2626
=== modified file 'tests/include/mir/test/doubles/stub_client_buffer.h'
--- tests/include/mir/test/doubles/stub_client_buffer.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir/test/doubles/stub_client_buffer.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_H_19#ifndef MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_H_
20#define MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_H_20#define MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_H_
2121
22#include "src/include/client/mir/client_buffer.h"22#include "mir/client/client_buffer.h"
23#include <unistd.h>23#include <unistd.h>
2424
25namespace mir25namespace mir
2626
=== modified file 'tests/include/mir/test/doubles/stub_client_buffer_factory.h'
--- tests/include/mir/test/doubles/stub_client_buffer_factory.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir/test/doubles/stub_client_buffer_factory.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_FACTORY_H_19#ifndef MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_FACTORY_H_
20#define MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_FACTORY_H_20#define MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_FACTORY_H_
2121
22#include "src/include/client/mir/client_buffer_factory.h"22#include "mir/client/client_buffer_factory.h"
23#include "stub_client_buffer.h"23#include "stub_client_buffer.h"
2424
25namespace mir25namespace mir
2626
=== modified file 'tests/include/mir/test/doubles/stub_client_platform_factory.h'
--- tests/include/mir/test/doubles/stub_client_platform_factory.h 2017-02-14 15:09:24 +0000
+++ tests/include/mir/test/doubles/stub_client_platform_factory.h 2017-05-12 15:59:26 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_STUB_CLIENT_PLATFORM_FACTORY_H_19#ifndef MIR_TEST_DOUBLES_STUB_CLIENT_PLATFORM_FACTORY_H_
20#define MIR_TEST_DOUBLES_STUB_CLIENT_PLATFORM_FACTORY_H_20#define MIR_TEST_DOUBLES_STUB_CLIENT_PLATFORM_FACTORY_H_
2121
22#include "mir/client_platform_factory.h"22#include "mir/client/client_platform_factory.h"
2323
24namespace mir24namespace mir
25{25{
2626
=== modified file 'tests/include/mir_test_framework/client_platform_factory.h'
--- tests/include/mir_test_framework/client_platform_factory.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir_test_framework/client_platform_factory.h 2017-05-12 15:59:26 +0000
@@ -21,7 +21,7 @@
2121
2222
23#include "mir/shared_library.h"23#include "mir/shared_library.h"
24#include "mir/client_platform_factory.h"24#include "mir/client/client_platform_factory.h"
25#include "mir_test_framework/executable_path.h"25#include "mir_test_framework/executable_path.h"
26#include "mir/test/doubles/mock_client_context.h"26#include "mir/test/doubles/mock_client_context.h"
2727
2828
=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
--- tests/include/mir_test_framework/stub_client_platform_factory.h 2017-04-28 03:49:54 +0000
+++ tests/include/mir_test_framework/stub_client_platform_factory.h 2017-05-12 15:59:26 +0000
@@ -19,8 +19,8 @@
19#ifndef MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_19#ifndef MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
20#define MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_20#define MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
2121
22#include "mir/client_platform_factory.h"22#include "mir/client/client_platform_factory.h"
23#include "mir/client_platform.h"23#include "mir/client/client_platform.h"
24#include "mir_toolkit/mir_native_buffer.h"24#include "mir_toolkit/mir_native_buffer.h"
25#include "mir_toolkit/extensions/fenced_buffers.h"25#include "mir_toolkit/extensions/fenced_buffers.h"
26#include "mir_toolkit/extensions/gbm_buffer.h"26#include "mir_toolkit/extensions/gbm_buffer.h"
2727
=== modified file 'tests/mir_test_doubles/mock_egl.cpp'
--- tests/mir_test_doubles/mock_egl.cpp 2017-04-28 03:49:54 +0000
+++ tests/mir_test_doubles/mock_egl.cpp 2017-05-12 15:59:26 +0000
@@ -18,7 +18,7 @@
18 * Kevin DuBois <kevin.dubois@canonical.com>18 * Kevin DuBois <kevin.dubois@canonical.com>
19 */19 */
2020
21#include "mir/egl_native_surface.h"21#include "mir/client/egl_native_surface.h"
2222
23#include "mir/test/doubles/mock_egl.h"23#include "mir/test/doubles/mock_egl.h"
24#include <gtest/gtest.h>24#include <gtest/gtest.h>
2525
=== modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
--- tests/mir_test_framework/stub_client_platform_factory.cpp 2017-04-28 03:49:54 +0000
+++ tests/mir_test_framework/stub_client_platform_factory.cpp 2017-05-12 15:59:26 +0000
@@ -18,9 +18,9 @@
1818
19#include "mir_test_framework/stub_client_platform_factory.h"19#include "mir_test_framework/stub_client_platform_factory.h"
20#include "mir/test/doubles/stub_client_buffer_factory.h"20#include "mir/test/doubles/stub_client_buffer_factory.h"
21#include "mir/client_buffer_factory.h"21#include "mir/client/client_buffer_factory.h"
22#include "mir/client_buffer.h"22#include "mir/client/client_buffer.h"
23#include "mir/client_context.h"23#include "mir/client/client_context.h"
24#include "mir_test_framework/stub_platform_native_buffer.h"24#include "mir_test_framework/stub_platform_native_buffer.h"
25#include "mir_test_framework/stub_platform_extension.h"25#include "mir_test_framework/stub_platform_extension.h"
26#include "mir_toolkit/mir_native_buffer.h"26#include "mir_toolkit/mir_native_buffer.h"
2727
=== modified file 'tests/mir_test_framework/stub_client_platform_module.cpp'
--- tests/mir_test_framework/stub_client_platform_module.cpp 2017-04-28 03:49:54 +0000
+++ tests/mir_test_framework/stub_client_platform_module.cpp 2017-05-12 15:59:26 +0000
@@ -16,8 +16,8 @@
16 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>>16 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>>
17 */17 */
1818
19#include "src/include/client/mir/client_platform_factory.h"19#include "mir/client/client_platform_factory.h"
20#include "src/include/client/mir/client_context.h"20#include "mir/client/client_context.h"
2121
22#include "mir_test_framework/stub_client_platform_factory.h"22#include "mir_test_framework/stub_client_platform_factory.h"
23#include "mir_test_framework/stub_platform_helpers.h"23#include "mir_test_framework/stub_platform_helpers.h"
2424
=== modified file 'tests/unit-tests/client/test_buffer_vault.cpp'
--- tests/unit-tests/client/test_buffer_vault.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_buffer_vault.cpp 2017-05-12 15:59:26 +0000
@@ -20,7 +20,7 @@
20#include "src/client/buffer_vault.h"20#include "src/client/buffer_vault.h"
21#include "src/client/buffer_factory.h"21#include "src/client/buffer_factory.h"
22#include "src/client/connection_surface_map.h"22#include "src/client/connection_surface_map.h"
23#include "mir/client_buffer_factory.h"23#include "mir/client/client_buffer_factory.h"
24#include "mir/aging_buffer.h"24#include "mir/aging_buffer.h"
25#include "mir_toolkit/common.h"25#include "mir_toolkit/common.h"
26#include "mir/geometry/size.h"26#include "mir/geometry/size.h"
2727
=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
--- tests/unit-tests/client/test_client_buffer_stream.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_client_buffer_stream.cpp 2017-05-12 15:59:26 +0000
@@ -23,7 +23,7 @@
23#include "src/client/buffer_factory.h"23#include "src/client/buffer_factory.h"
24#include "src/client/protobuf_to_native_buffer.h"24#include "src/client/protobuf_to_native_buffer.h"
2525
26#include "mir/client_platform.h"26#include "mir/client/client_platform.h"
2727
28#include "mir/test/doubles/null_client_buffer.h"28#include "mir/test/doubles/null_client_buffer.h"
29#include "mir/test/doubles/mock_client_buffer_factory.h"29#include "mir/test/doubles/mock_client_buffer_factory.h"
3030
=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp 2017-05-12 15:59:26 +0000
@@ -22,10 +22,10 @@
2222
23#include "mir_protobuf.pb.h"23#include "mir_protobuf.pb.h"
24#include "mir_toolkit/mir_client_library.h"24#include "mir_toolkit/mir_client_library.h"
25#include "mir/client_buffer.h"25#include "mir/client/client_buffer.h"
26#include "mir/client_buffer_factory.h"26#include "mir/client/client_buffer_factory.h"
27#include "mir/client_platform.h"27#include "mir/client/client_platform.h"
28#include "mir/client_platform_factory.h"28#include "mir/client/client_platform_factory.h"
29#include "src/client/mir_surface.h"29#include "src/client/mir_surface.h"
30#include "src/client/mir_connection.h"30#include "src/client/mir_connection.h"
31#include "src/client/default_connection_configuration.h"31#include "src/client/default_connection_configuration.h"
3232
=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_client_platform.cpp 2017-05-12 15:59:26 +0000
@@ -16,15 +16,15 @@
16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>16 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
17 */17 */
1818
19#include "mir/client_platform.h"19#include "mir/client/client_platform.h"
20#include "mir/egl_native_surface.h"20#include "mir/client/egl_native_surface.h"
2121
22#include "mir/test/doubles/mock_client_context.h"22#include "mir/test/doubles/mock_client_context.h"
23#include "mir/test/doubles/mock_egl_native_surface.h"23#include "mir/test/doubles/mock_egl_native_surface.h"
24#include "mir_test_framework/executable_path.h"24#include "mir_test_framework/executable_path.h"
25#include "mir_test_framework/stub_platform_helpers.h"25#include "mir_test_framework/stub_platform_helpers.h"
2626
27#include "mir/client_platform_factory.h"27#include "mir/client/client_platform_factory.h"
2828
29#include "mir/shared_library.h"29#include "mir/shared_library.h"
3030
3131
=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp 2017-05-12 15:59:26 +0000
@@ -25,9 +25,9 @@
25#include "src/client/connection_surface_map.h"25#include "src/client/connection_surface_map.h"
26#include "src/client/presentation_chain.h"26#include "src/client/presentation_chain.h"
2727
28#include "mir/client_platform.h"28#include "mir/client/client_platform.h"
29#include "mir/client_platform_factory.h"29#include "mir/client/client_platform_factory.h"
30#include "mir/client_buffer_factory.h"30#include "mir/client/client_buffer_factory.h"
31#include "mir/raii.h"31#include "mir/raii.h"
32#include "mir/dispatch/dispatchable.h"32#include "mir/dispatch/dispatchable.h"
33#include "mir/events/event_builders.h"33#include "mir/events/event_builders.h"
3434
=== modified file 'tests/unit-tests/client/test_mir_render_surface.cpp'
--- tests/unit-tests/client/test_mir_render_surface.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_mir_render_surface.cpp 2017-05-12 15:59:26 +0000
@@ -23,7 +23,7 @@
23#include "src/client/connection_surface_map.h"23#include "src/client/connection_surface_map.h"
24#include "src/client/mir_wait_handle.h"24#include "src/client/mir_wait_handle.h"
2525
26#include "mir/client_platform_factory.h"26#include "mir/client/client_platform_factory.h"
27#include "mir/dispatch/dispatchable.h"27#include "mir/dispatch/dispatchable.h"
2828
29#include "mir/test/fake_shared.h"29#include "mir/test/fake_shared.h"
3030
=== modified file 'tests/unit-tests/client/test_mir_screencast.cpp'
--- tests/unit-tests/client/test_mir_screencast.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_mir_screencast.cpp 2017-05-12 15:59:26 +0000
@@ -19,8 +19,8 @@
19#include "src/client/mir_screencast.h"19#include "src/client/mir_screencast.h"
20#include "src/client/rpc/mir_display_server.h"20#include "src/client/rpc/mir_display_server.h"
2121
22#include "mir/client_buffer_factory.h"22#include "mir/client/client_buffer_factory.h"
23#include "mir/client_platform.h"23#include "mir/client/client_platform.h"
2424
25#include "mir/test/doubles/mock_mir_buffer_stream.h"25#include "mir/test/doubles/mock_mir_buffer_stream.h"
26#include "mir/test/doubles/null_client_buffer.h"26#include "mir/test/doubles/null_client_buffer.h"
2727
=== modified file 'tests/unit-tests/client/test_presentation_chain.cpp'
--- tests/unit-tests/client/test_presentation_chain.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_presentation_chain.cpp 2017-05-12 15:59:26 +0000
@@ -22,7 +22,7 @@
22#include "mir/test/fake_shared.h"22#include "mir/test/fake_shared.h"
23#include "src/client/presentation_chain.h"23#include "src/client/presentation_chain.h"
24#include "src/client/buffer_factory.h"24#include "src/client/buffer_factory.h"
25#include "mir/client_buffer_factory.h"25#include "mir/client/client_buffer_factory.h"
2626
27#include <mutex>27#include <mutex>
28#include <condition_variable>28#include <condition_variable>
2929
=== modified file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
--- tests/unit-tests/client/test_probing_client_platform_factory.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_probing_client_platform_factory.cpp 2017-05-12 15:59:26 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>16 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
17 */17 */
1818
19#include "mir/client_platform.h"19#include "mir/client/client_platform.h"
20#include "src/client/probing_client_platform_factory.h"20#include "src/client/probing_client_platform_factory.h"
21#include "src/server/report/null_report_factory.h"21#include "src/server/report/null_report_factory.h"
2222
2323
=== modified file 'tests/unit-tests/client/test_screencast_stream.cpp'
--- tests/unit-tests/client/test_screencast_stream.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/client/test_screencast_stream.cpp 2017-05-12 15:59:26 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19#include "src/client/screencast_stream.h"19#include "src/client/screencast_stream.h"
20#include "mir/client_platform.h"20#include "mir/client/client_platform.h"
21#include "mir/test/doubles/null_client_buffer.h"21#include "mir/test/doubles/null_client_buffer.h"
22#include "mir/test/doubles/mock_client_buffer_factory.h"22#include "mir/test/doubles/mock_client_buffer_factory.h"
23#include "mir/test/doubles/mock_protobuf_server.h"23#include "mir/test/doubles/mock_protobuf_server.h"
2424
=== modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
--- tests/unit-tests/platforms/mesa/client/test_client_platform.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/platforms/mesa/client/test_client_platform.cpp 2017-05-12 15:59:26 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>16 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
17 */17 */
1818
19#include "mir/client_platform.h"19#include "mir/client/client_platform.h"
20#include "mir/shared_library.h"20#include "mir/shared_library.h"
21#include "mir/raii.h"21#include "mir/raii.h"
22#include "src/platforms/mesa/client/buffer_file_ops.h"22#include "src/platforms/mesa/client/buffer_file_ops.h"
2323
=== modified file 'tests/unit-tests/platforms/mesa/client/test_native_surface.cpp'
--- tests/unit-tests/platforms/mesa/client/test_native_surface.cpp 2017-04-28 03:49:54 +0000
+++ tests/unit-tests/platforms/mesa/client/test_native_surface.cpp 2017-05-12 15:59:26 +0000
@@ -18,7 +18,7 @@
1818
19#include "src/platforms/mesa/include/native_buffer.h"19#include "src/platforms/mesa/include/native_buffer.h"
20#include "src/platforms/mesa/client/native_surface.h"20#include "src/platforms/mesa/client/native_surface.h"
21#include "mir/client_buffer.h"21#include "mir/client/client_buffer.h"
22#include "mir/test/doubles/mock_egl_native_surface.h"22#include "mir/test/doubles/mock_egl_native_surface.h"
23#include "mir/test/doubles/mock_client_buffer.h"23#include "mir/test/doubles/mock_client_buffer.h"
24#include "mir/test/fake_shared.h"24#include "mir/test/fake_shared.h"

Subscribers

People subscribed via source and target branches