Merge lp:~alan-griffiths/mir/fix-1199756 into lp:~mir-team/mir/trunk
- fix-1199756
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alan Griffiths | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 849 | ||||
Proposed branch: | lp:~alan-griffiths/mir/fix-1199756 | ||||
Merge into: | lp:~mir-team/mir/trunk | ||||
Diff against target: |
1361 lines (+137/-169) 69 files modified
examples/demo-inprocess-surface-client/inprocess_egl_client.cpp (+1/-2) examples/render_surfaces.cpp (+3/-7) include/shared/mir/geometry/size.h (+4/-3) include/test/mir_test_doubles/mock_input_info.h (+1/-1) include/test/mir_test_doubles/mock_surface_info.h (+1/-1) include/test/mir_test_doubles/stub_buffer.h (+1/-1) src/client/android/android_client_buffer.cpp (+1/-2) src/server/graphics/android/buffer.cpp (+1/-2) src/server/graphics/android/fb_device.cpp (+1/-2) src/server/graphics/android/hwc11_device.cpp (+1/-1) src/server/graphics/gbm/gbm_buffer.cpp (+1/-2) src/server/graphics/gbm/gbm_cursor.cpp (+2/-3) src/server/graphics/gbm/kms_display_configuration.cpp (+2/-4) src/server/graphics/gbm/kms_output.cpp (+1/-1) src/server/shell/surface_creation_parameters.cpp (+1/-1) tests/acceptance-tests/test_client_input.cpp (+7/-8) tests/acceptance-tests/test_surfaceloop.cpp (+1/-1) tests/integration-tests/client/test_client_render.cpp (+1/-1) tests/integration-tests/compositor/test_buffer_stream.cpp (+2/-2) tests/integration-tests/compositor/test_swapping_swappers.cpp (+1/-1) tests/integration-tests/graphics/android/test_buffer_integration.cpp (+1/-2) tests/integration-tests/graphics/android/test_internal_client.cpp (+1/-2) tests/integration-tests/graphics/gbm/test_buffer_integration.cpp (+1/-1) tests/integration-tests/input/android/test_android_cursor_listener.cpp (+1/-1) tests/integration-tests/input/android/test_android_input_manager.cpp (+1/-3) tests/integration-tests/test_display_info.cpp (+1/-1) tests/integration-tests/test_surface_first_frame_sync.cpp (+1/-2) tests/integration-tests/test_surfaceloop.cpp (+2/-3) tests/mir_test_doubles/mock_drm.cpp (+1/-1) tests/mir_test_framework/input_testing_server_options.cpp (+1/-2) tests/mir_test_framework/testing_server_options.cpp (+1/-3) tests/unit-tests/client/android/test_client_android_registrar.cpp (+2/-2) tests/unit-tests/compositor/test_buffer_properties.cpp (+2/-2) tests/unit-tests/compositor/test_buffer_stream.cpp (+2/-3) tests/unit-tests/compositor/test_swapper_factory.cpp (+2/-2) tests/unit-tests/compositor/test_switching_bundle.cpp (+2/-2) tests/unit-tests/compositor/test_temporary_buffers.cpp (+1/-1) tests/unit-tests/geometry/test-rectangle.cpp (+1/-1) tests/unit-tests/geometry/test-size.cpp (+1/-1) tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp (+1/-1) tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp (+2/-2) tests/unit-tests/graphics/android/test_buffer.cpp (+2/-3) tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp (+1/-1) tests/unit-tests/graphics/android/test_framebuffer_factory.cpp (+1/-1) tests/unit-tests/graphics/android/test_hwc10_device.cpp (+1/-1) tests/unit-tests/graphics/android/test_hwc_display.cpp (+1/-1) tests/unit-tests/graphics/android/test_hwc_layerlist.cpp (+4/-5) tests/unit-tests/graphics/android/test_internal_client.cpp (+1/-1) tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp (+1/-1) tests/unit-tests/graphics/android/test_server_interpreter.cpp (+1/-1) tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp (+1/-1) tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp (+1/-1) tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp (+4/-4) tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp (+1/-1) tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp (+1/-2) tests/unit-tests/graphics/test_default_display_configuration_policy.cpp (+8/-8) tests/unit-tests/graphics/test_display_configuration.cpp (+13/-13) tests/unit-tests/graphics/test_gl_pixel_buffer.cpp (+1/-2) tests/unit-tests/graphics/test_graphics_platform.cpp (+1/-1) tests/unit-tests/input/android/test_android_input_manager.cpp (+1/-2) tests/unit-tests/input/android/test_android_input_reader_policy.cpp (+1/-2) tests/unit-tests/input/android/test_android_input_window_handle.cpp (+1/-2) tests/unit-tests/input/android/test_android_pointer_controller.cpp (+1/-2) tests/unit-tests/input/test_input_surface_info.cpp (+3/-3) tests/unit-tests/shell/test_consuming_placement_strategy.cpp (+2/-3) tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp (+1/-1) tests/unit-tests/surfaces/test_surface.cpp (+7/-7) tests/unit-tests/surfaces/test_surface_info.cpp (+1/-1) tests/unit-tests/surfaces/test_surface_stack.cpp (+13/-14) |
||||
To merge this branch: | bzr merge lp:~alan-griffiths/mir/fix-1199756 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alexandros Frantzis (community) | Approve | ||
Review via email:
|
Commit message
geometry: make geometry compound types easier to construct
Description of the change
geometry: make geometry compound types easier to construct
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:846
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:847
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
1 | === modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp' | |||
2 | --- examples/demo-inprocess-surface-client/inprocess_egl_client.cpp 2013-07-08 10:32:48 +0000 | |||
3 | +++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp 2013-07-12 11:57:23 +0000 | |||
4 | @@ -72,8 +72,7 @@ | |||
5 | 72 | 72 | ||
6 | 73 | void me::InprocessEGLClient::thread_loop() | 73 | void me::InprocessEGLClient::thread_loop() |
7 | 74 | { | 74 | { |
10 | 75 | geom::Size const surface_size = geom::Size{geom::Width{512}, | 75 | geom::Size const surface_size{512, 512}; |
9 | 76 | geom::Height{512}}; | ||
11 | 77 | 76 | ||
12 | 78 | ///\internal [setup_tag] | 77 | ///\internal [setup_tag] |
13 | 79 | auto params = msh::a_surface().of_name("Inprocess EGL Demo") | 78 | auto params = msh::a_surface().of_name("Inprocess EGL Demo") |
14 | 80 | 79 | ||
15 | === modified file 'examples/render_surfaces.cpp' | |||
16 | --- examples/render_surfaces.cpp 2013-07-10 17:06:37 +0000 | |||
17 | +++ examples/render_surfaces.cpp 2013-07-12 11:57:23 +0000 | |||
18 | @@ -102,9 +102,7 @@ | |||
19 | 102 | image[(i+1) * height + i] = fg_color; | 102 | image[(i+1) * height + i] = fg_color; |
20 | 103 | image[i * height + i + 1] = fg_color; | 103 | image[i * height + i + 1] = fg_color; |
21 | 104 | } | 104 | } |
25 | 105 | cursor->set_image( | 105 | cursor->set_image(image.data(), geom::Size{width, height}); |
23 | 106 | image.data(), | ||
24 | 107 | geom::Size{ geom::Width(width), geom::Height(height) }); | ||
26 | 108 | } | 106 | } |
27 | 109 | } | 107 | } |
28 | 110 | 108 | ||
29 | @@ -286,8 +284,7 @@ | |||
30 | 286 | public: | 284 | public: |
31 | 287 | RenderResourcesBufferInitializer() | 285 | RenderResourcesBufferInitializer() |
32 | 288 | : img_renderer{mir_image.pixel_data, | 286 | : img_renderer{mir_image.pixel_data, |
35 | 289 | geom::Size{geom::Width{mir_image.width}, | 287 | geom::Size{mir_image.width, mir_image.height}, |
34 | 290 | geom::Height{mir_image.height}}, | ||
36 | 291 | mir_image.bytes_per_pixel} | 288 | mir_image.bytes_per_pixel} |
37 | 292 | { | 289 | { |
38 | 293 | } | 290 | } |
39 | @@ -368,8 +365,7 @@ | |||
40 | 368 | auto const surface_builder = the_surface_builder(); | 365 | auto const surface_builder = the_surface_builder(); |
41 | 369 | geom::Size const display_size{display->view_area().size}; | 366 | geom::Size const display_size{display->view_area().size}; |
42 | 370 | uint32_t const surface_side{300}; | 367 | uint32_t const surface_side{300}; |
45 | 371 | geom::Size const surface_size{geom::Width{surface_side}, | 368 | geom::Size const surface_size{surface_side, surface_side}; |
44 | 372 | geom::Height{surface_side}}; | ||
46 | 373 | 369 | ||
47 | 374 | float const angular_step = 2.0 * M_PI / moveables.size(); | 370 | float const angular_step = 2.0 * M_PI / moveables.size(); |
48 | 375 | float const w = display_size.width.as_uint32_t(); | 371 | float const w = display_size.width.as_uint32_t(); |
49 | 376 | 372 | ||
50 | === modified file 'include/shared/mir/geometry/size.h' | |||
51 | --- include/shared/mir/geometry/size.h 2013-04-24 05:22:20 +0000 | |||
52 | +++ include/shared/mir/geometry/size.h 2013-07-12 11:57:23 +0000 | |||
53 | @@ -30,10 +30,11 @@ | |||
54 | 30 | struct Size | 30 | struct Size |
55 | 31 | { | 31 | { |
56 | 32 | Size() {} | 32 | Size() {} |
57 | 33 | Size(Size const&) = default; | ||
58 | 34 | Size& operator=(Size const&) = default; | ||
59 | 33 | 35 | ||
63 | 34 | Size(const Width& w, const Height& h) : width {w}, height {h} | 36 | template<typename WidthType, typename HeightType> |
64 | 35 | { | 37 | Size(WidthType&& width, HeightType&& height) : width(width), height(height) {} |
62 | 36 | } | ||
65 | 37 | 38 | ||
66 | 38 | Width width; | 39 | Width width; |
67 | 39 | Height height; | 40 | Height height; |
68 | 40 | 41 | ||
69 | === modified file 'include/test/mir_test_doubles/mock_input_info.h' | |||
70 | --- include/test/mir_test_doubles/mock_input_info.h 2013-07-10 17:06:37 +0000 | |||
71 | +++ include/test/mir_test_doubles/mock_input_info.h 2013-07-12 11:57:23 +0000 | |||
72 | @@ -39,7 +39,7 @@ | |||
73 | 39 | .WillByDefault( | 39 | .WillByDefault( |
74 | 40 | Return(geometry::Rectangle{ | 40 | Return(geometry::Rectangle{ |
75 | 41 | geometry::Point{}, | 41 | geometry::Point{}, |
77 | 42 | geometry::Size{geometry::Width{}, geometry::Height{}}})); | 42 | geometry::Size{}})); |
78 | 43 | static std::string n; | 43 | static std::string n; |
79 | 44 | ON_CALL(*this, name()) | 44 | ON_CALL(*this, name()) |
80 | 45 | .WillByDefault(testing::ReturnRef(n)); | 45 | .WillByDefault(testing::ReturnRef(n)); |
81 | 46 | 46 | ||
82 | === modified file 'include/test/mir_test_doubles/mock_surface_info.h' | |||
83 | --- include/test/mir_test_doubles/mock_surface_info.h 2013-07-10 17:06:37 +0000 | |||
84 | +++ include/test/mir_test_doubles/mock_surface_info.h 2013-07-12 11:57:23 +0000 | |||
85 | @@ -39,7 +39,7 @@ | |||
86 | 39 | .WillByDefault( | 39 | .WillByDefault( |
87 | 40 | Return(geometry::Rectangle{ | 40 | Return(geometry::Rectangle{ |
88 | 41 | geometry::Point{}, | 41 | geometry::Point{}, |
90 | 42 | geometry::Size{geometry::Width{}, geometry::Height{}}})); | 42 | geometry::Size{}})); |
91 | 43 | static std::string n; | 43 | static std::string n; |
92 | 44 | ON_CALL(*this, name()) | 44 | ON_CALL(*this, name()) |
93 | 45 | .WillByDefault(testing::ReturnRef(n)); | 45 | .WillByDefault(testing::ReturnRef(n)); |
94 | 46 | 46 | ||
95 | === modified file 'include/test/mir_test_doubles/stub_buffer.h' | |||
96 | --- include/test/mir_test_doubles/stub_buffer.h 2013-05-14 21:39:52 +0000 | |||
97 | +++ include/test/mir_test_doubles/stub_buffer.h 2013-07-12 11:57:23 +0000 | |||
98 | @@ -35,7 +35,7 @@ | |||
99 | 35 | { | 35 | { |
100 | 36 | public: | 36 | public: |
101 | 37 | StubBuffer() | 37 | StubBuffer() |
103 | 38 | : buf_size{geometry::Size{geometry::Width{0}, geometry::Height{0}}}, | 38 | : buf_size{0, 0}, |
104 | 39 | buf_pixel_format{geometry::PixelFormat::abgr_8888} | 39 | buf_pixel_format{geometry::PixelFormat::abgr_8888} |
105 | 40 | { | 40 | { |
106 | 41 | } | 41 | } |
107 | 42 | 42 | ||
108 | === modified file 'src/client/android/android_client_buffer.cpp' | |||
109 | --- src/client/android/android_client_buffer.cpp 2013-07-10 17:06:37 +0000 | |||
110 | +++ src/client/android/android_client_buffer.cpp 2013-07-12 11:57:23 +0000 | |||
111 | @@ -66,8 +66,7 @@ | |||
112 | 66 | 66 | ||
113 | 67 | geom::Size mcla::AndroidClientBuffer::size() const | 67 | geom::Size mcla::AndroidClientBuffer::size() const |
114 | 68 | { | 68 | { |
117 | 69 | return geom::Size{geom::Width{native_window_buffer->width}, | 69 | return {native_window_buffer->width, native_window_buffer->height}; |
116 | 70 | geom::Height{native_window_buffer->height}}; | ||
118 | 71 | } | 70 | } |
119 | 72 | 71 | ||
120 | 73 | geom::Stride mcla::AndroidClientBuffer::stride() const | 72 | geom::Stride mcla::AndroidClientBuffer::stride() const |
121 | 74 | 73 | ||
122 | === modified file 'src/server/graphics/android/buffer.cpp' | |||
123 | --- src/server/graphics/android/buffer.cpp 2013-06-14 19:30:20 +0000 | |||
124 | +++ src/server/graphics/android/buffer.cpp 2013-07-12 11:57:23 +0000 | |||
125 | @@ -51,8 +51,7 @@ | |||
126 | 51 | 51 | ||
127 | 52 | geom::Size mga::Buffer::size() const | 52 | geom::Size mga::Buffer::size() const |
128 | 53 | { | 53 | { |
131 | 54 | return geom::Size{geom::Width{native_buffer->width}, | 54 | return {native_buffer->width, native_buffer->height}; |
130 | 55 | geom::Height{native_buffer->height}}; | ||
132 | 56 | } | 55 | } |
133 | 57 | 56 | ||
134 | 58 | geom::Stride mga::Buffer::stride() const | 57 | geom::Stride mga::Buffer::stride() const |
135 | 59 | 58 | ||
136 | === modified file 'src/server/graphics/android/fb_device.cpp' | |||
137 | --- src/server/graphics/android/fb_device.cpp 2013-05-17 20:29:13 +0000 | |||
138 | +++ src/server/graphics/android/fb_device.cpp 2013-07-12 11:57:23 +0000 | |||
139 | @@ -50,8 +50,7 @@ | |||
140 | 50 | 50 | ||
141 | 51 | geom::Size mga::FBDevice::display_size() const | 51 | geom::Size mga::FBDevice::display_size() const |
142 | 52 | { | 52 | { |
145 | 53 | return geom::Size{geom::Width{fb_device->width}, | 53 | return {fb_device->width, fb_device->height}; |
144 | 54 | geom::Height{fb_device->height}}; | ||
146 | 55 | } | 54 | } |
147 | 56 | 55 | ||
148 | 57 | geom::PixelFormat mga::FBDevice::display_format() const | 56 | geom::PixelFormat mga::FBDevice::display_format() const |
149 | 58 | 57 | ||
150 | === modified file 'src/server/graphics/android/hwc11_device.cpp' | |||
151 | --- src/server/graphics/android/hwc11_device.cpp 2013-05-17 20:17:16 +0000 | |||
152 | +++ src/server/graphics/android/hwc11_device.cpp 2013-07-12 11:57:23 +0000 | |||
153 | @@ -60,7 +60,7 @@ | |||
154 | 60 | hwc_device->getDisplayAttributes(hwc_device.get(), HWC_DISPLAY_PRIMARY, primary_display_config, | 60 | hwc_device->getDisplayAttributes(hwc_device.get(), HWC_DISPLAY_PRIMARY, primary_display_config, |
155 | 61 | size_request, size_values); | 61 | size_request, size_values); |
156 | 62 | 62 | ||
158 | 63 | return geom::Size{geom::Width{size_values[0]}, geom::Height{size_values[1]}}; | 63 | return {size_values[0], size_values[1]}; |
159 | 64 | } | 64 | } |
160 | 65 | 65 | ||
161 | 66 | geom::PixelFormat mga::HWC11Device::display_format() const | 66 | geom::PixelFormat mga::HWC11Device::display_format() const |
162 | 67 | 67 | ||
163 | === modified file 'src/server/graphics/gbm/gbm_buffer.cpp' | |||
164 | --- src/server/graphics/gbm/gbm_buffer.cpp 2013-05-29 04:53:18 +0000 | |||
165 | +++ src/server/graphics/gbm/gbm_buffer.cpp 2013-07-12 11:57:23 +0000 | |||
166 | @@ -104,8 +104,7 @@ | |||
167 | 104 | 104 | ||
168 | 105 | geom::Size mgg::GBMBuffer::size() const | 105 | geom::Size mgg::GBMBuffer::size() const |
169 | 106 | { | 106 | { |
172 | 107 | return {geom::Width{gbm_bo_get_width(gbm_handle.get())}, | 107 | return {gbm_bo_get_width(gbm_handle.get()), gbm_bo_get_height(gbm_handle.get())}; |
171 | 108 | geom::Height{gbm_bo_get_height(gbm_handle.get())}}; | ||
173 | 109 | } | 108 | } |
174 | 110 | 109 | ||
175 | 111 | geom::Stride mgg::GBMBuffer::stride() const | 110 | geom::Stride mgg::GBMBuffer::stride() const |
176 | 112 | 111 | ||
177 | === modified file 'src/server/graphics/gbm/gbm_cursor.cpp' | |||
178 | --- src/server/graphics/gbm/gbm_cursor.cpp 2013-06-06 10:47:23 +0000 | |||
179 | +++ src/server/graphics/gbm/gbm_cursor.cpp 2013-07-12 11:57:23 +0000 | |||
180 | @@ -56,8 +56,7 @@ | |||
181 | 56 | current_position(), | 56 | current_position(), |
182 | 57 | buffer(*platform) | 57 | buffer(*platform) |
183 | 58 | { | 58 | { |
186 | 59 | set_image(black_arrow.pixel_data, | 59 | set_image(black_arrow.pixel_data, geometry::Size{width, height}); |
185 | 60 | geometry::Size{geometry::Width(width), geometry::Height(height)}); | ||
187 | 61 | 60 | ||
188 | 62 | show_at_last_known_position(); | 61 | show_at_last_known_position(); |
189 | 63 | } | 62 | } |
190 | @@ -69,7 +68,7 @@ | |||
191 | 69 | 68 | ||
192 | 70 | void mgg::GBMCursor::set_image(const void* raw_argb, geometry::Size size) | 69 | void mgg::GBMCursor::set_image(const void* raw_argb, geometry::Size size) |
193 | 71 | { | 70 | { |
195 | 72 | if (size != geometry::Size{geometry::Width(width), geometry::Height(height)}) | 71 | if (size != geometry::Size{width, height}) |
196 | 73 | BOOST_THROW_EXCEPTION(std::logic_error("No support for cursors that aren't 64x64")); | 72 | BOOST_THROW_EXCEPTION(std::logic_error("No support for cursors that aren't 64x64")); |
197 | 74 | 73 | ||
198 | 75 | auto const count = size.width.as_uint32_t() * size.height.as_uint32_t() * sizeof(uint32_t); | 74 | auto const count = size.width.as_uint32_t() * size.height.as_uint32_t() * sizeof(uint32_t); |
199 | 76 | 75 | ||
200 | === modified file 'src/server/graphics/gbm/kms_display_configuration.cpp' | |||
201 | --- src/server/graphics/gbm/kms_display_configuration.cpp 2013-07-10 16:55:22 +0000 | |||
202 | +++ src/server/graphics/gbm/kms_display_configuration.cpp 2013-07-12 11:57:23 +0000 | |||
203 | @@ -149,8 +149,7 @@ | |||
204 | 149 | { | 149 | { |
205 | 150 | DisplayConfigurationOutputId id{static_cast<int>(connector.connector_id)}; | 150 | DisplayConfigurationOutputId id{static_cast<int>(connector.connector_id)}; |
206 | 151 | DisplayConfigurationCardId card_id{0}; | 151 | DisplayConfigurationCardId card_id{0}; |
209 | 152 | geom::Size physical_size{geom::Width{connector.mmWidth}, | 152 | geom::Size physical_size{connector.mmWidth, connector.mmHeight}; |
208 | 153 | geom::Height{connector.mmHeight}}; | ||
210 | 154 | bool connected{connector.connection == DRM_MODE_CONNECTED}; | 153 | bool connected{connector.connection == DRM_MODE_CONNECTED}; |
211 | 155 | size_t current_mode_index{std::numeric_limits<size_t>::max()}; | 154 | size_t current_mode_index{std::numeric_limits<size_t>::max()}; |
212 | 156 | std::vector<DisplayConfigurationMode> modes; | 155 | std::vector<DisplayConfigurationMode> modes; |
213 | @@ -170,8 +169,7 @@ | |||
214 | 170 | { | 169 | { |
215 | 171 | drmModeModeInfo& mode_info = connector.modes[m]; | 170 | drmModeModeInfo& mode_info = connector.modes[m]; |
216 | 172 | 171 | ||
219 | 173 | geom::Size size{geom::Width{mode_info.hdisplay}, | 172 | geom::Size size{mode_info.hdisplay, mode_info.vdisplay}; |
218 | 174 | geom::Height{mode_info.vdisplay}}; | ||
220 | 175 | 173 | ||
221 | 176 | double vrefresh_hz = calculate_vrefresh_hz(mode_info); | 174 | double vrefresh_hz = calculate_vrefresh_hz(mode_info); |
222 | 177 | 175 | ||
223 | 178 | 176 | ||
224 | === modified file 'src/server/graphics/gbm/kms_output.cpp' | |||
225 | --- src/server/graphics/gbm/kms_output.cpp 2013-05-03 22:08:24 +0000 | |||
226 | +++ src/server/graphics/gbm/kms_output.cpp 2013-07-12 11:57:23 +0000 | |||
227 | @@ -132,7 +132,7 @@ | |||
228 | 132 | geom::Size mgg::KMSOutput::size() const | 132 | geom::Size mgg::KMSOutput::size() const |
229 | 133 | { | 133 | { |
230 | 134 | drmModeModeInfo const& mode(connector->modes[mode_index]); | 134 | drmModeModeInfo const& mode(connector->modes[mode_index]); |
232 | 135 | return geom::Size{geom::Width{mode.hdisplay}, geom::Height{mode.vdisplay}}; | 135 | return {mode.hdisplay, mode.vdisplay}; |
233 | 136 | } | 136 | } |
234 | 137 | 137 | ||
235 | 138 | bool mgg::KMSOutput::set_crtc(uint32_t fb_id) | 138 | bool mgg::KMSOutput::set_crtc(uint32_t fb_id) |
236 | 139 | 139 | ||
237 | === modified file 'src/server/shell/surface_creation_parameters.cpp' | |||
238 | --- src/server/shell/surface_creation_parameters.cpp 2013-05-21 17:16:43 +0000 | |||
239 | +++ src/server/shell/surface_creation_parameters.cpp 2013-07-12 11:57:23 +0000 | |||
240 | @@ -47,7 +47,7 @@ | |||
241 | 47 | geometry::Width::ValueType width, | 47 | geometry::Width::ValueType width, |
242 | 48 | geometry::Height::ValueType height) | 48 | geometry::Height::ValueType height) |
243 | 49 | { | 49 | { |
245 | 50 | return of_size(geometry::Size(geometry::Width(width), geometry::Height(height))); | 50 | return of_size({width, height}); |
246 | 51 | } | 51 | } |
247 | 52 | 52 | ||
248 | 53 | msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_position(geometry::Point const& new_top_left) | 53 | msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_position(geometry::Point const& new_top_left) |
249 | 54 | 54 | ||
250 | === modified file 'tests/acceptance-tests/test_client_input.cpp' | |||
251 | --- tests/acceptance-tests/test_client_input.cpp 2013-07-11 13:41:09 +0000 | |||
252 | +++ tests/acceptance-tests/test_client_input.cpp 2013-07-12 11:57:23 +0000 | |||
253 | @@ -477,17 +477,16 @@ | |||
254 | 477 | { | 477 | { |
255 | 478 | static GeometryList positions; | 478 | static GeometryList positions; |
256 | 479 | positions[test_client_1] = geom::Rectangle{geom::Point{0, 0}, | 479 | positions[test_client_1] = geom::Rectangle{geom::Point{0, 0}, |
258 | 480 | geom::Size{geom::Width{client_width}, geom::Height{client_height}}}; | 480 | geom::Size{client_width, client_height}}; |
259 | 481 | positions[test_client_2] = geom::Rectangle{geom::Point{screen_width/2, screen_height/2}, | 481 | positions[test_client_2] = geom::Rectangle{geom::Point{screen_width/2, screen_height/2}, |
261 | 482 | geom::Size{geom::Width{client_width}, geom::Height{client_height}}}; | 482 | geom::Size{client_width, client_height}}; |
262 | 483 | 483 | ||
263 | 484 | return std::make_shared<StaticPlacementStrategy>(positions); | 484 | return std::make_shared<StaticPlacementStrategy>(positions); |
264 | 485 | } | 485 | } |
265 | 486 | 486 | ||
266 | 487 | geom::Rectangle the_screen_geometry() override | 487 | geom::Rectangle the_screen_geometry() override |
267 | 488 | { | 488 | { |
270 | 489 | return geom::Rectangle{geom::Point{0, 0}, | 489 | return geom::Rectangle{geom::Point{0, 0}, geom::Size{screen_width, screen_height}}; |
269 | 490 | geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}}; | ||
271 | 491 | } | 490 | } |
272 | 492 | 491 | ||
273 | 493 | void inject_input() override | 492 | void inject_input() override |
274 | @@ -575,11 +574,11 @@ | |||
275 | 575 | static int const screen_height = 100; | 574 | static int const screen_height = 100; |
276 | 576 | 575 | ||
277 | 577 | static geom::Rectangle const screen_geometry{geom::Point{0, 0}, | 576 | static geom::Rectangle const screen_geometry{geom::Point{0, 0}, |
279 | 578 | geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}}; | 577 | geom::Size{screen_width, screen_height}}; |
280 | 579 | 578 | ||
281 | 580 | static std::initializer_list<geom::Rectangle> client_input_regions = { | 579 | static std::initializer_list<geom::Rectangle> client_input_regions = { |
284 | 581 | {geom::Point{0, 0}, {geom::Width{screen_width-80}, geom::Height{screen_height}}}, | 580 | {geom::Point{0, 0}, {screen_width-80, screen_height}}, |
285 | 582 | {geom::Point{screen_width-20, 0}, {geom::Width{screen_width-80}, geom::Height{screen_height}}} | 581 | {geom::Point{screen_width-20, 0}, {screen_width-80, screen_height}} |
286 | 583 | }; | 582 | }; |
287 | 584 | 583 | ||
288 | 585 | struct ServerConfiguration : mtf::InputTestingServerConfiguration | 584 | struct ServerConfiguration : mtf::InputTestingServerConfiguration |
289 | @@ -682,7 +681,7 @@ | |||
290 | 682 | static int const screen_height = 100; | 681 | static int const screen_height = 100; |
291 | 683 | 682 | ||
292 | 684 | static geom::Rectangle const screen_geometry{geom::Point{0, 0}, | 683 | static geom::Rectangle const screen_geometry{geom::Point{0, 0}, |
294 | 685 | geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}}; | 684 | geom::Size{screen_width, screen_height}}; |
295 | 686 | 685 | ||
296 | 687 | struct ServerConiguration : mtf::InputTestingServerConfiguration | 686 | struct ServerConiguration : mtf::InputTestingServerConfiguration |
297 | 688 | { | 687 | { |
298 | 689 | 688 | ||
299 | === modified file 'tests/acceptance-tests/test_surfaceloop.cpp' | |||
300 | --- tests/acceptance-tests/test_surfaceloop.cpp 2013-06-03 08:14:01 +0000 | |||
301 | +++ tests/acceptance-tests/test_surfaceloop.cpp 2013-07-12 11:57:23 +0000 | |||
302 | @@ -39,7 +39,7 @@ | |||
303 | 39 | { | 39 | { |
304 | 40 | char const* const mir_test_socket = mtf::test_socket_file().c_str(); | 40 | char const* const mir_test_socket = mtf::test_socket_file().c_str(); |
305 | 41 | 41 | ||
307 | 42 | geom::Size const size{geom::Width{640}, geom::Height{480}}; | 42 | geom::Size const size{640, 480}; |
308 | 43 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; | 43 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; |
309 | 44 | } | 44 | } |
310 | 45 | 45 | ||
311 | 46 | 46 | ||
312 | === modified file 'tests/integration-tests/client/test_client_render.cpp' | |||
313 | --- tests/integration-tests/client/test_client_render.cpp 2013-06-20 11:55:33 +0000 | |||
314 | +++ tests/integration-tests/client/test_client_render.cpp 2013-07-12 11:57:23 +0000 | |||
315 | @@ -448,7 +448,7 @@ | |||
316 | 448 | void SetUp() { | 448 | void SetUp() { |
317 | 449 | ASSERT_FALSE(mtd::is_surface_flinger_running()); | 449 | ASSERT_FALSE(mtd::is_surface_flinger_running()); |
318 | 450 | 450 | ||
320 | 451 | size = geom::Size{geom::Width{test_width}, geom::Height{test_height}}; | 451 | size = geom::Size{test_width, test_height}; |
321 | 452 | pf = geom::PixelFormat::abgr_8888; | 452 | pf = geom::PixelFormat::abgr_8888; |
322 | 453 | 453 | ||
323 | 454 | auto initializer = std::make_shared<mg::NullBufferInitializer>(); | 454 | auto initializer = std::make_shared<mg::NullBufferInitializer>(); |
324 | 455 | 455 | ||
325 | === modified file 'tests/integration-tests/compositor/test_buffer_stream.cpp' | |||
326 | --- tests/integration-tests/compositor/test_buffer_stream.cpp 2013-06-17 15:55:04 +0000 | |||
327 | +++ tests/integration-tests/compositor/test_buffer_stream.cpp 2013-07-12 11:57:23 +0000 | |||
328 | @@ -45,7 +45,7 @@ | |||
329 | 45 | 45 | ||
330 | 46 | std::shared_ptr<mc::Buffer> alloc_buffer(mc::BufferProperties const&) | 46 | std::shared_ptr<mc::Buffer> alloc_buffer(mc::BufferProperties const&) |
331 | 47 | { | 47 | { |
333 | 48 | mc::BufferProperties properties{geom::Size{geom::Width{id}, geom::Height{id}}, | 48 | mc::BufferProperties properties{geom::Size{id, id}, |
334 | 49 | geom::PixelFormat::abgr_8888, | 49 | geom::PixelFormat::abgr_8888, |
335 | 50 | mc::BufferUsage::hardware}; | 50 | mc::BufferUsage::hardware}; |
336 | 51 | ++id; | 51 | ++id; |
337 | @@ -72,7 +72,7 @@ | |||
338 | 72 | { | 72 | { |
339 | 73 | auto allocator = std::make_shared<StubBufferAllocator>(); | 73 | auto allocator = std::make_shared<StubBufferAllocator>(); |
340 | 74 | auto factory = std::make_shared<mc::SwapperFactory>(allocator); | 74 | auto factory = std::make_shared<mc::SwapperFactory>(allocator); |
342 | 75 | mc::BufferProperties properties{geom::Size{geom::Width{380}, geom::Height{210}}, | 75 | mc::BufferProperties properties{geom::Size{380, 210}, |
343 | 76 | geom::PixelFormat::abgr_8888, | 76 | geom::PixelFormat::abgr_8888, |
344 | 77 | mc::BufferUsage::hardware}; | 77 | mc::BufferUsage::hardware}; |
345 | 78 | 78 | ||
346 | 79 | 79 | ||
347 | === modified file 'tests/integration-tests/compositor/test_swapping_swappers.cpp' | |||
348 | --- tests/integration-tests/compositor/test_swapping_swappers.cpp 2013-06-11 19:55:10 +0000 | |||
349 | +++ tests/integration-tests/compositor/test_swapping_swappers.cpp 2013-07-12 11:57:23 +0000 | |||
350 | @@ -59,7 +59,7 @@ | |||
351 | 59 | { | 59 | { |
352 | 60 | auto allocator = std::make_shared<MockBufferAllocator>(); | 60 | auto allocator = std::make_shared<MockBufferAllocator>(); |
353 | 61 | auto factory = std::make_shared<mc::SwapperFactory>(allocator, 3); | 61 | auto factory = std::make_shared<mc::SwapperFactory>(allocator, 3); |
355 | 62 | auto properties = mc::BufferProperties{geom::Size{geom::Width{380}, geom::Height{210}}, | 62 | auto properties = mc::BufferProperties{geom::Size{380, 210}, |
356 | 63 | geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware}; | 63 | geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware}; |
357 | 64 | switching_bundle = std::make_shared<mc::SwitchingBundle>(factory, properties); | 64 | switching_bundle = std::make_shared<mc::SwitchingBundle>(factory, properties); |
358 | 65 | } | 65 | } |
359 | 66 | 66 | ||
360 | === modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp' | |||
361 | --- tests/integration-tests/graphics/android/test_buffer_integration.cpp 2013-06-11 00:05:53 +0000 | |||
362 | +++ tests/integration-tests/graphics/android/test_buffer_integration.cpp 2013-07-12 11:57:23 +0000 | |||
363 | @@ -42,8 +42,7 @@ | |||
364 | 42 | protected: | 42 | protected: |
365 | 43 | virtual void SetUp() | 43 | virtual void SetUp() |
366 | 44 | { | 44 | { |
369 | 45 | size = geom::Size{geom::Width{334}, | 45 | size = geom::Size{334, 122}; |
368 | 46 | geom::Height{122}}; | ||
370 | 47 | pf = geom::PixelFormat::abgr_8888; | 46 | pf = geom::PixelFormat::abgr_8888; |
371 | 48 | buffer_properties = mc::BufferProperties{size, pf, mc::BufferUsage::software}; | 47 | buffer_properties = mc::BufferProperties{size, pf, mc::BufferUsage::software}; |
372 | 49 | null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>(); | 48 | null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>(); |
373 | 50 | 49 | ||
374 | === modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp' | |||
375 | --- tests/integration-tests/graphics/android/test_internal_client.cpp 2013-07-03 22:07:12 +0000 | |||
376 | +++ tests/integration-tests/graphics/android/test_internal_client.cpp 2013-07-12 11:57:23 +0000 | |||
377 | @@ -76,8 +76,7 @@ | |||
378 | 76 | 76 | ||
379 | 77 | TEST_F(AndroidInternalClient, internal_client_creation_and_use) | 77 | TEST_F(AndroidInternalClient, internal_client_creation_and_use) |
380 | 78 | { | 78 | { |
383 | 79 | auto size = geom::Size{geom::Width{334}, | 79 | auto size = geom::Size{334, 122}; |
382 | 80 | geom::Height{122}}; | ||
384 | 81 | auto pf = geom::PixelFormat::abgr_8888; | 80 | auto pf = geom::PixelFormat::abgr_8888; |
385 | 82 | msh::SurfaceCreationParameters params; | 81 | msh::SurfaceCreationParameters params; |
386 | 83 | params.name = std::string("test"); | 82 | params.name = std::string("test"); |
387 | 84 | 83 | ||
388 | === modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp' | |||
389 | --- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp 2013-07-10 08:50:53 +0000 | |||
390 | +++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp 2013-07-12 11:57:23 +0000 | |||
391 | @@ -109,7 +109,7 @@ | |||
392 | 109 | display = platform->create_display(conf_policy); | 109 | display = platform->create_display(conf_policy); |
393 | 110 | auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>(); | 110 | auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>(); |
394 | 111 | allocator = platform->create_buffer_allocator(buffer_initializer); | 111 | allocator = platform->create_buffer_allocator(buffer_initializer); |
396 | 112 | size = geom::Size{geom::Width{100}, geom::Height{100}}; | 112 | size = geom::Size{100, 100}; |
397 | 113 | pf = geom::PixelFormat::abgr_8888; | 113 | pf = geom::PixelFormat::abgr_8888; |
398 | 114 | usage = mc::BufferUsage::hardware; | 114 | usage = mc::BufferUsage::hardware; |
399 | 115 | buffer_properties = mc::BufferProperties{size, pf, usage}; | 115 | buffer_properties = mc::BufferProperties{size, pf, usage}; |
400 | 116 | 116 | ||
401 | === modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp' | |||
402 | --- tests/integration-tests/input/android/test_android_cursor_listener.cpp 2013-07-01 17:01:15 +0000 | |||
403 | +++ tests/integration-tests/input/android/test_android_cursor_listener.cpp 2013-07-12 11:57:23 +0000 | |||
404 | @@ -72,7 +72,7 @@ | |||
405 | 72 | static const geom::Rectangle visible_rectangle | 72 | static const geom::Rectangle visible_rectangle |
406 | 73 | { | 73 | { |
407 | 74 | geom::Point(), | 74 | geom::Point(), |
409 | 75 | geom::Size{geom::Width(1024), geom::Height(1024)} | 75 | geom::Size{1024, 1024} |
410 | 76 | }; | 76 | }; |
411 | 77 | 77 | ||
412 | 78 | event_filter = std::make_shared<MockEventFilter>(); | 78 | event_filter = std::make_shared<MockEventFilter>(); |
413 | 79 | 79 | ||
414 | === modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp' | |||
415 | --- tests/integration-tests/input/android/test_android_input_manager.cpp 2013-07-05 21:27:14 +0000 | |||
416 | +++ tests/integration-tests/input/android/test_android_input_manager.cpp 2013-07-12 11:57:23 +0000 | |||
417 | @@ -64,9 +64,7 @@ | |||
418 | 64 | { | 64 | { |
419 | 65 | using namespace ::testing; | 65 | using namespace ::testing; |
420 | 66 | 66 | ||
424 | 67 | static const geom::Rectangle default_view_area = | 67 | static const geom::Rectangle default_view_area{geom::Point(), geom::Size{1600, 1400}}; |
422 | 68 | geom::Rectangle{geom::Point(), | ||
423 | 69 | geom::Size{geom::Width(1600), geom::Height(1400)}}; | ||
425 | 70 | 68 | ||
426 | 71 | static const std::shared_ptr<mi::CursorListener> null_cursor_listener{}; | 69 | static const std::shared_ptr<mi::CursorListener> null_cursor_listener{}; |
427 | 72 | 70 | ||
428 | 73 | 71 | ||
429 | === modified file 'tests/integration-tests/test_display_info.cpp' | |||
430 | --- tests/integration-tests/test_display_info.cpp 2013-07-10 08:50:53 +0000 | |||
431 | +++ tests/integration-tests/test_display_info.cpp 2013-07-12 11:57:23 +0000 | |||
432 | @@ -50,7 +50,7 @@ | |||
433 | 50 | }; | 50 | }; |
434 | 51 | 51 | ||
435 | 52 | geom::Rectangle const StubDisplay::rectangle{geom::Point{geom::X{25}, geom::Y{36}}, | 52 | geom::Rectangle const StubDisplay::rectangle{geom::Point{geom::X{25}, geom::Y{36}}, |
437 | 53 | geom::Size{geom::Width{49}, geom::Height{64}}}; | 53 | geom::Size{49, 64}}; |
438 | 54 | 54 | ||
439 | 55 | } | 55 | } |
440 | 56 | } | 56 | } |
441 | 57 | 57 | ||
442 | === modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp' | |||
443 | --- tests/integration-tests/test_surface_first_frame_sync.cpp 2013-06-28 12:00:04 +0000 | |||
444 | +++ tests/integration-tests/test_surface_first_frame_sync.cpp 2013-07-12 11:57:23 +0000 | |||
445 | @@ -105,8 +105,7 @@ | |||
446 | 105 | geom::Rectangle view_area() const | 105 | geom::Rectangle view_area() const |
447 | 106 | { | 106 | { |
448 | 107 | return geom::Rectangle{geom::Point(), | 107 | return geom::Rectangle{geom::Point(), |
451 | 108 | geom::Size{geom::Width(1600), | 108 | geom::Size{1600, 1600}}; |
450 | 109 | geom::Height(1600)}}; | ||
452 | 110 | } | 109 | } |
453 | 111 | void make_current() {} | 110 | void make_current() {} |
454 | 112 | void release_current() {} | 111 | void release_current() {} |
455 | 113 | 112 | ||
456 | === modified file 'tests/integration-tests/test_surfaceloop.cpp' | |||
457 | --- tests/integration-tests/test_surfaceloop.cpp 2013-07-10 08:50:53 +0000 | |||
458 | +++ tests/integration-tests/test_surfaceloop.cpp 2013-07-12 11:57:23 +0000 | |||
459 | @@ -50,7 +50,7 @@ | |||
460 | 50 | { | 50 | { |
461 | 51 | char const* const mir_test_socket = mtf::test_socket_file().c_str(); | 51 | char const* const mir_test_socket = mtf::test_socket_file().c_str(); |
462 | 52 | 52 | ||
464 | 53 | geom::Size const size{geom::Width{640}, geom::Height{480}}; | 53 | geom::Size const size{640, 480}; |
465 | 54 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; | 54 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; |
466 | 55 | mc::BufferUsage const usage{mc::BufferUsage::hardware}; | 55 | mc::BufferUsage const usage{mc::BufferUsage::hardware}; |
467 | 56 | mc::BufferProperties const buffer_properties{size, format, usage}; | 56 | mc::BufferProperties const buffer_properties{size, format, usage}; |
468 | @@ -97,8 +97,7 @@ | |||
469 | 97 | geom::Rectangle view_area() const override | 97 | geom::Rectangle view_area() const override |
470 | 98 | { | 98 | { |
471 | 99 | return geom::Rectangle{geom::Point(), | 99 | return geom::Rectangle{geom::Point(), |
474 | 100 | geom::Size{geom::Width(1600), | 100 | geom::Size{1600, 1600}}; |
473 | 101 | geom::Height(1600)}}; | ||
475 | 102 | } | 101 | } |
476 | 103 | }; | 102 | }; |
477 | 104 | 103 | ||
478 | 105 | 104 | ||
479 | === modified file 'tests/mir_test_doubles/mock_drm.cpp' | |||
480 | --- tests/mir_test_doubles/mock_drm.cpp 2013-07-04 07:51:30 +0000 | |||
481 | +++ tests/mir_test_doubles/mock_drm.cpp 2013-07-12 11:57:23 +0000 | |||
482 | @@ -65,7 +65,7 @@ | |||
483 | 65 | modes_empty, connector_encoder_ids, geom::Size()); | 65 | modes_empty, connector_encoder_ids, geom::Size()); |
484 | 66 | add_connector(connector1_id, DRM_MODE_CONNECTED, encoder1_id, | 66 | add_connector(connector1_id, DRM_MODE_CONNECTED, encoder1_id, |
485 | 67 | modes, connector_encoder_ids, | 67 | modes, connector_encoder_ids, |
487 | 68 | geom::Size{geom::Width{121}, geom::Height{144}}); | 68 | geom::Size{121, 144}); |
488 | 69 | 69 | ||
489 | 70 | prepare(); | 70 | prepare(); |
490 | 71 | } | 71 | } |
491 | 72 | 72 | ||
492 | === modified file 'tests/mir_test_framework/input_testing_server_options.cpp' | |||
493 | --- tests/mir_test_framework/input_testing_server_options.cpp 2013-07-10 17:06:37 +0000 | |||
494 | +++ tests/mir_test_framework/input_testing_server_options.cpp 2013-07-12 11:57:23 +0000 | |||
495 | @@ -181,8 +181,7 @@ | |||
496 | 181 | 181 | ||
497 | 182 | geom::Rectangle mtf::InputTestingServerConfiguration::the_screen_geometry() | 182 | geom::Rectangle mtf::InputTestingServerConfiguration::the_screen_geometry() |
498 | 183 | { | 183 | { |
501 | 184 | static geom::Rectangle const default_geometry{geom::Point{0, 0}, | 184 | static geom::Rectangle const default_geometry{geom::Point{0, 0}, geom::Size{1600, 1600}}; |
500 | 185 | geom::Size{geom::Width{1600}, geom::Height{1600}}}; | ||
502 | 186 | return default_geometry; | 185 | return default_geometry; |
503 | 187 | } | 186 | } |
504 | 188 | 187 | ||
505 | 189 | 188 | ||
506 | === modified file 'tests/mir_test_framework/testing_server_options.cpp' | |||
507 | --- tests/mir_test_framework/testing_server_options.cpp 2013-07-10 08:50:53 +0000 | |||
508 | +++ tests/mir_test_framework/testing_server_options.cpp 2013-07-12 11:57:23 +0000 | |||
509 | @@ -71,9 +71,7 @@ | |||
510 | 71 | public: | 71 | public: |
511 | 72 | geom::Rectangle view_area() const override | 72 | geom::Rectangle view_area() const override |
512 | 73 | { | 73 | { |
516 | 74 | return geom::Rectangle{geom::Point(), | 74 | return geom::Rectangle{geom::Point(), geom::Size{1600, 1600}}; |
514 | 75 | geom::Size{geom::Width(1600), | ||
515 | 76 | geom::Height(1600)}}; | ||
517 | 77 | } | 75 | } |
518 | 78 | }; | 76 | }; |
519 | 79 | 77 | ||
520 | 80 | 78 | ||
521 | === modified file 'tests/unit-tests/client/android/test_client_android_registrar.cpp' | |||
522 | --- tests/unit-tests/client/android/test_client_android_registrar.cpp 2013-07-04 22:33:02 +0000 | |||
523 | +++ tests/unit-tests/client/android/test_client_android_registrar.cpp 2013-07-12 11:57:23 +0000 | |||
524 | @@ -103,7 +103,7 @@ | |||
525 | 103 | auto t = geom::X(top); | 103 | auto t = geom::X(top); |
526 | 104 | auto l = geom::Y(left); | 104 | auto l = geom::Y(left); |
527 | 105 | auto pt = geom::Point{t,l}; | 105 | auto pt = geom::Point{t,l}; |
529 | 106 | rect = geom::Rectangle{ pt, {geom::Width(width), geom::Height(height)}}; | 106 | rect = geom::Rectangle{ pt, {width, height}}; |
530 | 107 | package = std::make_shared<MirBufferPackage>(); | 107 | package = std::make_shared<MirBufferPackage>(); |
531 | 108 | package->fd_items = 4; | 108 | package->fd_items = 4; |
532 | 109 | package->data_items = 21; | 109 | package->data_items = 21; |
533 | @@ -214,7 +214,7 @@ | |||
534 | 214 | auto t = geom::X(top); | 214 | auto t = geom::X(top); |
535 | 215 | auto l = geom::Y(left); | 215 | auto l = geom::Y(left); |
536 | 216 | auto pt = geom::Point{t,l}; | 216 | auto pt = geom::Point{t,l}; |
538 | 217 | rect = geom::Rectangle{ pt, {geom::Width(width), geom::Height(height)}}; | 217 | rect = geom::Rectangle{ pt, {width, height}}; |
539 | 218 | fake_package = std::make_shared<native_handle_t>(); | 218 | fake_package = std::make_shared<native_handle_t>(); |
540 | 219 | } | 219 | } |
541 | 220 | 220 | ||
542 | 221 | 221 | ||
543 | === modified file 'tests/unit-tests/compositor/test_buffer_properties.cpp' | |||
544 | --- tests/unit-tests/compositor/test_buffer_properties.cpp 2012-12-19 16:01:00 +0000 | |||
545 | +++ tests/unit-tests/compositor/test_buffer_properties.cpp 2013-07-12 11:57:23 +0000 | |||
546 | @@ -39,7 +39,7 @@ | |||
547 | 39 | 39 | ||
548 | 40 | TEST(buffer_properties, custom_create) | 40 | TEST(buffer_properties, custom_create) |
549 | 41 | { | 41 | { |
551 | 42 | geom::Size size{geom::Width{66}, geom::Height{166}}; | 42 | geom::Size size{66, 166}; |
552 | 43 | geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888}; | 43 | geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888}; |
553 | 44 | mc::BufferUsage usage{mc::BufferUsage::hardware}; | 44 | mc::BufferUsage usage{mc::BufferUsage::hardware}; |
554 | 45 | 45 | ||
555 | @@ -52,7 +52,7 @@ | |||
556 | 52 | 52 | ||
557 | 53 | TEST(buffer_properties, equal_properties_test_equal) | 53 | TEST(buffer_properties, equal_properties_test_equal) |
558 | 54 | { | 54 | { |
560 | 55 | geom::Size size{geom::Width{66}, geom::Height{166}}; | 55 | geom::Size size{66, 166}; |
561 | 56 | geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888}; | 56 | geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888}; |
562 | 57 | mc::BufferUsage usage{mc::BufferUsage::hardware}; | 57 | mc::BufferUsage usage{mc::BufferUsage::hardware}; |
563 | 58 | 58 | ||
564 | 59 | 59 | ||
565 | === modified file 'tests/unit-tests/compositor/test_buffer_stream.cpp' | |||
566 | --- tests/unit-tests/compositor/test_buffer_stream.cpp 2013-06-19 18:33:24 +0000 | |||
567 | +++ tests/unit-tests/compositor/test_buffer_stream.cpp 2013-07-12 11:57:23 +0000 | |||
568 | @@ -45,7 +45,7 @@ | |||
569 | 45 | 45 | ||
570 | 46 | TEST_F(BufferStreamTest, size_query) | 46 | TEST_F(BufferStreamTest, size_query) |
571 | 47 | { | 47 | { |
573 | 48 | geom::Size size{geom::Width{4},geom::Height{5}}; | 48 | geom::Size size{4, 5}; |
574 | 49 | mc::BufferProperties properties {size, geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware}; | 49 | mc::BufferProperties properties {size, geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware}; |
575 | 50 | EXPECT_CALL(*mock_bundle, properties()) | 50 | EXPECT_CALL(*mock_bundle, properties()) |
576 | 51 | .Times(1) | 51 | .Times(1) |
577 | @@ -59,8 +59,7 @@ | |||
578 | 59 | TEST_F(BufferStreamTest, pixel_format_query) | 59 | TEST_F(BufferStreamTest, pixel_format_query) |
579 | 60 | { | 60 | { |
580 | 61 | geom::PixelFormat format{geom::PixelFormat::abgr_8888}; | 61 | geom::PixelFormat format{geom::PixelFormat::abgr_8888}; |
583 | 62 | mc::BufferProperties properties {geom::Size{geom::Width{4},geom::Height{5}}, | 62 | mc::BufferProperties properties {geom::Size{4, 5}, format, mc::BufferUsage::hardware}; |
582 | 63 | format, mc::BufferUsage::hardware}; | ||
584 | 64 | EXPECT_CALL(*mock_bundle, properties()) | 63 | EXPECT_CALL(*mock_bundle, properties()) |
585 | 65 | .Times(1) | 64 | .Times(1) |
586 | 66 | .WillOnce(testing::Return(properties)); | 65 | .WillOnce(testing::Return(properties)); |
587 | 67 | 66 | ||
588 | === modified file 'tests/unit-tests/compositor/test_swapper_factory.cpp' | |||
589 | --- tests/unit-tests/compositor/test_swapper_factory.cpp 2013-06-17 19:11:59 +0000 | |||
590 | +++ tests/unit-tests/compositor/test_swapper_factory.cpp 2013-07-12 11:57:23 +0000 | |||
591 | @@ -33,7 +33,7 @@ | |||
592 | 33 | 33 | ||
593 | 34 | namespace | 34 | namespace |
594 | 35 | { | 35 | { |
596 | 36 | static geom::Size const buf_size{geom::Width{100}, geom::Height{121}}; | 36 | static geom::Size const buf_size{100, 121}; |
597 | 37 | static geom::PixelFormat const buf_pixel_format{geom::PixelFormat::xbgr_8888}; | 37 | static geom::PixelFormat const buf_pixel_format{geom::PixelFormat::xbgr_8888}; |
598 | 38 | 38 | ||
599 | 39 | class MockGraphicBufferAllocator : public mc::GraphicBufferAllocator | 39 | class MockGraphicBufferAllocator : public mc::GraphicBufferAllocator |
600 | @@ -56,7 +56,7 @@ | |||
601 | 56 | { | 56 | { |
602 | 57 | SwapperFactoryTest() | 57 | SwapperFactoryTest() |
603 | 58 | : mock_buffer_allocator{std::make_shared<testing::NiceMock<MockGraphicBufferAllocator>>()}, | 58 | : mock_buffer_allocator{std::make_shared<testing::NiceMock<MockGraphicBufferAllocator>>()}, |
605 | 59 | size{geom::Width{10},geom::Height{20}}, | 59 | size{10, 20}, |
606 | 60 | pf{geom::PixelFormat::abgr_8888}, | 60 | pf{geom::PixelFormat::abgr_8888}, |
607 | 61 | usage{mc::BufferUsage::hardware}, | 61 | usage{mc::BufferUsage::hardware}, |
608 | 62 | properties{size, pf, usage} | 62 | properties{size, pf, usage} |
609 | 63 | 63 | ||
610 | === modified file 'tests/unit-tests/compositor/test_switching_bundle.cpp' | |||
611 | --- tests/unit-tests/compositor/test_switching_bundle.cpp 2013-06-14 00:08:30 +0000 | |||
612 | +++ tests/unit-tests/compositor/test_switching_bundle.cpp 2013-07-12 11:57:23 +0000 | |||
613 | @@ -37,7 +37,7 @@ | |||
614 | 37 | mock_default_swapper = std::make_shared<testing::NiceMock<mtd::MockSwapper>>(); | 37 | mock_default_swapper = std::make_shared<testing::NiceMock<mtd::MockSwapper>>(); |
615 | 38 | mock_secondary_swapper = std::make_shared<testing::NiceMock<mtd::MockSwapper>>(); | 38 | mock_secondary_swapper = std::make_shared<testing::NiceMock<mtd::MockSwapper>>(); |
616 | 39 | stub_buffer = std::make_shared<mtd::StubBuffer>(); | 39 | stub_buffer = std::make_shared<mtd::StubBuffer>(); |
618 | 40 | properties = mc::BufferProperties{geom::Size{geom::Width{4}, geom::Height{2}}, | 40 | properties = mc::BufferProperties{geom::Size{4, 2}, |
619 | 41 | geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware}; | 41 | geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware}; |
620 | 42 | 42 | ||
621 | 43 | ON_CALL(*mock_swapper_factory, create_swapper_new_buffers(_,_,_)) | 43 | ON_CALL(*mock_swapper_factory, create_swapper_new_buffers(_,_,_)) |
622 | @@ -54,7 +54,7 @@ | |||
623 | 54 | TEST_F(SwitchingBundleTest, sync_swapper_by_default) | 54 | TEST_F(SwitchingBundleTest, sync_swapper_by_default) |
624 | 55 | { | 55 | { |
625 | 56 | using namespace testing; | 56 | using namespace testing; |
627 | 57 | auto actual_properties = mc::BufferProperties{geom::Size{geom::Width{7}, geom::Height{8}}, | 57 | auto actual_properties = mc::BufferProperties{geom::Size{7, 8}, |
628 | 58 | geom::PixelFormat::argb_8888, mc::BufferUsage::software}; | 58 | geom::PixelFormat::argb_8888, mc::BufferUsage::software}; |
629 | 59 | EXPECT_CALL(*mock_swapper_factory, create_swapper_new_buffers(_,_,mc::SwapperType::synchronous)) | 59 | EXPECT_CALL(*mock_swapper_factory, create_swapper_new_buffers(_,_,mc::SwapperType::synchronous)) |
630 | 60 | .Times(1) | 60 | .Times(1) |
631 | 61 | 61 | ||
632 | === modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp' | |||
633 | --- tests/unit-tests/compositor/test_temporary_buffers.cpp 2013-06-18 09:44:11 +0000 | |||
634 | +++ tests/unit-tests/compositor/test_temporary_buffers.cpp 2013-07-12 11:57:23 +0000 | |||
635 | @@ -51,7 +51,7 @@ | |||
636 | 51 | { | 51 | { |
637 | 52 | public: | 52 | public: |
638 | 53 | TemporaryBuffersTest() | 53 | TemporaryBuffersTest() |
640 | 54 | : buffer_size{geom::Width{1024}, geom::Height{768}}, | 54 | : buffer_size{1024, 768}, |
641 | 55 | buffer_stride{1024}, | 55 | buffer_stride{1024}, |
642 | 56 | buffer_pixel_format{geom::PixelFormat::abgr_8888}, | 56 | buffer_pixel_format{geom::PixelFormat::abgr_8888}, |
643 | 57 | mock_buffer{std::make_shared<testing::NiceMock<mtd::MockBuffer>>( | 57 | mock_buffer{std::make_shared<testing::NiceMock<mtd::MockBuffer>>( |
644 | 58 | 58 | ||
645 | === modified file 'tests/unit-tests/geometry/test-rectangle.cpp' | |||
646 | --- tests/unit-tests/geometry/test-rectangle.cpp 2013-03-21 03:32:59 +0000 | |||
647 | +++ tests/unit-tests/geometry/test-rectangle.cpp 2013-07-12 11:57:23 +0000 | |||
648 | @@ -27,7 +27,7 @@ | |||
649 | 27 | { | 27 | { |
650 | 28 | using namespace geom; | 28 | using namespace geom; |
651 | 29 | Point const x3y9{X(3), Y(9)}; | 29 | Point const x3y9{X(3), Y(9)}; |
653 | 30 | Size const w2h4{Width(2), Height(4)}; | 30 | Size const w2h4{2, 4}; |
654 | 31 | Rectangle const rect{x3y9, w2h4}; | 31 | Rectangle const rect{x3y9, w2h4}; |
655 | 32 | 32 | ||
656 | 33 | EXPECT_EQ(x3y9, rect.top_left); | 33 | EXPECT_EQ(x3y9, rect.top_left); |
657 | 34 | 34 | ||
658 | === modified file 'tests/unit-tests/geometry/test-size.cpp' | |||
659 | --- tests/unit-tests/geometry/test-size.cpp 2012-09-18 09:44:45 +0000 | |||
660 | +++ tests/unit-tests/geometry/test-size.cpp 2013-07-12 11:57:23 +0000 | |||
661 | @@ -26,7 +26,7 @@ | |||
662 | 26 | TEST(geometry, size) | 26 | TEST(geometry, size) |
663 | 27 | { | 27 | { |
664 | 28 | using namespace geom; | 28 | using namespace geom; |
666 | 29 | Size const size2x4{Width(2), Height(4)}; | 29 | Size const size2x4{2, 4}; |
667 | 30 | 30 | ||
668 | 31 | EXPECT_EQ(Width(2), size2x4.width); | 31 | EXPECT_EQ(Width(2), size2x4.width); |
669 | 32 | EXPECT_EQ(Height(4), size2x4.height); | 32 | EXPECT_EQ(Height(4), size2x4.height); |
670 | 33 | 33 | ||
671 | === modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp' | |||
672 | --- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp 2013-06-18 20:06:22 +0000 | |||
673 | +++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp 2013-07-12 11:57:23 +0000 | |||
674 | @@ -48,7 +48,7 @@ | |||
675 | 48 | alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device); | 48 | alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device); |
676 | 49 | 49 | ||
677 | 50 | pf = geom::PixelFormat::abgr_8888; | 50 | pf = geom::PixelFormat::abgr_8888; |
679 | 51 | size = geom::Size{geom::Width{300}, geom::Height{200}}; | 51 | size = geom::Size{300, 200}; |
680 | 52 | usage = mga::BufferUsage::use_hardware; | 52 | usage = mga::BufferUsage::use_hardware; |
681 | 53 | } | 53 | } |
682 | 54 | 54 | ||
683 | 55 | 55 | ||
684 | === modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp' | |||
685 | --- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp 2013-06-14 18:20:39 +0000 | |||
686 | +++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp 2013-07-12 11:57:23 +0000 | |||
687 | @@ -93,7 +93,7 @@ | |||
688 | 93 | 93 | ||
689 | 94 | auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>(); | 94 | auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>(); |
690 | 95 | 95 | ||
692 | 96 | mc::BufferProperties properties{geom::Size{geom::Width{2}, geom::Height{2}}, | 96 | mc::BufferProperties properties{geom::Size{2, 2}, |
693 | 97 | geom::PixelFormat::abgr_8888, | 97 | geom::PixelFormat::abgr_8888, |
694 | 98 | mc::BufferUsage::hardware}; | 98 | mc::BufferUsage::hardware}; |
695 | 99 | mga::AndroidGraphicBufferAllocator allocator{buffer_initializer}; | 99 | mga::AndroidGraphicBufferAllocator allocator{buffer_initializer}; |
696 | @@ -110,7 +110,7 @@ | |||
697 | 110 | auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>(); | 110 | auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>(); |
698 | 111 | 111 | ||
699 | 112 | mga::AndroidGraphicBufferAllocator allocator{buffer_initializer}; | 112 | mga::AndroidGraphicBufferAllocator allocator{buffer_initializer}; |
701 | 113 | auto size = geom::Size{geom::Width{2}, geom::Height{2}}; | 113 | auto size = geom::Size{2, 2}; |
702 | 114 | auto pf = geom::PixelFormat::abgr_8888; | 114 | auto pf = geom::PixelFormat::abgr_8888; |
703 | 115 | 115 | ||
704 | 116 | EXPECT_CALL(*buffer_initializer, operator_call(_)) | 116 | EXPECT_CALL(*buffer_initializer, operator_call(_)) |
705 | 117 | 117 | ||
706 | === modified file 'tests/unit-tests/graphics/android/test_buffer.cpp' | |||
707 | --- tests/unit-tests/graphics/android/test_buffer.cpp 2013-06-14 17:26:03 +0000 | |||
708 | +++ tests/unit-tests/graphics/android/test_buffer.cpp 2013-07-12 11:57:23 +0000 | |||
709 | @@ -45,7 +45,7 @@ | |||
710 | 45 | 45 | ||
711 | 46 | default_use = mga::BufferUsage::use_hardware; | 46 | default_use = mga::BufferUsage::use_hardware; |
712 | 47 | pf = geom::PixelFormat::abgr_8888; | 47 | pf = geom::PixelFormat::abgr_8888; |
714 | 48 | size = geom::Size{geom::Width{300}, geom::Height{200}}; | 48 | size = geom::Size{300, 200}; |
715 | 49 | extensions = std::make_shared<mg::EGLExtensions>(); | 49 | extensions = std::make_shared<mg::EGLExtensions>(); |
716 | 50 | } | 50 | } |
717 | 51 | 51 | ||
718 | @@ -63,8 +63,7 @@ | |||
719 | 63 | 63 | ||
720 | 64 | mga::Buffer buffer(mock_buffer_handle, extensions); | 64 | mga::Buffer buffer(mock_buffer_handle, extensions); |
721 | 65 | 65 | ||
724 | 66 | geom::Size expected_size{geom::Width{mock_buffer_handle->width}, | 66 | geom::Size expected_size{mock_buffer_handle->width, mock_buffer_handle->height}; |
723 | 67 | geom::Height{mock_buffer_handle->height}}; | ||
725 | 68 | EXPECT_EQ(expected_size, buffer.size()); | 67 | EXPECT_EQ(expected_size, buffer.size()); |
726 | 69 | } | 68 | } |
727 | 70 | 69 | ||
728 | 71 | 70 | ||
729 | === modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp' | |||
730 | --- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp 2013-06-14 17:44:22 +0000 | |||
731 | +++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp 2013-07-12 11:57:23 +0000 | |||
732 | @@ -38,7 +38,7 @@ | |||
733 | 38 | using namespace testing; | 38 | using namespace testing; |
734 | 39 | 39 | ||
735 | 40 | stub_buffer = std::make_shared<ANativeWindowBuffer>(); | 40 | stub_buffer = std::make_shared<ANativeWindowBuffer>(); |
737 | 41 | size = geom::Size{geom::Width{300}, geom::Height{220}}; | 41 | size = geom::Size{300, 220}; |
738 | 42 | pf = geom::PixelFormat::abgr_8888; | 42 | pf = geom::PixelFormat::abgr_8888; |
739 | 43 | extensions = std::make_shared<mg::EGLExtensions>(); | 43 | extensions = std::make_shared<mg::EGLExtensions>(); |
740 | 44 | 44 | ||
741 | 45 | 45 | ||
742 | === modified file 'tests/unit-tests/graphics/android/test_framebuffer_factory.cpp' | |||
743 | --- tests/unit-tests/graphics/android/test_framebuffer_factory.cpp 2013-05-24 15:44:11 +0000 | |||
744 | +++ tests/unit-tests/graphics/android/test_framebuffer_factory.cpp 2013-07-12 11:57:23 +0000 | |||
745 | @@ -59,7 +59,7 @@ | |||
746 | 59 | ON_CALL(*mock_display_info_provider, display_format()) | 59 | ON_CALL(*mock_display_info_provider, display_format()) |
747 | 60 | .WillByDefault(Return(geom::PixelFormat::abgr_8888)); | 60 | .WillByDefault(Return(geom::PixelFormat::abgr_8888)); |
748 | 61 | ON_CALL(*mock_display_info_provider, display_size()) | 61 | ON_CALL(*mock_display_info_provider, display_size()) |
750 | 62 | .WillByDefault(Return(geom::Size{geom::Width{2}, geom::Height{3}})); | 62 | .WillByDefault(Return(geom::Size{2, 3})); |
751 | 63 | ON_CALL(*mock_display_info_provider, number_of_framebuffers_available()) | 63 | ON_CALL(*mock_display_info_provider, number_of_framebuffers_available()) |
752 | 64 | .WillByDefault(Return(fake_fb_num)); | 64 | .WillByDefault(Return(fake_fb_num)); |
753 | 65 | ON_CALL(*mock_buffer_allocator, alloc_buffer_platform(_,_,_)) | 65 | ON_CALL(*mock_buffer_allocator, alloc_buffer_platform(_,_,_)) |
754 | 66 | 66 | ||
755 | === modified file 'tests/unit-tests/graphics/android/test_hwc10_device.cpp' | |||
756 | --- tests/unit-tests/graphics/android/test_hwc10_device.cpp 2013-05-17 20:43:23 +0000 | |||
757 | +++ tests/unit-tests/graphics/android/test_hwc10_device.cpp 2013-07-12 11:57:23 +0000 | |||
758 | @@ -36,7 +36,7 @@ | |||
759 | 36 | virtual void SetUp() | 36 | virtual void SetUp() |
760 | 37 | { | 37 | { |
761 | 38 | using namespace testing; | 38 | using namespace testing; |
763 | 39 | test_size = geom::Size{geom::Width{88}, geom::Height{4}}; | 39 | test_size = geom::Size{88, 4}; |
764 | 40 | test_pf = geom::PixelFormat::abgr_8888; | 40 | test_pf = geom::PixelFormat::abgr_8888; |
765 | 41 | test_numfb = 558u; | 41 | test_numfb = 558u; |
766 | 42 | mock_device = std::make_shared<testing::NiceMock<mtd::MockHWCComposerDevice1>>(); | 42 | mock_device = std::make_shared<testing::NiceMock<mtd::MockHWCComposerDevice1>>(); |
767 | 43 | 43 | ||
768 | === modified file 'tests/unit-tests/graphics/android/test_hwc_display.cpp' | |||
769 | --- tests/unit-tests/graphics/android/test_hwc_display.cpp 2013-05-22 06:30:39 +0000 | |||
770 | +++ tests/unit-tests/graphics/android/test_hwc_display.cpp 2013-07-12 11:57:23 +0000 | |||
771 | @@ -70,7 +70,7 @@ | |||
772 | 70 | { | 70 | { |
773 | 71 | using namespace testing; | 71 | using namespace testing; |
774 | 72 | 72 | ||
776 | 73 | geom::Size fake_display_size{geom::Width{223}, geom::Height{332}}; | 73 | geom::Size fake_display_size{223, 332}; |
777 | 74 | EXPECT_CALL(*mock_hwc_device, display_size()) | 74 | EXPECT_CALL(*mock_hwc_device, display_size()) |
778 | 75 | .Times(1) | 75 | .Times(1) |
779 | 76 | .WillOnce(Return(fake_display_size)); | 76 | .WillOnce(Return(fake_display_size)); |
780 | 77 | 77 | ||
781 | === modified file 'tests/unit-tests/graphics/android/test_hwc_layerlist.cpp' | |||
782 | --- tests/unit-tests/graphics/android/test_hwc_layerlist.cpp 2013-05-02 00:34:03 +0000 | |||
783 | +++ tests/unit-tests/graphics/android/test_hwc_layerlist.cpp 2013-07-12 11:57:23 +0000 | |||
784 | @@ -35,8 +35,7 @@ | |||
785 | 35 | 35 | ||
786 | 36 | width = 432; | 36 | width = 432; |
787 | 37 | height = 876; | 37 | height = 876; |
790 | 38 | default_size = geom::Size{geom::Width{width}, | 38 | default_size = geom::Size{width, height}; |
789 | 39 | geom::Height{height}}; | ||
791 | 40 | 39 | ||
792 | 41 | stub_handle_1 = std::make_shared<ANativeWindowBuffer>(); | 40 | stub_handle_1 = std::make_shared<ANativeWindowBuffer>(); |
793 | 42 | stub_handle_2 = std::make_shared<ANativeWindowBuffer>(); | 41 | stub_handle_2 = std::make_shared<ANativeWindowBuffer>(); |
794 | @@ -66,11 +65,11 @@ | |||
795 | 66 | EXPECT_EQ(nullptr, layer.visibleRegionScreen.rects); | 65 | EXPECT_EQ(nullptr, layer.visibleRegionScreen.rects); |
796 | 67 | 66 | ||
797 | 68 | geom::Rectangle r0{geom::Point{geom::X{0},geom::Y{1}}, | 67 | geom::Rectangle r0{geom::Point{geom::X{0},geom::Y{1}}, |
799 | 69 | geom::Size{geom::Width{2},geom::Height{3}}}; | 68 | geom::Size{2, 3}}; |
800 | 70 | geom::Rectangle r1{geom::Point{geom::X{0},geom::Y{1}}, | 69 | geom::Rectangle r1{geom::Point{geom::X{0},geom::Y{1}}, |
802 | 71 | geom::Size{geom::Width{3},geom::Height{3}}}; | 70 | geom::Size{3, 3}}; |
803 | 72 | geom::Rectangle r2{geom::Point{geom::X{1},geom::Y{1}}, | 71 | geom::Rectangle r2{geom::Point{geom::X{1},geom::Y{1}}, |
805 | 73 | geom::Size{geom::Width{2},geom::Height{3}}}; | 72 | geom::Size{2, 3}}; |
806 | 74 | mga::HWCRect a(r0), b(r1), c(r2); | 73 | mga::HWCRect a(r0), b(r1), c(r2); |
807 | 75 | mga::HWCDefaultLayer original2({a, b, c}); | 74 | mga::HWCDefaultLayer original2({a, b, c}); |
808 | 76 | layer = original2; | 75 | layer = original2; |
809 | 77 | 76 | ||
810 | === modified file 'tests/unit-tests/graphics/android/test_internal_client.cpp' | |||
811 | --- tests/unit-tests/graphics/android/test_internal_client.cpp 2013-06-25 05:42:49 +0000 | |||
812 | +++ tests/unit-tests/graphics/android/test_internal_client.cpp 2013-07-12 11:57:23 +0000 | |||
813 | @@ -37,7 +37,7 @@ | |||
814 | 37 | } | 37 | } |
815 | 38 | geom::Size size() const | 38 | geom::Size size() const |
816 | 39 | { | 39 | { |
818 | 40 | return geom::Size{geom::Width{4},geom::Height{2}}; | 40 | return {4, 2}; |
819 | 41 | } | 41 | } |
820 | 42 | geom::PixelFormat pixel_format() const | 42 | geom::PixelFormat pixel_format() const |
821 | 43 | { | 43 | { |
822 | 44 | 44 | ||
823 | === modified file 'tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp' | |||
824 | --- tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp 2013-06-25 05:42:49 +0000 | |||
825 | +++ tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp 2013-07-12 11:57:23 +0000 | |||
826 | @@ -52,7 +52,7 @@ | |||
827 | 52 | void SetUp() | 52 | void SetUp() |
828 | 53 | { | 53 | { |
829 | 54 | using namespace testing; | 54 | using namespace testing; |
831 | 55 | sz = geom::Size{geom::Width{4}, geom::Height{23}}; | 55 | sz = geom::Size{4, 23}; |
832 | 56 | pf = geom::PixelFormat::abgr_8888; | 56 | pf = geom::PixelFormat::abgr_8888; |
833 | 57 | mock_cache = std::make_shared<mtd::MockInterpreterResourceCache>(); | 57 | mock_cache = std::make_shared<mtd::MockInterpreterResourceCache>(); |
834 | 58 | mock_surface = std::make_shared<MockSurface>(); | 58 | mock_surface = std::make_shared<MockSurface>(); |
835 | 59 | 59 | ||
836 | === modified file 'tests/unit-tests/graphics/android/test_server_interpreter.cpp' | |||
837 | --- tests/unit-tests/graphics/android/test_server_interpreter.cpp 2013-05-16 19:43:56 +0000 | |||
838 | +++ tests/unit-tests/graphics/android/test_server_interpreter.cpp 2013-07-12 11:57:23 +0000 | |||
839 | @@ -180,7 +180,7 @@ | |||
840 | 180 | TEST_F(ServerRenderWindowTest, driver_inquires_about_size_without_having_been_set) | 180 | TEST_F(ServerRenderWindowTest, driver_inquires_about_size_without_having_been_set) |
841 | 181 | { | 181 | { |
842 | 182 | using namespace testing; | 182 | using namespace testing; |
844 | 183 | auto test_size = geom::Size{geom::Width{4}, geom::Height{5}}; | 183 | geom::Size test_size{4, 5}; |
845 | 184 | EXPECT_CALL(*mock_display_poster, display_size()) | 184 | EXPECT_CALL(*mock_display_poster, display_size()) |
846 | 185 | .Times(4) | 185 | .Times(4) |
847 | 186 | .WillRepeatedly(Return(test_size)); | 186 | .WillRepeatedly(Return(test_size)); |
848 | 187 | 187 | ||
849 | === modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp' | |||
850 | --- tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp 2013-07-01 06:53:02 +0000 | |||
851 | +++ tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp 2013-07-12 11:57:23 +0000 | |||
852 | @@ -56,7 +56,7 @@ | |||
853 | 56 | 56 | ||
854 | 57 | fake_devices.add_standard_drm_devices(); | 57 | fake_devices.add_standard_drm_devices(); |
855 | 58 | 58 | ||
857 | 59 | size = geom::Size{geom::Width{300}, geom::Height{200}}; | 59 | size = geom::Size{300, 200}; |
858 | 60 | pf = geom::PixelFormat::argb_8888; | 60 | pf = geom::PixelFormat::argb_8888; |
859 | 61 | stride = geom::Stride{4 * size.width.as_uint32_t()}; | 61 | stride = geom::Stride{4 * size.width.as_uint32_t()}; |
860 | 62 | usage = mc::BufferUsage::hardware; | 62 | usage = mc::BufferUsage::hardware; |
861 | 63 | 63 | ||
862 | === modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp' | |||
863 | --- tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp 2013-07-01 06:53:02 +0000 | |||
864 | +++ tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp 2013-07-12 11:57:23 +0000 | |||
865 | @@ -54,7 +54,7 @@ | |||
866 | 54 | 54 | ||
867 | 55 | fake_devices.add_standard_drm_devices(); | 55 | fake_devices.add_standard_drm_devices(); |
868 | 56 | 56 | ||
870 | 57 | size = geom::Size{geom::Width{300}, geom::Height{200}}; | 57 | size = geom::Size{300, 200}; |
871 | 58 | pf = geom::PixelFormat::argb_8888; | 58 | pf = geom::PixelFormat::argb_8888; |
872 | 59 | usage = mc::BufferUsage::hardware; | 59 | usage = mc::BufferUsage::hardware; |
873 | 60 | buffer_properties = mc::BufferProperties{size, pf, usage}; | 60 | buffer_properties = mc::BufferProperties{size, pf, usage}; |
874 | 61 | 61 | ||
875 | === modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp' | |||
876 | --- tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp 2013-07-10 08:50:53 +0000 | |||
877 | +++ tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp 2013-07-12 11:57:23 +0000 | |||
878 | @@ -49,7 +49,7 @@ | |||
879 | 49 | 49 | ||
880 | 50 | mg::DisplayConfigurationMode conf_mode_from_drm_mode(drmModeModeInfo const& mode) | 50 | mg::DisplayConfigurationMode conf_mode_from_drm_mode(drmModeModeInfo const& mode) |
881 | 51 | { | 51 | { |
883 | 52 | geom::Size const size{geom::Width{mode.hdisplay}, geom::Height{mode.vdisplay}}; | 52 | geom::Size const size{mode.hdisplay, mode.vdisplay}; |
884 | 53 | double vrefresh_hz{0.0}; | 53 | double vrefresh_hz{0.0}; |
885 | 54 | 54 | ||
886 | 55 | /* Calculate vertical refresh rate from DRM mode information */ | 55 | /* Calculate vertical refresh rate from DRM mode information */ |
887 | @@ -141,7 +141,7 @@ | |||
888 | 141 | uint32_t const connector0_id{30}; | 141 | uint32_t const connector0_id{30}; |
889 | 142 | uint32_t const connector1_id{31}; | 142 | uint32_t const connector1_id{31}; |
890 | 143 | uint32_t const connector2_id{32}; | 143 | uint32_t const connector2_id{32}; |
892 | 144 | geom::Size const connector0_physical_size_mm{geom::Width{480}, geom::Height{270}}; | 144 | geom::Size const connector0_physical_size_mm{480, 270}; |
893 | 145 | geom::Size const connector1_physical_size_mm{}; | 145 | geom::Size const connector1_physical_size_mm{}; |
894 | 146 | geom::Size const connector2_physical_size_mm{}; | 146 | geom::Size const connector2_physical_size_mm{}; |
895 | 147 | std::vector<uint32_t> possible_encoder_ids_empty; | 147 | std::vector<uint32_t> possible_encoder_ids_empty; |
896 | @@ -309,10 +309,10 @@ | |||
897 | 309 | std::vector<uint32_t> const encoder_ids{20, 21}; | 309 | std::vector<uint32_t> const encoder_ids{20, 21}; |
898 | 310 | std::vector<uint32_t> const connector_ids{30, 31}; | 310 | std::vector<uint32_t> const connector_ids{30, 31}; |
899 | 311 | std::vector<geom::Size> const connector_physical_sizes_mm_before{ | 311 | std::vector<geom::Size> const connector_physical_sizes_mm_before{ |
901 | 312 | {geom::Width{480}, geom::Height{270}}, {} | 312 | {480, 270}, {} |
902 | 313 | }; | 313 | }; |
903 | 314 | std::vector<geom::Size> const connector_physical_sizes_mm_after{ | 314 | std::vector<geom::Size> const connector_physical_sizes_mm_after{ |
905 | 315 | {}, {geom::Width{512}, geom::Height{642}} | 315 | {}, {512, 642} |
906 | 316 | }; | 316 | }; |
907 | 317 | std::vector<uint32_t> possible_encoder_ids_empty; | 317 | std::vector<uint32_t> possible_encoder_ids_empty; |
908 | 318 | uint32_t const possible_crtcs_mask_empty{0}; | 318 | uint32_t const possible_crtcs_mask_empty{0}; |
909 | 319 | 319 | ||
910 | === modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp' | |||
911 | --- tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp 2013-07-10 08:50:53 +0000 | |||
912 | +++ tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp 2013-07-12 11:57:23 +0000 | |||
913 | @@ -100,7 +100,7 @@ | |||
914 | 100 | modes0.push_back(mtd::FakeDRMResources::create_mode(1680, 1050, 119000, 1840, 1080)); | 100 | modes0.push_back(mtd::FakeDRMResources::create_mode(1680, 1050, 119000, 1840, 1080)); |
915 | 101 | modes0.push_back(mtd::FakeDRMResources::create_mode(832, 624, 57284, 1152, 667)); | 101 | modes0.push_back(mtd::FakeDRMResources::create_mode(832, 624, 57284, 1152, 667)); |
916 | 102 | 102 | ||
918 | 103 | geom::Size const connector_physical_size_mm{geom::Width{1597}, geom::Height{987}}; | 103 | geom::Size const connector_physical_size_mm{1597, 987}; |
919 | 104 | 104 | ||
920 | 105 | resources.reset(); | 105 | resources.reset(); |
921 | 106 | 106 | ||
922 | 107 | 107 | ||
923 | === modified file 'tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp' | |||
924 | --- tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp 2013-06-25 05:42:49 +0000 | |||
925 | +++ tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp 2013-07-12 11:57:23 +0000 | |||
926 | @@ -146,8 +146,7 @@ | |||
927 | 146 | { | 146 | { |
928 | 147 | using namespace ::testing; | 147 | using namespace ::testing; |
929 | 148 | 148 | ||
932 | 149 | geom::Size const test_surface_size = geom::Size{geom::Width{17}, | 149 | geom::Size const test_surface_size{17, 29}; |
931 | 150 | geom::Height{29}}; | ||
933 | 151 | geom::PixelFormat const test_pixel_format = geom::PixelFormat::xrgb_8888; | 150 | geom::PixelFormat const test_pixel_format = geom::PixelFormat::xrgb_8888; |
934 | 152 | EXPECT_CALL(*mock_surface, size()) | 151 | EXPECT_CALL(*mock_surface, size()) |
935 | 153 | .Times(1) | 152 | .Times(1) |
936 | 154 | 153 | ||
937 | === modified file 'tests/unit-tests/graphics/test_default_display_configuration_policy.cpp' | |||
938 | --- tests/unit-tests/graphics/test_default_display_configuration_policy.cpp 2013-07-10 08:50:53 +0000 | |||
939 | +++ tests/unit-tests/graphics/test_default_display_configuration_policy.cpp 2013-07-12 11:57:23 +0000 | |||
940 | @@ -40,11 +40,11 @@ | |||
941 | 40 | mg::DisplayConfigurationOutputId{10}, | 40 | mg::DisplayConfigurationOutputId{10}, |
942 | 41 | card_id, | 41 | card_id, |
943 | 42 | { | 42 | { |
947 | 43 | {geom::Size{geom::Width{123}, geom::Height{111}}, 59.9}, | 43 | {geom::Size{123, 111}, 59.9}, |
948 | 44 | {geom::Size{geom::Width{123}, geom::Height{111}}, 59.9}, | 44 | {geom::Size{123, 111}, 59.9}, |
949 | 45 | {geom::Size{geom::Width{123}, geom::Height{111}}, 59.9} | 45 | {geom::Size{123, 111}, 59.9} |
950 | 46 | }, | 46 | }, |
952 | 47 | geom::Size{geom::Width{324}, geom::Height{642}}, | 47 | geom::Size{324, 642}, |
953 | 48 | true, | 48 | true, |
954 | 49 | false, | 49 | false, |
955 | 50 | geom::Point{geom::X{123}, geom::Y{343}}, | 50 | geom::Point{geom::X{123}, geom::Y{343}}, |
956 | @@ -56,7 +56,7 @@ | |||
957 | 56 | mg::DisplayConfigurationOutputId{11}, | 56 | mg::DisplayConfigurationOutputId{11}, |
958 | 57 | card_id, | 57 | card_id, |
959 | 58 | {}, | 58 | {}, |
961 | 59 | geom::Size{geom::Width{566}, geom::Height{111}}, | 59 | geom::Size{566, 111}, |
962 | 60 | true, | 60 | true, |
963 | 61 | false, | 61 | false, |
964 | 62 | geom::Point(), | 62 | geom::Point(), |
965 | @@ -68,9 +68,9 @@ | |||
966 | 68 | mg::DisplayConfigurationOutputId{12}, | 68 | mg::DisplayConfigurationOutputId{12}, |
967 | 69 | card_id, | 69 | card_id, |
968 | 70 | { | 70 | { |
970 | 71 | {geom::Size{geom::Width{523}, geom::Height{555}}, 60.0}, | 71 | {geom::Size{523, 555}, 60.0}, |
971 | 72 | }, | 72 | }, |
973 | 73 | geom::Size{geom::Width{324}, geom::Height{642}}, | 73 | geom::Size{324, 642}, |
974 | 74 | true, | 74 | true, |
975 | 75 | false, | 75 | false, |
976 | 76 | geom::Point(), | 76 | geom::Point(), |
977 | @@ -82,7 +82,7 @@ | |||
978 | 82 | mg::DisplayConfigurationOutputId{13}, | 82 | mg::DisplayConfigurationOutputId{13}, |
979 | 83 | card_id, | 83 | card_id, |
980 | 84 | {}, | 84 | {}, |
982 | 85 | geom::Size{geom::Width{324}, geom::Height{642}}, | 85 | geom::Size{324, 642}, |
983 | 86 | false, | 86 | false, |
984 | 87 | false, | 87 | false, |
985 | 88 | geom::Point(), | 88 | geom::Point(), |
986 | 89 | 89 | ||
987 | === modified file 'tests/unit-tests/graphics/test_display_configuration.cpp' | |||
988 | --- tests/unit-tests/graphics/test_display_configuration.cpp 2013-07-10 08:50:53 +0000 | |||
989 | +++ tests/unit-tests/graphics/test_display_configuration.cpp 2013-07-12 11:57:23 +0000 | |||
990 | @@ -31,11 +31,11 @@ | |||
991 | 31 | mg::DisplayConfigurationOutputId{3}, | 31 | mg::DisplayConfigurationOutputId{3}, |
992 | 32 | mg::DisplayConfigurationCardId{2}, | 32 | mg::DisplayConfigurationCardId{2}, |
993 | 33 | { | 33 | { |
997 | 34 | {geom::Size{geom::Width{10}, geom::Height{20}}, 60.0}, | 34 | {geom::Size{10, 20}, 60.0}, |
998 | 35 | {geom::Size{geom::Width{10}, geom::Height{20}}, 59.0}, | 35 | {geom::Size{10, 20}, 59.0}, |
999 | 36 | {geom::Size{geom::Width{15}, geom::Height{20}}, 59.0} | 36 | {geom::Size{15, 20}, 59.0} |
1000 | 37 | }, | 37 | }, |
1002 | 38 | geom::Size{geom::Width{10}, geom::Height{20}}, | 38 | geom::Size{10, 20}, |
1003 | 39 | true, | 39 | true, |
1004 | 40 | true, | 40 | true, |
1005 | 41 | geom::Point(), | 41 | geom::Point(), |
1006 | @@ -46,7 +46,7 @@ | |||
1007 | 46 | 46 | ||
1008 | 47 | TEST(DisplayConfiguration, mode_equality) | 47 | TEST(DisplayConfiguration, mode_equality) |
1009 | 48 | { | 48 | { |
1011 | 49 | geom::Size const size{geom::Width{10}, geom::Height{20}}; | 49 | geom::Size const size{10, 20}; |
1012 | 50 | double const vrefresh{59.9}; | 50 | double const vrefresh{59.9}; |
1013 | 51 | 51 | ||
1014 | 52 | mg::DisplayConfigurationMode const mode1{size, vrefresh}; | 52 | mg::DisplayConfigurationMode const mode1{size, vrefresh}; |
1015 | @@ -59,8 +59,8 @@ | |||
1016 | 59 | 59 | ||
1017 | 60 | TEST(DisplayConfiguration, mode_inequality) | 60 | TEST(DisplayConfiguration, mode_inequality) |
1018 | 61 | { | 61 | { |
1021 | 62 | geom::Size const size1{geom::Width{10}, geom::Height{20}}; | 62 | geom::Size const size1{10, 20}; |
1022 | 63 | geom::Size const size2{geom::Width{10}, geom::Height{21}}; | 63 | geom::Size const size2{10, 21}; |
1023 | 64 | double const vrefresh1{59.9}; | 64 | double const vrefresh1{59.9}; |
1024 | 65 | double const vrefresh2{60.0}; | 65 | double const vrefresh2{60.0}; |
1025 | 66 | 66 | ||
1026 | @@ -111,14 +111,14 @@ | |||
1027 | 111 | 111 | ||
1028 | 112 | std::vector<mg::DisplayConfigurationMode> const modes2 | 112 | std::vector<mg::DisplayConfigurationMode> const modes2 |
1029 | 113 | { | 113 | { |
1033 | 114 | {geom::Size{geom::Width{10}, geom::Height{20}}, 60.0}, | 114 | {geom::Size{10, 20}, 60.0}, |
1034 | 115 | {geom::Size{geom::Width{10}, geom::Height{20}}, 59.9}, | 115 | {geom::Size{10, 20}, 59.9}, |
1035 | 116 | {geom::Size{geom::Width{15}, geom::Height{20}}, 59.0} | 116 | {geom::Size{15, 20}, 59.0} |
1036 | 117 | }; | 117 | }; |
1037 | 118 | std::vector<mg::DisplayConfigurationMode> const modes3 | 118 | std::vector<mg::DisplayConfigurationMode> const modes3 |
1038 | 119 | { | 119 | { |
1041 | 120 | {geom::Size{geom::Width{10}, geom::Height{20}}, 60.0}, | 120 | {geom::Size{10, 20}, 60.0}, |
1042 | 121 | {geom::Size{geom::Width{10}, geom::Height{20}}, 59.0} | 121 | {geom::Size{10, 20}, 59.0} |
1043 | 122 | }; | 122 | }; |
1044 | 123 | 123 | ||
1045 | 124 | output2.modes = modes2; | 124 | output2.modes = modes2; |
1046 | @@ -137,7 +137,7 @@ | |||
1047 | 137 | mg::DisplayConfigurationOutput const output1 = tmpl_output; | 137 | mg::DisplayConfigurationOutput const output1 = tmpl_output; |
1048 | 138 | mg::DisplayConfigurationOutput output2 = tmpl_output; | 138 | mg::DisplayConfigurationOutput output2 = tmpl_output; |
1049 | 139 | 139 | ||
1051 | 140 | geom::Size const physical_size2{geom::Width{11}, geom::Height{20}}; | 140 | geom::Size const physical_size2{11, 20}; |
1052 | 141 | 141 | ||
1053 | 142 | output2.physical_size_mm = physical_size2; | 142 | output2.physical_size_mm = physical_size2; |
1054 | 143 | 143 | ||
1055 | 144 | 144 | ||
1056 | === modified file 'tests/unit-tests/graphics/test_gl_pixel_buffer.cpp' | |||
1057 | --- tests/unit-tests/graphics/test_gl_pixel_buffer.cpp 2013-06-26 03:03:27 +0000 | |||
1058 | +++ tests/unit-tests/graphics/test_gl_pixel_buffer.cpp 2013-07-12 11:57:23 +0000 | |||
1059 | @@ -60,8 +60,7 @@ | |||
1060 | 60 | using namespace testing; | 60 | using namespace testing; |
1061 | 61 | 61 | ||
1062 | 62 | ON_CALL(mock_buffer, size()) | 62 | ON_CALL(mock_buffer, size()) |
1065 | 63 | .WillByDefault(Return(geom::Size{geom::Width{100}, | 63 | .WillByDefault(Return(geom::Size{100, 100})); |
1064 | 64 | geom::Height{100}})); | ||
1066 | 65 | } | 64 | } |
1067 | 66 | 65 | ||
1068 | 67 | testing::NiceMock<mtd::MockGL> mock_gl; | 66 | testing::NiceMock<mtd::MockGL> mock_gl; |
1069 | 68 | 67 | ||
1070 | === modified file 'tests/unit-tests/graphics/test_graphics_platform.cpp' | |||
1071 | --- tests/unit-tests/graphics/test_graphics_platform.cpp 2013-07-02 05:03:20 +0000 | |||
1072 | +++ tests/unit-tests/graphics/test_graphics_platform.cpp 2013-07-12 11:57:23 +0000 | |||
1073 | @@ -126,7 +126,7 @@ | |||
1074 | 126 | 126 | ||
1075 | 127 | ASSERT_NE(0u, supported_pixel_formats.size()); | 127 | ASSERT_NE(0u, supported_pixel_formats.size()); |
1076 | 128 | 128 | ||
1078 | 129 | geom::Size size{geom::Width{320}, geom::Height{240}}; | 129 | geom::Size size{320, 240}; |
1079 | 130 | geom::PixelFormat const pf{supported_pixel_formats[0]}; | 130 | geom::PixelFormat const pf{supported_pixel_formats[0]}; |
1080 | 131 | mc::BufferUsage usage{mc::BufferUsage::hardware}; | 131 | mc::BufferUsage usage{mc::BufferUsage::hardware}; |
1081 | 132 | mc::BufferProperties buffer_properties{size, pf, usage}; | 132 | mc::BufferProperties buffer_properties{size, pf, usage}; |
1082 | 133 | 133 | ||
1083 | === modified file 'tests/unit-tests/input/android/test_android_input_manager.cpp' | |||
1084 | --- tests/unit-tests/input/android/test_android_input_manager.cpp 2013-07-03 22:07:12 +0000 | |||
1085 | +++ tests/unit-tests/input/android/test_android_input_manager.cpp 2013-07-12 11:57:23 +0000 | |||
1086 | @@ -100,8 +100,7 @@ | |||
1087 | 100 | using namespace ::testing; | 100 | using namespace ::testing; |
1088 | 101 | 101 | ||
1089 | 102 | const geom::Rectangle default_view_area = | 102 | const geom::Rectangle default_view_area = |
1092 | 103 | geom::Rectangle{geom::Point(), | 103 | geom::Rectangle{geom::Point(), geom::Size{1600, 1400}}; |
1091 | 104 | geom::Size{geom::Width(1600), geom::Height(1400)}}; | ||
1093 | 105 | 104 | ||
1094 | 106 | 105 | ||
1095 | 107 | ON_CALL(view_area, view_area()) | 106 | ON_CALL(view_area, view_area()) |
1096 | 108 | 107 | ||
1097 | === modified file 'tests/unit-tests/input/android/test_android_input_reader_policy.cpp' | |||
1098 | --- tests/unit-tests/input/android/test_android_input_reader_policy.cpp 2013-03-13 08:09:52 +0000 | |||
1099 | +++ tests/unit-tests/input/android/test_android_input_reader_policy.cpp 2013-07-12 11:57:23 +0000 | |||
1100 | @@ -33,8 +33,7 @@ | |||
1101 | 33 | namespace mtd = mir::test::doubles; | 33 | namespace mtd = mir::test::doubles; |
1102 | 34 | 34 | ||
1103 | 35 | static geom::Rectangle const default_view_area = geom::Rectangle{geom::Point(), | 35 | static geom::Rectangle const default_view_area = geom::Rectangle{geom::Point(), |
1106 | 36 | geom::Size{geom::Width(1600), | 36 | geom::Size{1600, 1400}}; |
1105 | 37 | geom::Height(1400)}}; | ||
1107 | 38 | 37 | ||
1108 | 39 | namespace | 38 | namespace |
1109 | 40 | { | 39 | { |
1110 | 41 | 40 | ||
1111 | === modified file 'tests/unit-tests/input/android/test_android_input_window_handle.cpp' | |||
1112 | --- tests/unit-tests/input/android/test_android_input_window_handle.cpp 2013-07-05 21:27:14 +0000 | |||
1113 | +++ tests/unit-tests/input/android/test_android_input_window_handle.cpp 2013-07-12 11:57:23 +0000 | |||
1114 | @@ -60,8 +60,7 @@ | |||
1115 | 60 | { | 60 | { |
1116 | 61 | using namespace ::testing; | 61 | using namespace ::testing; |
1117 | 62 | 62 | ||
1120 | 63 | geom::Size const default_surface_size = geom::Size{geom::Width{256}, | 63 | geom::Size const default_surface_size{256, 256}; |
1119 | 64 | geom::Height{256}}; | ||
1121 | 65 | geom::Point const default_surface_top_left = geom::Point{geom::X{10}, geom::Y{10}}; | 64 | geom::Point const default_surface_top_left = geom::Point{geom::X{10}, geom::Y{10}}; |
1122 | 66 | std::string const testing_surface_name = "Test"; | 65 | std::string const testing_surface_name = "Test"; |
1123 | 67 | 66 | ||
1124 | 68 | 67 | ||
1125 | === modified file 'tests/unit-tests/input/android/test_android_pointer_controller.cpp' | |||
1126 | --- tests/unit-tests/input/android/test_android_pointer_controller.cpp 2013-03-13 08:09:52 +0000 | |||
1127 | +++ tests/unit-tests/input/android/test_android_pointer_controller.cpp 2013-07-12 11:57:23 +0000 | |||
1128 | @@ -36,8 +36,7 @@ | |||
1129 | 36 | namespace mtd = mir::test::doubles; | 36 | namespace mtd = mir::test::doubles; |
1130 | 37 | 37 | ||
1131 | 38 | static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(), | 38 | static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(), |
1134 | 39 | geom::Size{geom::Width(1600), | 39 | geom::Size{1600, 1400}}; |
1133 | 40 | geom::Height(1400)}}; | ||
1135 | 41 | 40 | ||
1136 | 42 | namespace | 41 | namespace |
1137 | 43 | { | 42 | { |
1138 | 44 | 43 | ||
1139 | === modified file 'tests/unit-tests/input/test_input_surface_info.cpp' | |||
1140 | --- tests/unit-tests/input/test_input_surface_info.cpp 2013-07-05 23:36:24 +0000 | |||
1141 | +++ tests/unit-tests/input/test_input_surface_info.cpp 2013-07-12 11:57:23 +0000 | |||
1142 | @@ -41,7 +41,7 @@ | |||
1143 | 41 | } | 41 | } |
1144 | 42 | 42 | ||
1145 | 43 | geom::Point primitive_pt{geom::X{1}, geom::Y{1}}; | 43 | geom::Point primitive_pt{geom::X{1}, geom::Y{1}}; |
1147 | 44 | geom::Size primitive_sz{geom::Width{1}, geom::Height{1}}; | 44 | geom::Size primitive_sz{1, 1}; |
1148 | 45 | geom::Rectangle primitive_rect{primitive_pt, primitive_sz}; | 45 | geom::Rectangle primitive_rect{primitive_pt, primitive_sz}; |
1149 | 46 | mtd::MockSurfaceInfo primitive_info; | 46 | mtd::MockSurfaceInfo primitive_info; |
1150 | 47 | }; | 47 | }; |
1151 | @@ -89,8 +89,8 @@ | |||
1152 | 89 | TEST_F(InputSurfaceInfo, set_input_region) | 89 | TEST_F(InputSurfaceInfo, set_input_region) |
1153 | 90 | { | 90 | { |
1154 | 91 | std::vector<geom::Rectangle> const rectangles = { | 91 | std::vector<geom::Rectangle> const rectangles = { |
1157 | 92 | {{geom::X{0}, geom::Y{0}}, {geom::Width{1}, geom::Height{1}}}, //region0 | 92 | {{geom::X{0}, geom::Y{0}}, geom::Size{1, 1}}, //region0 |
1158 | 93 | {{geom::X{1}, geom::Y{1}}, {geom::Width{1}, geom::Height{1}}} //region1 | 93 | {{geom::X{1}, geom::Y{1}}, geom::Size{1, 1}} //region1 |
1159 | 94 | }; | 94 | }; |
1160 | 95 | 95 | ||
1161 | 96 | mi::SurfaceDataStorage input_info(mt::fake_shared(primitive_info)); | 96 | mi::SurfaceDataStorage input_info(mt::fake_shared(primitive_info)); |
1162 | 97 | 97 | ||
1163 | === modified file 'tests/unit-tests/shell/test_consuming_placement_strategy.cpp' | |||
1164 | --- tests/unit-tests/shell/test_consuming_placement_strategy.cpp 2013-05-21 17:16:43 +0000 | |||
1165 | +++ tests/unit-tests/shell/test_consuming_placement_strategy.cpp 2013-07-12 11:57:23 +0000 | |||
1166 | @@ -31,8 +31,7 @@ | |||
1167 | 31 | namespace | 31 | namespace |
1168 | 32 | { | 32 | { |
1169 | 33 | static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(), | 33 | static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(), |
1172 | 34 | geom::Size{geom::Width(1600), | 34 | geom::Size{1600, 1600}}; |
1171 | 35 | geom::Height(1600)}}; | ||
1173 | 36 | 35 | ||
1174 | 37 | struct ConsumingPlacementStrategySetup : public testing::Test | 36 | struct ConsumingPlacementStrategySetup : public testing::Test |
1175 | 38 | { | 37 | { |
1176 | @@ -66,7 +65,7 @@ | |||
1177 | 66 | { | 65 | { |
1178 | 67 | using namespace ::testing; | 66 | using namespace ::testing; |
1179 | 68 | 67 | ||
1181 | 69 | const geom::Size requested_size = geom::Size{geom::Width{100}, geom::Height{100}}; | 68 | const geom::Size requested_size = geom::Size{100, 100}; |
1182 | 70 | 69 | ||
1183 | 71 | EXPECT_CALL(*viewable_area, view_area()).Times(1); | 70 | EXPECT_CALL(*viewable_area, view_area()).Times(1); |
1184 | 72 | 71 | ||
1185 | 73 | 72 | ||
1186 | === modified file 'tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp' | |||
1187 | --- tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp 2013-07-01 06:36:33 +0000 | |||
1188 | +++ tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp 2013-07-12 11:57:23 +0000 | |||
1189 | @@ -67,7 +67,7 @@ | |||
1190 | 67 | using namespace testing; | 67 | using namespace testing; |
1191 | 68 | 68 | ||
1192 | 69 | void const* pixels{reinterpret_cast<void*>(0xabcd)}; | 69 | void const* pixels{reinterpret_cast<void*>(0xabcd)}; |
1194 | 70 | geom::Size size{geom::Width{10}, geom::Height{11}}; | 70 | geom::Size size{10, 11}; |
1195 | 71 | geom::Stride stride{123}; | 71 | geom::Stride stride{123}; |
1196 | 72 | 72 | ||
1197 | 73 | MockPixelBuffer pixel_buffer; | 73 | MockPixelBuffer pixel_buffer; |
1198 | 74 | 74 | ||
1199 | === modified file 'tests/unit-tests/surfaces/test_surface.cpp' | |||
1200 | --- tests/unit-tests/surfaces/test_surface.cpp 2013-07-08 17:04:31 +0000 | |||
1201 | +++ tests/unit-tests/surfaces/test_surface.cpp 2013-07-12 11:57:23 +0000 | |||
1202 | @@ -68,7 +68,7 @@ | |||
1203 | 68 | TEST(SurfaceCreationParametersTest, builder_mutators) | 68 | TEST(SurfaceCreationParametersTest, builder_mutators) |
1204 | 69 | { | 69 | { |
1205 | 70 | using namespace geom; | 70 | using namespace geom; |
1207 | 71 | Size const size{Width{1024}, Height{768}}; | 71 | Size const size{1024, 768}; |
1208 | 72 | mc::BufferUsage const usage{mc::BufferUsage::hardware}; | 72 | mc::BufferUsage const usage{mc::BufferUsage::hardware}; |
1209 | 73 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; | 73 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; |
1210 | 74 | std::string name{"surface"}; | 74 | std::string name{"surface"}; |
1211 | @@ -87,7 +87,7 @@ | |||
1212 | 87 | TEST(SurfaceCreationParametersTest, equality) | 87 | TEST(SurfaceCreationParametersTest, equality) |
1213 | 88 | { | 88 | { |
1214 | 89 | using namespace geom; | 89 | using namespace geom; |
1216 | 90 | Size const size{Width{1024}, Height{768}}; | 90 | Size const size{1024, 768}; |
1217 | 91 | mc::BufferUsage const usage{mc::BufferUsage::hardware}; | 91 | mc::BufferUsage const usage{mc::BufferUsage::hardware}; |
1218 | 92 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; | 92 | geom::PixelFormat const format{geom::PixelFormat::abgr_8888}; |
1219 | 93 | 93 | ||
1220 | @@ -109,8 +109,8 @@ | |||
1221 | 109 | { | 109 | { |
1222 | 110 | using namespace geom; | 110 | using namespace geom; |
1223 | 111 | 111 | ||
1226 | 112 | std::vector<Size> const sizes{{Width{1024}, Height{768}}, | 112 | std::vector<Size> const sizes{{1024, 768}, |
1227 | 113 | {Width{1025}, Height{768}}}; | 113 | {1025, 768}}; |
1228 | 114 | 114 | ||
1229 | 115 | std::vector<mc::BufferUsage> const usages{mc::BufferUsage::hardware, | 115 | std::vector<mc::BufferUsage> const usages{mc::BufferUsage::hardware, |
1230 | 116 | mc::BufferUsage::software}; | 116 | mc::BufferUsage::software}; |
1231 | @@ -165,7 +165,7 @@ | |||
1232 | 165 | 165 | ||
1233 | 166 | surface_name = "test_surfaceA"; | 166 | surface_name = "test_surfaceA"; |
1234 | 167 | pf = geom::PixelFormat::abgr_8888; | 167 | pf = geom::PixelFormat::abgr_8888; |
1236 | 168 | size = geom::Size{geom::Width{43}, geom::Height{420}}; | 168 | size = geom::Size{43, 420}; |
1237 | 169 | rect = geom::Rectangle{geom::Point{geom::X{0}, geom::Y{0}}, size}; | 169 | rect = geom::Rectangle{geom::Point{geom::X{0}, geom::Y{0}}, size}; |
1238 | 170 | stride = geom::Stride{4 * size.width.as_uint32_t()}; | 170 | stride = geom::Stride{4 * size.width.as_uint32_t()}; |
1239 | 171 | mock_buffer_stream = std::make_shared<testing::NiceMock<mtd::MockBufferStream>>(); | 171 | mock_buffer_stream = std::make_shared<testing::NiceMock<mtd::MockBufferStream>>(); |
1240 | @@ -316,7 +316,7 @@ | |||
1241 | 316 | std::shared_ptr<mi::InputChannel>(), null_change_cb); | 316 | std::shared_ptr<mi::InputChannel>(), null_change_cb); |
1242 | 317 | surf.set_rotation(60.0f, glm::vec3{0.0f, 0.0f, 1.0f}); | 317 | surf.set_rotation(60.0f, glm::vec3{0.0f, 0.0f, 1.0f}); |
1243 | 318 | 318 | ||
1245 | 319 | geom::Size s{geom::Width{55}, geom::Height{66}}; | 319 | geom::Size s{55, 66}; |
1246 | 320 | ON_CALL(*mock_basic_info, size_and_position()) | 320 | ON_CALL(*mock_basic_info, size_and_position()) |
1247 | 321 | .WillByDefault(Return(geom::Rectangle{geom::Point{geom::X{}, geom::Y{}},s})); | 321 | .WillByDefault(Return(geom::Rectangle{geom::Point{geom::X{}, geom::Y{}},s})); |
1248 | 322 | 322 | ||
1249 | @@ -347,7 +347,7 @@ | |||
1250 | 347 | { | 347 | { |
1251 | 348 | using namespace testing; | 348 | using namespace testing; |
1252 | 349 | 349 | ||
1254 | 350 | const geom::Size sz{geom::Width{85}, geom::Height{43}}; | 350 | const geom::Size sz{85, 43}; |
1255 | 351 | const geom::Rectangle origin{geom::Point{geom::X{77}, geom::Y{88}}, sz}; | 351 | const geom::Rectangle origin{geom::Point{geom::X{77}, geom::Y{88}}, sz}; |
1256 | 352 | const geom::Rectangle moved_pt{geom::Point{geom::X{55}, geom::Y{66}}, sz}; | 352 | const geom::Rectangle moved_pt{geom::Point{geom::X{55}, geom::Y{66}}, sz}; |
1257 | 353 | 353 | ||
1258 | 354 | 354 | ||
1259 | === modified file 'tests/unit-tests/surfaces/test_surface_info.cpp' | |||
1260 | --- tests/unit-tests/surfaces/test_surface_info.cpp 2013-07-08 17:04:31 +0000 | |||
1261 | +++ tests/unit-tests/surfaces/test_surface_info.cpp 2013-07-12 11:57:23 +0000 | |||
1262 | @@ -29,7 +29,7 @@ | |||
1263 | 29 | { | 29 | { |
1264 | 30 | name = std::string("aa"); | 30 | name = std::string("aa"); |
1265 | 31 | top_left = geom::Point{geom::X{4}, geom::Y{7}}; | 31 | top_left = geom::Point{geom::X{4}, geom::Y{7}}; |
1267 | 32 | size = geom::Size{geom::Width{5}, geom::Height{9}}; | 32 | size = geom::Size{5, 9}; |
1268 | 33 | } | 33 | } |
1269 | 34 | std::string name; | 34 | std::string name; |
1270 | 35 | geom::Point top_left; | 35 | geom::Point top_left; |
1271 | 36 | 36 | ||
1272 | === modified file 'tests/unit-tests/surfaces/test_surface_stack.cpp' | |||
1273 | --- tests/unit-tests/surfaces/test_surface_stack.cpp 2013-07-06 00:24:51 +0000 | |||
1274 | +++ tests/unit-tests/surfaces/test_surface_stack.cpp 2013-07-12 11:57:23 +0000 | |||
1275 | @@ -181,7 +181,7 @@ | |||
1276 | 181 | ms::SurfaceStack stack(mt::fake_shared(buffer_stream_factory), | 181 | ms::SurfaceStack stack(mt::fake_shared(buffer_stream_factory), |
1277 | 182 | mt::fake_shared(input_factory), mt::fake_shared(input_registrar)); | 182 | mt::fake_shared(input_factory), mt::fake_shared(input_registrar)); |
1278 | 183 | std::weak_ptr<ms::Surface> surface = stack.create_surface( | 183 | std::weak_ptr<ms::Surface> surface = stack.create_surface( |
1280 | 184 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 184 | msh::a_surface().of_size({1024, 768}), default_depth); |
1281 | 185 | 185 | ||
1282 | 186 | stack.destroy_surface(surface); | 186 | stack.destroy_surface(surface); |
1283 | 187 | } | 187 | } |
1284 | @@ -235,11 +235,11 @@ | |||
1285 | 235 | mt::fake_shared(input_factory), mt::fake_shared(input_registrar)); | 235 | mt::fake_shared(input_factory), mt::fake_shared(input_registrar)); |
1286 | 236 | 236 | ||
1287 | 237 | auto surface1 = stack.create_surface( | 237 | auto surface1 = stack.create_surface( |
1289 | 238 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 238 | msh::a_surface().of_size({1024, 768}), default_depth); |
1290 | 239 | auto surface2 = stack.create_surface( | 239 | auto surface2 = stack.create_surface( |
1292 | 240 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 240 | msh::a_surface().of_size({1024, 768}), default_depth); |
1293 | 241 | auto surface3 = stack.create_surface( | 241 | auto surface3 = stack.create_surface( |
1295 | 242 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 242 | msh::a_surface().of_size({1024, 768}), default_depth); |
1296 | 243 | 243 | ||
1297 | 244 | mtd::MockSurfaceRenderer renderer; | 244 | mtd::MockSurfaceRenderer renderer; |
1298 | 245 | MockFilterForRenderables filter; | 245 | MockFilterForRenderables filter; |
1299 | @@ -277,11 +277,11 @@ | |||
1300 | 277 | mt::fake_shared(input_factory), mt::fake_shared(input_registrar)); | 277 | mt::fake_shared(input_factory), mt::fake_shared(input_registrar)); |
1301 | 278 | 278 | ||
1302 | 279 | auto surface1 = stack.create_surface( | 279 | auto surface1 = stack.create_surface( |
1304 | 280 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 280 | msh::a_surface().of_size({1024, 768}), default_depth); |
1305 | 281 | auto surface2 = stack.create_surface( | 281 | auto surface2 = stack.create_surface( |
1307 | 282 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 282 | msh::a_surface().of_size({1024, 768}), default_depth); |
1308 | 283 | auto surface3 = stack.create_surface( | 283 | auto surface3 = stack.create_surface( |
1310 | 284 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 284 | msh::a_surface().of_size({1024, 768}), default_depth); |
1311 | 285 | 285 | ||
1312 | 286 | mtd::MockSurfaceRenderer renderer; | 286 | mtd::MockSurfaceRenderer renderer; |
1313 | 287 | MockFilterForRenderables filter; | 287 | MockFilterForRenderables filter; |
1314 | @@ -311,7 +311,7 @@ | |||
1315 | 311 | mtd::StubInputRegistrar input_registrar; | 311 | mtd::StubInputRegistrar input_registrar; |
1316 | 312 | 312 | ||
1317 | 313 | 313 | ||
1319 | 314 | geom::Size const size{geom::Size{geom::Width{1024}, geom::Height{768}}}; | 314 | geom::Size const size{1024, 768}; |
1320 | 315 | geom::PixelFormat const format{geom::PixelFormat::bgr_888}; | 315 | geom::PixelFormat const format{geom::PixelFormat::bgr_888}; |
1321 | 316 | mc::BufferUsage const usage{mc::BufferUsage::software}; | 316 | mc::BufferUsage const usage{mc::BufferUsage::software}; |
1322 | 317 | 317 | ||
1323 | @@ -364,7 +364,7 @@ | |||
1324 | 364 | stack.set_change_callback(std::bind(&MockCallback::call, &mock_cb)); | 364 | stack.set_change_callback(std::bind(&MockCallback::call, &mock_cb)); |
1325 | 365 | 365 | ||
1326 | 366 | std::weak_ptr<ms::Surface> surface = stack.create_surface( | 366 | std::weak_ptr<ms::Surface> surface = stack.create_surface( |
1328 | 367 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 367 | msh::a_surface().of_size({1024, 768}), default_depth); |
1329 | 368 | } | 368 | } |
1330 | 369 | 369 | ||
1331 | 370 | TEST(SurfaceStack, destroy_surface_notifies_changes) | 370 | TEST(SurfaceStack, destroy_surface_notifies_changes) |
1332 | @@ -381,7 +381,7 @@ | |||
1333 | 381 | stack.set_change_callback(std::bind(&MockCallback::call, &mock_cb)); | 381 | stack.set_change_callback(std::bind(&MockCallback::call, &mock_cb)); |
1334 | 382 | 382 | ||
1335 | 383 | std::weak_ptr<ms::Surface> surface = stack.create_surface( | 383 | std::weak_ptr<ms::Surface> surface = stack.create_surface( |
1337 | 384 | msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth); | 384 | msh::a_surface().of_size({1024, 768}), default_depth); |
1338 | 385 | 385 | ||
1339 | 386 | Mock::VerifyAndClearExpectations(&mock_cb); | 386 | Mock::VerifyAndClearExpectations(&mock_cb); |
1340 | 387 | EXPECT_CALL(mock_cb, call()).Times(1); | 387 | EXPECT_CALL(mock_cb, call()).Times(1); |
1341 | @@ -423,8 +423,7 @@ | |||
1342 | 423 | using namespace ::testing; | 423 | using namespace ::testing; |
1343 | 424 | geom::Point const requested_top_left{geom::X{50}, | 424 | geom::Point const requested_top_left{geom::X{50}, |
1344 | 425 | geom::Y{17}}; | 425 | geom::Y{17}}; |
1347 | 426 | geom::Size const requested_size{geom::Width{1024}, | 426 | geom::Size const requested_size{1024, 768}; |
1346 | 427 | geom::Height{768}}; | ||
1348 | 428 | 427 | ||
1349 | 429 | ms::SurfaceStack stack{std::make_shared<StubBufferStreamFactory>(), | 428 | ms::SurfaceStack stack{std::make_shared<StubBufferStreamFactory>(), |
1350 | 430 | std::make_shared<StubInputChannelFactory>(), | 429 | std::make_shared<StubInputChannelFactory>(), |
1351 | @@ -444,8 +443,8 @@ | |||
1352 | 444 | using namespace ::testing; | 443 | using namespace ::testing; |
1353 | 445 | geom::Point const requested_top_left{geom::X{50}, | 444 | geom::Point const requested_top_left{geom::X{50}, |
1354 | 446 | geom::Y{17}}; | 445 | geom::Y{17}}; |
1357 | 447 | geom::Size const requested_size{geom::Width{1024}, geom::Height{768}}; | 446 | geom::Size const requested_size{1024, 768}; |
1358 | 448 | geom::Size const stream_size{geom::Width{1025}, geom::Height{769}}; | 447 | geom::Size const stream_size{1025, 769}; |
1359 | 449 | 448 | ||
1360 | 450 | MockBufferStreamFactory buffer_stream_factory; | 449 | MockBufferStreamFactory buffer_stream_factory; |
1361 | 451 | auto stream = std::make_shared<mtd::MockBufferStream>(); | 450 | auto stream = std::make_shared<mtd::MockBufferStream>(); |
Looks good.