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
1=== modified file 'examples/render_surfaces.cpp'
2--- examples/render_surfaces.cpp 2013-03-16 15:07:47 +0000
3+++ examples/render_surfaces.cpp 2013-03-19 15:09:36 +0000
4@@ -28,7 +28,7 @@
5 #include "mir/logging/logger.h"
6 #include "mir/logging/display_report.h"
7 #include "mir/logging/dumb_console_logger.h"
8-#include "mir/shell/surface_creation_parameters.h"
9+#include "mir/frontend/surface_creation_parameters.h"
10 #include "mir/surfaces/surface.h"
11 #include "mir/surfaces/surface_stack.h"
12 #include "mir/geometry/rectangle.h"
13
14=== renamed file 'include/server/mir/shell/surface_creation_parameters.h' => 'include/server/mir/frontend/surface_creation_parameters.h'
15--- include/server/mir/shell/surface_creation_parameters.h 2013-03-14 12:48:20 +0000
16+++ include/server/mir/frontend/surface_creation_parameters.h 2013-03-19 15:09:36 +0000
17@@ -16,8 +16,8 @@
18 * Authored by: Alan Griffiths <alan@octopull.co.uk>
19 */
20
21-#ifndef MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_
22-#define MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_
23+#ifndef MIR_FRONTEND_SURFACE_CREATION_PARAMETERS_H_
24+#define MIR_FRONTEND_SURFACE_CREATION_PARAMETERS_H_
25
26 #include "mir/geometry/pixel_format.h"
27 #include "mir/compositor/buffer_properties.h"
28@@ -57,4 +57,4 @@
29 }
30 }
31
32-#endif /* MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_ */
33+#endif /* MIR_FRONTEND_SURFACE_CREATION_PARAMETERS_H_ */
34
35=== modified file 'include/test/mir_test_doubles/mock_shell.h'
36--- include/test/mir_test_doubles/mock_shell.h 2013-03-15 23:15:45 +0000
37+++ include/test/mir_test_doubles/mock_shell.h 2013-03-19 15:09:36 +0000
38@@ -19,7 +19,7 @@
39 #ifndef MIR_TEST_DOUBLES_SHELL_H_
40 #define MIR_TEST_DOUBLES_SHELL_H_
41
42-#include "mir/shell/surface_creation_parameters.h"
43+#include "mir/frontend/surface_creation_parameters.h"
44 #include "mir/frontend/shell.h"
45 #include "mir/frontend/surface_id.h"
46
47
48=== modified file 'src/server/frontend/session_mediator.cpp'
49--- src/server/frontend/session_mediator.cpp 2013-03-18 19:44:59 +0000
50+++ src/server/frontend/session_mediator.cpp 2013-03-19 15:09:36 +0000
51@@ -21,7 +21,7 @@
52 #include "mir/frontend/shell.h"
53 #include "mir/frontend/session.h"
54 #include "mir/frontend/surface.h"
55-#include "mir/shell/surface_creation_parameters.h"
56+#include "mir/frontend/surface_creation_parameters.h"
57 #include "mir/frontend/resource_cache.h"
58 #include "mir/compositor/buffer_ipc_package.h"
59 #include "mir/compositor/buffer_id.h"
60
61=== modified file 'src/server/frontend/surface_creation_parameters.cpp'
62--- src/server/frontend/surface_creation_parameters.cpp 2013-03-14 14:11:12 +0000
63+++ src/server/frontend/surface_creation_parameters.cpp 2013-03-19 15:09:36 +0000
64@@ -16,7 +16,7 @@
65 * Authored by: Alan Griffiths <alan@octopull.co.uk>
66 */
67
68-#include "mir/shell/surface_creation_parameters.h"
69+#include "mir/frontend/surface_creation_parameters.h"
70
71 namespace mc = mir::compositor;
72 namespace mf = mir::frontend;
73
74=== modified file 'src/server/shell/consuming_placement_strategy.cpp'
75--- src/server/shell/consuming_placement_strategy.cpp 2013-03-14 12:48:20 +0000
76+++ src/server/shell/consuming_placement_strategy.cpp 2013-03-19 15:09:36 +0000
77@@ -17,7 +17,7 @@
78 */
79
80 #include "mir/shell/consuming_placement_strategy.h"
81-#include "mir/shell/surface_creation_parameters.h"
82+#include "mir/frontend/surface_creation_parameters.h"
83 #include "mir/graphics/viewable_area.h"
84
85 #include <algorithm>
86
87=== modified file 'src/server/shell/organising_surface_factory.cpp'
88--- src/server/shell/organising_surface_factory.cpp 2013-03-14 12:48:20 +0000
89+++ src/server/shell/organising_surface_factory.cpp 2013-03-19 15:09:36 +0000
90@@ -18,7 +18,7 @@
91
92 #include "mir/shell/organising_surface_factory.h"
93 #include "mir/shell/placement_strategy.h"
94-#include "mir/shell/surface_creation_parameters.h"
95+#include "mir/frontend/surface_creation_parameters.h"
96
97 namespace mf = mir::frontend;
98 namespace msh = mir::shell;
99
100=== modified file 'src/server/surfaces/surface_stack.cpp'
101--- src/server/surfaces/surface_stack.cpp 2013-03-14 12:48:20 +0000
102+++ src/server/surfaces/surface_stack.cpp 2013-03-19 15:09:36 +0000
103@@ -21,7 +21,7 @@
104 #include "mir/surfaces/buffer_bundle_factory.h"
105 #include "mir/compositor/buffer_properties.h"
106 #include "mir/graphics/renderer.h"
107-#include "mir/shell/surface_creation_parameters.h"
108+#include "mir/frontend/surface_creation_parameters.h"
109 #include "mir/surfaces/surface.h"
110 #include "mir/surfaces/surface_stack.h"
111
112
113=== modified file 'tests/acceptance-tests/test_focus_management_api.cpp'
114--- tests/acceptance-tests/test_focus_management_api.cpp 2013-03-15 23:15:45 +0000
115+++ tests/acceptance-tests/test_focus_management_api.cpp 2013-03-19 15:09:36 +0000
116@@ -19,7 +19,7 @@
117 #include "mir_toolkit/mir_client_library_lightdm.h"
118
119 #include "mir/frontend/surface_id.h"
120-#include "mir/shell/surface_creation_parameters.h"
121+#include "mir/frontend/surface_creation_parameters.h"
122 #include "mir/frontend/shell.h"
123
124 #include "mir_test_doubles/mock_display.h"
125
126=== modified file 'tests/behavior-tests/session_management_context.cpp'
127--- tests/behavior-tests/session_management_context.cpp 2013-03-15 22:34:53 +0000
128+++ tests/behavior-tests/session_management_context.cpp 2013-03-19 15:09:36 +0000
129@@ -19,7 +19,7 @@
130 #include "mir_test_cucumber/session_management_context.h"
131
132 #include "mir/frontend/surface.h"
133-#include "mir/shell/surface_creation_parameters.h"
134+#include "mir/frontend/surface_creation_parameters.h"
135 #include "mir/frontend/session.h"
136 #include "mir/shell/registration_order_focus_sequence.h"
137 #include "mir/shell/single_visibility_focus_mechanism.h"
138
139=== modified file 'tests/integration-tests/cucumber/test_session_management_context.cpp'
140--- tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-16 15:09:10 +0000
141+++ tests/integration-tests/cucumber/test_session_management_context.cpp 2013-03-19 15:09:36 +0000
142@@ -21,7 +21,7 @@
143 #include "mir/frontend/shell.h"
144 #include "mir/frontend/session.h"
145 #include "mir/frontend/surface.h"
146-#include "mir/shell/surface_creation_parameters.h"
147+#include "mir/frontend/surface_creation_parameters.h"
148 #include "mir/graphics/viewable_area.h"
149
150 #include "mir_test_doubles/mock_session.h"
151
152=== modified file 'tests/integration-tests/frontend/test_session_manager.cpp'
153--- tests/integration-tests/frontend/test_session_manager.cpp 2013-03-18 15:37:35 +0000
154+++ tests/integration-tests/frontend/test_session_manager.cpp 2013-03-19 15:09:36 +0000
155@@ -24,7 +24,7 @@
156 #include "mir/shell/focus_setter.h"
157 #include "mir/shell/registration_order_focus_sequence.h"
158 #include "mir/frontend/session_container.h"
159-#include "mir/shell/surface_creation_parameters.h"
160+#include "mir/frontend/surface_creation_parameters.h"
161
162 #include <gmock/gmock.h>
163 #include <gtest/gtest.h>
164
165=== modified file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
166--- tests/unit-tests/frontend/test_session_mediator_android.cpp 2013-03-15 13:07:31 +0000
167+++ tests/unit-tests/frontend/test_session_mediator_android.cpp 2013-03-19 15:09:36 +0000
168@@ -22,7 +22,7 @@
169 #include "mir/frontend/resource_cache.h"
170 #include "mir/shell/application_session.h"
171 #include "mir/frontend/shell.h"
172-#include "mir/shell/surface_creation_parameters.h"
173+#include "mir/frontend/surface_creation_parameters.h"
174 #include "mir/graphics/display.h"
175 #include "mir/graphics/platform.h"
176 #include "mir/graphics/platform_ipc_package.h"
177
178=== modified file 'tests/unit-tests/frontend/test_session_mediator_gbm.cpp'
179--- tests/unit-tests/frontend/test_session_mediator_gbm.cpp 2013-03-15 13:07:31 +0000
180+++ tests/unit-tests/frontend/test_session_mediator_gbm.cpp 2013-03-19 15:09:36 +0000
181@@ -22,7 +22,7 @@
182 #include "mir/frontend/resource_cache.h"
183 #include "mir/shell/application_session.h"
184 #include "mir/frontend/shell.h"
185-#include "mir/shell/surface_creation_parameters.h"
186+#include "mir/frontend/surface_creation_parameters.h"
187 #include "mir/graphics/display.h"
188 #include "mir/graphics/drm_authenticator.h"
189 #include "mir/graphics/platform.h"
190
191=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
192--- tests/unit-tests/shell/test_application_session.cpp 2013-03-15 22:34:53 +0000
193+++ tests/unit-tests/shell/test_application_session.cpp 2013-03-19 15:09:36 +0000
194@@ -18,7 +18,7 @@
195
196 #include "mir/shell/application_session.h"
197 #include "mir/compositor/buffer.h"
198-#include "mir/shell/surface_creation_parameters.h"
199+#include "mir/frontend/surface_creation_parameters.h"
200 #include "mir_test/fake_shared.h"
201 #include "mir_test_doubles/mock_surface_factory.h"
202 #include "mir_test_doubles/mock_surface.h"
203
204=== modified file 'tests/unit-tests/shell/test_consuming_placement_strategy.cpp'
205--- tests/unit-tests/shell/test_consuming_placement_strategy.cpp 2013-03-14 12:48:20 +0000
206+++ tests/unit-tests/shell/test_consuming_placement_strategy.cpp 2013-03-19 15:09:36 +0000
207@@ -19,7 +19,7 @@
208 #include "mir_test_doubles/mock_viewable_area.h"
209
210 #include "mir/shell/consuming_placement_strategy.h"
211-#include "mir/shell/surface_creation_parameters.h"
212+#include "mir/frontend/surface_creation_parameters.h"
213
214 #include <gtest/gtest.h>
215 #include <gmock/gmock.h>
216
217=== modified file 'tests/unit-tests/shell/test_organising_surface_factory.cpp'
218--- tests/unit-tests/shell/test_organising_surface_factory.cpp 2013-03-14 12:48:20 +0000
219+++ tests/unit-tests/shell/test_organising_surface_factory.cpp 2013-03-19 15:09:36 +0000
220@@ -20,7 +20,7 @@
221
222 #include <mir/shell/organising_surface_factory.h>
223 #include <mir/shell/placement_strategy.h>
224-#include <mir/shell/surface_creation_parameters.h>
225+#include <mir/frontend/surface_creation_parameters.h>
226
227 #include <gtest/gtest.h>
228 #include <gmock/gmock.h>
229
230=== modified file 'tests/unit-tests/shell/test_registration_order_focus_sequence.cpp'
231--- tests/unit-tests/shell/test_registration_order_focus_sequence.cpp 2013-03-14 14:02:34 +0000
232+++ tests/unit-tests/shell/test_registration_order_focus_sequence.cpp 2013-03-19 15:09:36 +0000
233@@ -20,7 +20,7 @@
234 #include "mir/shell/application_session.h"
235 #include "mir/frontend/session_container.h"
236 #include "mir/shell/registration_order_focus_sequence.h"
237-#include "mir/shell/surface_creation_parameters.h"
238+#include "mir/frontend/surface_creation_parameters.h"
239 #include "mir/surfaces/surface.h"
240 #include "mir_test_doubles/mock_buffer_bundle.h"
241 #include "mir_test_doubles/mock_surface_factory.h"
242
243=== modified file 'tests/unit-tests/shell/test_session_manager.cpp'
244--- tests/unit-tests/shell/test_session_manager.cpp 2013-03-18 12:30:15 +0000
245+++ tests/unit-tests/shell/test_session_manager.cpp 2013-03-19 15:09:36 +0000
246@@ -20,7 +20,7 @@
247 #include "mir/shell/session_manager.h"
248 #include "mir/frontend/session_container.h"
249 #include "mir/frontend/session.h"
250-#include "mir/shell/surface_creation_parameters.h"
251+#include "mir/frontend/surface_creation_parameters.h"
252 #include "mir/shell/focus_sequence.h"
253 #include "mir/surfaces/surface.h"
254 #include "mir/input/input_channel.h"
255
256=== modified file 'tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp'
257--- tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp 2013-03-14 14:02:34 +0000
258+++ tests/unit-tests/shell/test_single_visibility_focus_mechanism.cpp 2013-03-19 15:09:36 +0000
259@@ -21,7 +21,7 @@
260 #include "mir/frontend/session_container.h"
261 #include "mir/shell/registration_order_focus_sequence.h"
262 #include "mir/shell/single_visibility_focus_mechanism.h"
263-#include "mir/shell/surface_creation_parameters.h"
264+#include "mir/frontend/surface_creation_parameters.h"
265 #include "mir/surfaces/surface.h"
266 #include "mir_test_doubles/mock_buffer_bundle.h"
267 #include "mir_test/fake_shared.h"
268
269=== modified file 'tests/unit-tests/shell/test_surface.cpp'
270--- tests/unit-tests/shell/test_surface.cpp 2013-03-18 14:21:42 +0000
271+++ tests/unit-tests/shell/test_surface.cpp 2013-03-19 15:09:36 +0000
272@@ -18,7 +18,7 @@
273
274 #include "src/server/shell/surface.h"
275 #include "mir/surfaces/surface.h"
276-#include "mir/shell/surface_creation_parameters.h"
277+#include "mir/frontend/surface_creation_parameters.h"
278 #include "mir/surfaces/surface_stack_model.h"
279 #include "mir/input/input_channel.h"
280 #include "mir/shell/surface_builder.h"
281
282=== modified file 'tests/unit-tests/shell/test_the_session_container_implementation.cpp'
283--- tests/unit-tests/shell/test_the_session_container_implementation.cpp 2013-03-14 14:02:34 +0000
284+++ tests/unit-tests/shell/test_the_session_container_implementation.cpp 2013-03-19 15:09:36 +0000
285@@ -19,7 +19,7 @@
286 #include "mir/surfaces/buffer_bundle.h"
287 #include "mir/shell/application_session.h"
288 #include "mir/frontend/session_container.h"
289-#include "mir/shell/surface_creation_parameters.h"
290+#include "mir/frontend/surface_creation_parameters.h"
291 #include "mir/surfaces/surface.h"
292 #include "mir_test_doubles/mock_buffer_bundle.h"
293 #include "mir_test_doubles/mock_surface_factory.h"
294
295=== modified file 'tests/unit-tests/surfaces/test_surface.cpp'
296--- tests/unit-tests/surfaces/test_surface.cpp 2013-03-14 12:48:20 +0000
297+++ tests/unit-tests/surfaces/test_surface.cpp 2013-03-19 15:09:36 +0000
298@@ -17,7 +17,7 @@
299 */
300
301 #include "mir/surfaces/surface.h"
302-#include "mir/shell/surface_creation_parameters.h"
303+#include "mir/frontend/surface_creation_parameters.h"
304 #include "mir_test_doubles/mock_buffer_bundle.h"
305 #include "mir_test_doubles/stub_buffer.h"
306
307
308=== modified file 'tests/unit-tests/surfaces/test_surface_controller.cpp'
309--- tests/unit-tests/surfaces/test_surface_controller.cpp 2013-03-18 15:50:30 +0000
310+++ tests/unit-tests/surfaces/test_surface_controller.cpp 2013-03-19 15:09:36 +0000
311@@ -18,7 +18,7 @@
312
313 #include "mir/surfaces/surface_controller.h"
314 #include "mir/surfaces/surface_stack_model.h"
315-#include "mir/shell/surface_creation_parameters.h"
316+#include "mir/frontend/surface_creation_parameters.h"
317
318 #include "mir_test/fake_shared.h"
319
320
321=== modified file 'tests/unit-tests/surfaces/test_surface_stack.cpp'
322--- tests/unit-tests/surfaces/test_surface_stack.cpp 2013-03-14 12:48:20 +0000
323+++ tests/unit-tests/surfaces/test_surface_stack.cpp 2013-03-19 15:09:36 +0000
324@@ -23,7 +23,7 @@
325 #include "mir/compositor/buffer_properties.h"
326 #include "mir/compositor/render_view.h"
327 #include "mir/geometry/rectangle.h"
328-#include "mir/shell/surface_creation_parameters.h"
329+#include "mir/frontend/surface_creation_parameters.h"
330 #include "mir/surfaces/surface_stack.h"
331 #include "mir/graphics/renderer.h"
332 #include "mir/surfaces/surface.h"

Subscribers

People subscribed via source and target branches