Mir

Merge lp:~alan-griffiths/mir/refactor-frontend-surface_creation_parameters.h into lp:~mir-team/mir/trunk

  1. refactor-frontend-surface_creation_parameters.h
  2. Merge into trunk
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 513
Proposed branch: lp:~alan-griffiths/mir/refactor-frontend-surface_creation_parameters.h
Merge into: lp:~mir-team/mir/trunk
Diff against target: 332 lines (+27/-27)
25 files modified
examples/render_surfaces.cpp (+1/-1)
include/server/mir/frontend/surface_creation_parameters.h (+3/-3)
include/test/mir_test_doubles/mock_shell.h (+1/-1)
src/server/frontend/session_mediator.cpp (+1/-1)
src/server/frontend/surface_creation_parameters.cpp (+1/-1)
src/server/shell/consuming_placement_strategy.cpp (+1/-1)
src/server/shell/organising_surface_factory.cpp (+1/-1)
src/server/surfaces/surface_stack.cpp (+1/-1)
tests/acceptance-tests/test_focus_management_api.cpp (+1/-1)
tests/behavior-tests/session_management_context.cpp (+1/-1)
tests/integration-tests/cucumber/test_session_management_context.cpp (+1/-1)
tests/integration-tests/frontend/test_session_manager.cpp (+1/-1)
tests/unit-tests/frontend/test_session_mediator_android.cpp (+1/-1)
tests/unit-tests/frontend/test_session_mediator_gbm.cpp (+1/-1)
tests/unit-tests/shell/test_application_session.cpp (+1/-1)
tests/unit-tests/shell/test_consuming_placement_strategy.cpp (+1/-1)
tests/unit-tests/shell/test_organising_surface_factory.cpp (+1/-1)
tests/unit-tests/shell/test_registration_order_focus_sequence.cpp (+1/-1)
tests/unit-tests/shell/test_session_manager.cpp (+1/-1)
tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp (+1/-1)
tests/unit-tests/shell/test_surface.cpp (+1/-1)
tests/unit-tests/shell/test_the_session_container_implementation.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface_controller.cpp (+1/-1)
tests/unit-tests/surfaces/test_surface_stack.cpp (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/refactor-frontend-surface_creation_parameters.h
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+154118@code.launchpad.net

Commit message

frontend, shell: Put surface_creation_parameters.h where it belongs

Description of the change

frontend, shell: Put surface_creation_parameters.h where it belongs

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/mir-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/36/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/130/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/130/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/129/rebuild

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp 2013-03-16 15:07:47 +0000
+++ examples/render_surfaces.cpp 2013-03-19 15:09:36 +0000
@@ -28,7 +28,7 @@
28#include "mir/logging/logger.h"28#include "mir/logging/logger.h"
29#include "mir/logging/display_report.h"29#include "mir/logging/display_report.h"
30#include "mir/logging/dumb_console_logger.h"30#include "mir/logging/dumb_console_logger.h"
31#include "mir/shell/surface_creation_parameters.h"31#include "mir/frontend/surface_creation_parameters.h"
32#include "mir/surfaces/surface.h"32#include "mir/surfaces/surface.h"
33#include "mir/surfaces/surface_stack.h"33#include "mir/surfaces/surface_stack.h"
34#include "mir/geometry/rectangle.h"34#include "mir/geometry/rectangle.h"
3535
=== renamed file 'include/server/mir/shell/surface_creation_parameters.h' => 'include/server/mir/frontend/surface_creation_parameters.h'
--- include/server/mir/shell/surface_creation_parameters.h 2013-03-14 12:48:20 +0000
+++ include/server/mir/frontend/surface_creation_parameters.h 2013-03-19 15:09:36 +0000
@@ -16,8 +16,8 @@
16 * Authored by: Alan Griffiths <alan@octopull.co.uk>16 * Authored by: Alan Griffiths <alan@octopull.co.uk>
17 */17 */
1818
19#ifndef MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_19#ifndef MIR_FRONTEND_SURFACE_CREATION_PARAMETERS_H_
20#define MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_20#define MIR_FRONTEND_SURFACE_CREATION_PARAMETERS_H_
2121
22#include "mir/geometry/pixel_format.h"22#include "mir/geometry/pixel_format.h"
23#include "mir/compositor/buffer_properties.h"23#include "mir/compositor/buffer_properties.h"
@@ -57,4 +57,4 @@
57}57}
58}58}
5959
60#endif /* MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_ */60#endif /* MIR_FRONTEND_SURFACE_CREATION_PARAMETERS_H_ */
6161
=== modified file 'include/test/mir_test_doubles/mock_shell.h'
--- include/test/mir_test_doubles/mock_shell.h 2013-03-15 23:15:45 +0000
+++ include/test/mir_test_doubles/mock_shell.h 2013-03-19 15:09:36 +0000
@@ -19,7 +19,7 @@
19#ifndef MIR_TEST_DOUBLES_SHELL_H_19#ifndef MIR_TEST_DOUBLES_SHELL_H_
20#define MIR_TEST_DOUBLES_SHELL_H_20#define MIR_TEST_DOUBLES_SHELL_H_
2121
22#include "mir/shell/surface_creation_parameters.h"22#include "mir/frontend/surface_creation_parameters.h"
23#include "mir/frontend/shell.h"23#include "mir/frontend/shell.h"
24#include "mir/frontend/surface_id.h"24#include "mir/frontend/surface_id.h"
2525
2626
=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp 2013-03-18 19:44:59 +0000
+++ src/server/frontend/session_mediator.cpp 2013-03-19 15:09:36 +0000
@@ -21,7 +21,7 @@
21#include "mir/frontend/shell.h"21#include "mir/frontend/shell.h"
22#include "mir/frontend/session.h"22#include "mir/frontend/session.h"
23#include "mir/frontend/surface.h"23#include "mir/frontend/surface.h"
24#include "mir/shell/surface_creation_parameters.h"24#include "mir/frontend/surface_creation_parameters.h"
25#include "mir/frontend/resource_cache.h"25#include "mir/frontend/resource_cache.h"
26#include "mir/compositor/buffer_ipc_package.h"26#include "mir/compositor/buffer_ipc_package.h"
27#include "mir/compositor/buffer_id.h"27#include "mir/compositor/buffer_id.h"
2828
=== modified file 'src/server/frontend/surface_creation_parameters.cpp'
--- src/server/frontend/surface_creation_parameters.cpp 2013-03-14 14:11:12 +0000
+++ src/server/frontend/surface_creation_parameters.cpp 2013-03-19 15:09:36 +0000
@@ -16,7 +16,7 @@
16 * Authored by: Alan Griffiths <alan@octopull.co.uk>16 * Authored by: Alan Griffiths <alan@octopull.co.uk>
17 */17 */
1818
19#include "mir/shell/surface_creation_parameters.h"19#include "mir/frontend/surface_creation_parameters.h"
2020
21namespace mc = mir::compositor;21namespace mc = mir::compositor;
22namespace mf = mir::frontend;22namespace mf = mir::frontend;
2323
=== modified file 'src/server/shell/consuming_placement_strategy.cpp'
--- src/server/shell/consuming_placement_strategy.cpp 2013-03-14 12:48:20 +0000
+++ src/server/shell/consuming_placement_strategy.cpp 2013-03-19 15:09:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19#include "mir/shell/consuming_placement_strategy.h"19#include "mir/shell/consuming_placement_strategy.h"
20#include "mir/shell/surface_creation_parameters.h"20#include "mir/frontend/surface_creation_parameters.h"
21#include "mir/graphics/viewable_area.h"21#include "mir/graphics/viewable_area.h"
2222
23#include <algorithm>23#include <algorithm>
2424
=== modified file 'src/server/shell/organising_surface_factory.cpp'
--- src/server/shell/organising_surface_factory.cpp 2013-03-14 12:48:20 +0000
+++ src/server/shell/organising_surface_factory.cpp 2013-03-19 15:09:36 +0000
@@ -18,7 +18,7 @@
1818
19#include "mir/shell/organising_surface_factory.h"19#include "mir/shell/organising_surface_factory.h"
20#include "mir/shell/placement_strategy.h"20#include "mir/shell/placement_strategy.h"
21#include "mir/shell/surface_creation_parameters.h"21#include "mir/frontend/surface_creation_parameters.h"
2222
23namespace mf = mir::frontend;23namespace mf = mir::frontend;
24namespace msh = mir::shell;24namespace msh = mir::shell;
2525
=== modified file 'src/server/surfaces/surface_stack.cpp'
--- src/server/surfaces/surface_stack.cpp 2013-03-14 12:48:20 +0000
+++ src/server/surfaces/surface_stack.cpp 2013-03-19 15:09:36 +0000
@@ -21,7 +21,7 @@
21#include "mir/surfaces/buffer_bundle_factory.h"21#include "mir/surfaces/buffer_bundle_factory.h"
22#include "mir/compositor/buffer_properties.h"22#include "mir/compositor/buffer_properties.h"
23#include "mir/graphics/renderer.h"23#include "mir/graphics/renderer.h"
24#include "mir/shell/surface_creation_parameters.h"24#include "mir/frontend/surface_creation_parameters.h"
25#include "mir/surfaces/surface.h"25#include "mir/surfaces/surface.h"
26#include "mir/surfaces/surface_stack.h"26#include "mir/surfaces/surface_stack.h"
2727
2828
=== modified file 'tests/acceptance-tests/test_focus_management_api.cpp'
--- tests/acceptance-tests/test_focus_management_api.cpp 2013-03-15 23:15:45 +0000
+++ tests/acceptance-tests/test_focus_management_api.cpp 2013-03-19 15:09:36 +0000
@@ -19,7 +19,7 @@
19#include "mir_toolkit/mir_client_library_lightdm.h"19#include "mir_toolkit/mir_client_library_lightdm.h"
2020
21#include "mir/frontend/surface_id.h"21#include "mir/frontend/surface_id.h"
22#include "mir/shell/surface_creation_parameters.h"22#include "mir/frontend/surface_creation_parameters.h"
23#include "mir/frontend/shell.h"23#include "mir/frontend/shell.h"
2424
25#include "mir_test_doubles/mock_display.h"25#include "mir_test_doubles/mock_display.h"
2626
=== modified file 'tests/behavior-tests/session_management_context.cpp'
--- tests/behavior-tests/session_management_context.cpp 2013-03-15 22:34:53 +0000
+++ tests/behavior-tests/session_management_context.cpp 2013-03-19 15:09:36 +0000
@@ -19,7 +19,7 @@
19#include "mir_test_cucumber/session_management_context.h"19#include "mir_test_cucumber/session_management_context.h"
2020
21#include "mir/frontend/surface.h"21#include "mir/frontend/surface.h"
22#include "mir/shell/surface_creation_parameters.h"22#include "mir/frontend/surface_creation_parameters.h"
23#include "mir/frontend/session.h"23#include "mir/frontend/session.h"
24#include "mir/shell/registration_order_focus_sequence.h"24#include "mir/shell/registration_order_focus_sequence.h"
25#include "mir/shell/single_visibility_focus_mechanism.h"25#include "mir/shell/single_visibility_focus_mechanism.h"
2626
=== modified file 'tests/integration-tests/cucumber/test_session_management_context.cpp'
--- tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-16 15:09:10 +0000
+++ tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-19 15:09:36 +0000
@@ -21,7 +21,7 @@
21#include "mir/frontend/shell.h"21#include "mir/frontend/shell.h"
22#include "mir/frontend/session.h"22#include "mir/frontend/session.h"
23#include "mir/frontend/surface.h"23#include "mir/frontend/surface.h"
24#include "mir/shell/surface_creation_parameters.h"24#include "mir/frontend/surface_creation_parameters.h"
25#include "mir/graphics/viewable_area.h"25#include "mir/graphics/viewable_area.h"
2626
27#include "mir_test_doubles/mock_session.h"27#include "mir_test_doubles/mock_session.h"
2828
=== modified file 'tests/integration-tests/frontend/test_session_manager.cpp'
--- tests/integration-tests/frontend/test_session_manager.cpp 2013-03-18 15:37:35 +0000
+++ tests/integration-tests/frontend/test_session_manager.cpp 2013-03-19 15:09:36 +0000
@@ -24,7 +24,7 @@
24#include "mir/shell/focus_setter.h"24#include "mir/shell/focus_setter.h"
25#include "mir/shell/registration_order_focus_sequence.h"25#include "mir/shell/registration_order_focus_sequence.h"
26#include "mir/frontend/session_container.h"26#include "mir/frontend/session_container.h"
27#include "mir/shell/surface_creation_parameters.h"27#include "mir/frontend/surface_creation_parameters.h"
2828
29#include <gmock/gmock.h>29#include <gmock/gmock.h>
30#include <gtest/gtest.h>30#include <gtest/gtest.h>
3131
=== modified file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_session_mediator_android.cpp 2013-03-15 13:07:31 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp 2013-03-19 15:09:36 +0000
@@ -22,7 +22,7 @@
22#include "mir/frontend/resource_cache.h"22#include "mir/frontend/resource_cache.h"
23#include "mir/shell/application_session.h"23#include "mir/shell/application_session.h"
24#include "mir/frontend/shell.h"24#include "mir/frontend/shell.h"
25#include "mir/shell/surface_creation_parameters.h"25#include "mir/frontend/surface_creation_parameters.h"
26#include "mir/graphics/display.h"26#include "mir/graphics/display.h"
27#include "mir/graphics/platform.h"27#include "mir/graphics/platform.h"
28#include "mir/graphics/platform_ipc_package.h"28#include "mir/graphics/platform_ipc_package.h"
2929
=== modified file 'tests/unit-tests/frontend/test_session_mediator_gbm.cpp'
--- tests/unit-tests/frontend/test_session_mediator_gbm.cpp 2013-03-15 13:07:31 +0000
+++ tests/unit-tests/frontend/test_session_mediator_gbm.cpp 2013-03-19 15:09:36 +0000
@@ -22,7 +22,7 @@
22#include "mir/frontend/resource_cache.h"22#include "mir/frontend/resource_cache.h"
23#include "mir/shell/application_session.h"23#include "mir/shell/application_session.h"
24#include "mir/frontend/shell.h"24#include "mir/frontend/shell.h"
25#include "mir/shell/surface_creation_parameters.h"25#include "mir/frontend/surface_creation_parameters.h"
26#include "mir/graphics/display.h"26#include "mir/graphics/display.h"
27#include "mir/graphics/drm_authenticator.h"27#include "mir/graphics/drm_authenticator.h"
28#include "mir/graphics/platform.h"28#include "mir/graphics/platform.h"
2929
=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
--- tests/unit-tests/shell/test_application_session.cpp 2013-03-15 22:34:53 +0000
+++ tests/unit-tests/shell/test_application_session.cpp 2013-03-19 15:09:36 +0000
@@ -18,7 +18,7 @@
1818
19#include "mir/shell/application_session.h"19#include "mir/shell/application_session.h"
20#include "mir/compositor/buffer.h"20#include "mir/compositor/buffer.h"
21#include "mir/shell/surface_creation_parameters.h"21#include "mir/frontend/surface_creation_parameters.h"
22#include "mir_test/fake_shared.h"22#include "mir_test/fake_shared.h"
23#include "mir_test_doubles/mock_surface_factory.h"23#include "mir_test_doubles/mock_surface_factory.h"
24#include "mir_test_doubles/mock_surface.h"24#include "mir_test_doubles/mock_surface.h"
2525
=== modified file 'tests/unit-tests/shell/test_consuming_placement_strategy.cpp'
--- tests/unit-tests/shell/test_consuming_placement_strategy.cpp 2013-03-14 12:48:20 +0000
+++ tests/unit-tests/shell/test_consuming_placement_strategy.cpp 2013-03-19 15:09:36 +0000
@@ -19,7 +19,7 @@
19#include "mir_test_doubles/mock_viewable_area.h"19#include "mir_test_doubles/mock_viewable_area.h"
2020
21#include "mir/shell/consuming_placement_strategy.h"21#include "mir/shell/consuming_placement_strategy.h"
22#include "mir/shell/surface_creation_parameters.h"22#include "mir/frontend/surface_creation_parameters.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/unit-tests/shell/test_organising_surface_factory.cpp'
--- tests/unit-tests/shell/test_organising_surface_factory.cpp 2013-03-14 12:48:20 +0000
+++ tests/unit-tests/shell/test_organising_surface_factory.cpp 2013-03-19 15:09:36 +0000
@@ -20,7 +20,7 @@
2020
21#include <mir/shell/organising_surface_factory.h>21#include <mir/shell/organising_surface_factory.h>
22#include <mir/shell/placement_strategy.h>22#include <mir/shell/placement_strategy.h>
23#include <mir/shell/surface_creation_parameters.h>23#include <mir/frontend/surface_creation_parameters.h>
2424
25#include <gtest/gtest.h>25#include <gtest/gtest.h>
26#include <gmock/gmock.h>26#include <gmock/gmock.h>
2727
=== modified file 'tests/unit-tests/shell/test_registration_order_focus_sequence.cpp'
--- tests/unit-tests/shell/test_registration_order_focus_sequence.cpp 2013-03-14 14:02:34 +0000
+++ tests/unit-tests/shell/test_registration_order_focus_sequence.cpp 2013-03-19 15:09:36 +0000
@@ -20,7 +20,7 @@
20#include "mir/shell/application_session.h"20#include "mir/shell/application_session.h"
21#include "mir/frontend/session_container.h"21#include "mir/frontend/session_container.h"
22#include "mir/shell/registration_order_focus_sequence.h"22#include "mir/shell/registration_order_focus_sequence.h"
23#include "mir/shell/surface_creation_parameters.h"23#include "mir/frontend/surface_creation_parameters.h"
24#include "mir/surfaces/surface.h"24#include "mir/surfaces/surface.h"
25#include "mir_test_doubles/mock_buffer_bundle.h"25#include "mir_test_doubles/mock_buffer_bundle.h"
26#include "mir_test_doubles/mock_surface_factory.h"26#include "mir_test_doubles/mock_surface_factory.h"
2727
=== modified file 'tests/unit-tests/shell/test_session_manager.cpp'
--- tests/unit-tests/shell/test_session_manager.cpp 2013-03-18 12:30:15 +0000
+++ tests/unit-tests/shell/test_session_manager.cpp 2013-03-19 15:09:36 +0000
@@ -20,7 +20,7 @@
20#include "mir/shell/session_manager.h"20#include "mir/shell/session_manager.h"
21#include "mir/frontend/session_container.h"21#include "mir/frontend/session_container.h"
22#include "mir/frontend/session.h"22#include "mir/frontend/session.h"
23#include "mir/shell/surface_creation_parameters.h"23#include "mir/frontend/surface_creation_parameters.h"
24#include "mir/shell/focus_sequence.h"24#include "mir/shell/focus_sequence.h"
25#include "mir/surfaces/surface.h"25#include "mir/surfaces/surface.h"
26#include "mir/input/input_channel.h"26#include "mir/input/input_channel.h"
2727
=== modified file 'tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp'
--- tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp 2013-03-14 14:02:34 +0000
+++ tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp 2013-03-19 15:09:36 +0000
@@ -21,7 +21,7 @@
21#include "mir/frontend/session_container.h"21#include "mir/frontend/session_container.h"
22#include "mir/shell/registration_order_focus_sequence.h"22#include "mir/shell/registration_order_focus_sequence.h"
23#include "mir/shell/single_visibility_focus_mechanism.h"23#include "mir/shell/single_visibility_focus_mechanism.h"
24#include "mir/shell/surface_creation_parameters.h"24#include "mir/frontend/surface_creation_parameters.h"
25#include "mir/surfaces/surface.h"25#include "mir/surfaces/surface.h"
26#include "mir_test_doubles/mock_buffer_bundle.h"26#include "mir_test_doubles/mock_buffer_bundle.h"
27#include "mir_test/fake_shared.h"27#include "mir_test/fake_shared.h"
2828
=== modified file 'tests/unit-tests/shell/test_surface.cpp'
--- tests/unit-tests/shell/test_surface.cpp 2013-03-18 14:21:42 +0000
+++ tests/unit-tests/shell/test_surface.cpp 2013-03-19 15:09:36 +0000
@@ -18,7 +18,7 @@
1818
19#include "src/server/shell/surface.h"19#include "src/server/shell/surface.h"
20#include "mir/surfaces/surface.h"20#include "mir/surfaces/surface.h"
21#include "mir/shell/surface_creation_parameters.h"21#include "mir/frontend/surface_creation_parameters.h"
22#include "mir/surfaces/surface_stack_model.h"22#include "mir/surfaces/surface_stack_model.h"
23#include "mir/input/input_channel.h"23#include "mir/input/input_channel.h"
24#include "mir/shell/surface_builder.h"24#include "mir/shell/surface_builder.h"
2525
=== modified file 'tests/unit-tests/shell/test_the_session_container_implementation.cpp'
--- tests/unit-tests/shell/test_the_session_container_implementation.cpp 2013-03-14 14:02:34 +0000
+++ tests/unit-tests/shell/test_the_session_container_implementation.cpp 2013-03-19 15:09:36 +0000
@@ -19,7 +19,7 @@
19#include "mir/surfaces/buffer_bundle.h"19#include "mir/surfaces/buffer_bundle.h"
20#include "mir/shell/application_session.h"20#include "mir/shell/application_session.h"
21#include "mir/frontend/session_container.h"21#include "mir/frontend/session_container.h"
22#include "mir/shell/surface_creation_parameters.h"22#include "mir/frontend/surface_creation_parameters.h"
23#include "mir/surfaces/surface.h"23#include "mir/surfaces/surface.h"
24#include "mir_test_doubles/mock_buffer_bundle.h"24#include "mir_test_doubles/mock_buffer_bundle.h"
25#include "mir_test_doubles/mock_surface_factory.h"25#include "mir_test_doubles/mock_surface_factory.h"
2626
=== modified file 'tests/unit-tests/surfaces/test_surface.cpp'
--- tests/unit-tests/surfaces/test_surface.cpp 2013-03-14 12:48:20 +0000
+++ tests/unit-tests/surfaces/test_surface.cpp 2013-03-19 15:09:36 +0000
@@ -17,7 +17,7 @@
17 */17 */
1818
19#include "mir/surfaces/surface.h"19#include "mir/surfaces/surface.h"
20#include "mir/shell/surface_creation_parameters.h"20#include "mir/frontend/surface_creation_parameters.h"
21#include "mir_test_doubles/mock_buffer_bundle.h"21#include "mir_test_doubles/mock_buffer_bundle.h"
22#include "mir_test_doubles/stub_buffer.h"22#include "mir_test_doubles/stub_buffer.h"
2323
2424
=== modified file 'tests/unit-tests/surfaces/test_surface_controller.cpp'
--- tests/unit-tests/surfaces/test_surface_controller.cpp 2013-03-18 15:50:30 +0000
+++ tests/unit-tests/surfaces/test_surface_controller.cpp 2013-03-19 15:09:36 +0000
@@ -18,7 +18,7 @@
1818
19#include "mir/surfaces/surface_controller.h"19#include "mir/surfaces/surface_controller.h"
20#include "mir/surfaces/surface_stack_model.h"20#include "mir/surfaces/surface_stack_model.h"
21#include "mir/shell/surface_creation_parameters.h"21#include "mir/frontend/surface_creation_parameters.h"
2222
23#include "mir_test/fake_shared.h"23#include "mir_test/fake_shared.h"
2424
2525
=== modified file 'tests/unit-tests/surfaces/test_surface_stack.cpp'
--- tests/unit-tests/surfaces/test_surface_stack.cpp 2013-03-14 12:48:20 +0000
+++ tests/unit-tests/surfaces/test_surface_stack.cpp 2013-03-19 15:09:36 +0000
@@ -23,7 +23,7 @@
23#include "mir/compositor/buffer_properties.h"23#include "mir/compositor/buffer_properties.h"
24#include "mir/compositor/render_view.h"24#include "mir/compositor/render_view.h"
25#include "mir/geometry/rectangle.h"25#include "mir/geometry/rectangle.h"
26#include "mir/shell/surface_creation_parameters.h"26#include "mir/frontend/surface_creation_parameters.h"
27#include "mir/surfaces/surface_stack.h"27#include "mir/surfaces/surface_stack.h"
28#include "mir/graphics/renderer.h"28#include "mir/graphics/renderer.h"
29#include "mir/surfaces/surface.h"29#include "mir/surfaces/surface.h"

Subscribers

People subscribed via source and target branches