Merge lp:~alan-griffiths/mir/fix-1199756 into lp:~mir-team/mir/trunk

[Alan Griffiths]

geometry: make geometry compound types easier to construct

geometry: make geometry compound types easier to construct

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:846
http://jenkins.qa.ubuntu.com/job/mir-ci/995/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1292
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1177/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/631

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/995/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/450/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1293
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1178/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/104
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-autolanding/104/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:847
http://jenkins.qa.ubuntu.com/job/mir-ci/996/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1294
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/234
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/234/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=quantal,flavor=amd64/632

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/996/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp'
--- examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-07-08 10:32:48 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-07-12 11:57:23 +0000
@@ -72,8 +72,7 @@
 
 void me::InprocessEGLClient::thread_loop()
 {
-    geom::Size const surface_size = geom::Size{geom::Width{512},
-                                               geom::Height{512}};
+    geom::Size const surface_size{512, 512};
 
     ///\internal [setup_tag]
     auto params = msh::a_surface().of_name("Inprocess EGL Demo")

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-07-10 17:06:37 +0000
+++ examples/render_surfaces.cpp	2013-07-12 11:57:23 +0000
@@ -102,9 +102,7 @@
             image[(i+1) * height + i] = fg_color;
             image[i * height + i + 1] = fg_color;
         }
-        cursor->set_image(
-            image.data(),
-            geom::Size{ geom::Width(width), geom::Height(height) });
+        cursor->set_image(image.data(), geom::Size{width, height});
     }
 }
 
@@ -286,8 +284,7 @@
         public:
             RenderResourcesBufferInitializer()
                 : img_renderer{mir_image.pixel_data,
-                               geom::Size{geom::Width{mir_image.width},
-                                          geom::Height{mir_image.height}},
+                               geom::Size{mir_image.width, mir_image.height},
                                mir_image.bytes_per_pixel}
             {
             }
@@ -368,8 +365,7 @@
         auto const surface_builder = the_surface_builder();
         geom::Size const display_size{display->view_area().size};
         uint32_t const surface_side{300};
-        geom::Size const surface_size{geom::Width{surface_side},
-                                      geom::Height{surface_side}};
+        geom::Size const surface_size{surface_side, surface_side};
 
         float const angular_step = 2.0 * M_PI / moveables.size();
         float const w = display_size.width.as_uint32_t();

=== modified file 'include/shared/mir/geometry/size.h'
--- include/shared/mir/geometry/size.h	2013-04-24 05:22:20 +0000
+++ include/shared/mir/geometry/size.h	2013-07-12 11:57:23 +0000
@@ -30,10 +30,11 @@
 struct Size
 {
     Size() {}
+    Size(Size const&) = default;
+    Size& operator=(Size const&) = default;
 
-    Size(const Width& w, const Height& h) : width {w}, height {h}
-    {
-    }
+    template<typename WidthType, typename HeightType>
+    Size(WidthType&& width, HeightType&& height) : width(width), height(height) {}
 
     Width width;
     Height height;

=== modified file 'include/test/mir_test_doubles/mock_input_info.h'
--- include/test/mir_test_doubles/mock_input_info.h	2013-07-10 17:06:37 +0000
+++ include/test/mir_test_doubles/mock_input_info.h	2013-07-12 11:57:23 +0000
@@ -39,7 +39,7 @@
             .WillByDefault(
                 Return(geometry::Rectangle{
                         geometry::Point{},
-                        geometry::Size{geometry::Width{}, geometry::Height{}}}));
+                        geometry::Size{}}));
         static std::string n;
         ON_CALL(*this, name())
             .WillByDefault(testing::ReturnRef(n));

=== modified file 'include/test/mir_test_doubles/mock_surface_info.h'
--- include/test/mir_test_doubles/mock_surface_info.h	2013-07-10 17:06:37 +0000
+++ include/test/mir_test_doubles/mock_surface_info.h	2013-07-12 11:57:23 +0000
@@ -39,7 +39,7 @@
             .WillByDefault(
                 Return(geometry::Rectangle{
                         geometry::Point{},
-                        geometry::Size{geometry::Width{}, geometry::Height{}}}));
+                        geometry::Size{}}));
         static std::string n;
         ON_CALL(*this, name())
             .WillByDefault(testing::ReturnRef(n));

=== modified file 'include/test/mir_test_doubles/stub_buffer.h'
--- include/test/mir_test_doubles/stub_buffer.h	2013-05-14 21:39:52 +0000
+++ include/test/mir_test_doubles/stub_buffer.h	2013-07-12 11:57:23 +0000
@@ -35,7 +35,7 @@
 {
 public:
     StubBuffer()
-        : buf_size{geometry::Size{geometry::Width{0}, geometry::Height{0}}},
+        : buf_size{0, 0},
           buf_pixel_format{geometry::PixelFormat::abgr_8888}
     {
     }

=== modified file 'src/client/android/android_client_buffer.cpp'
--- src/client/android/android_client_buffer.cpp	2013-07-10 17:06:37 +0000
+++ src/client/android/android_client_buffer.cpp	2013-07-12 11:57:23 +0000
@@ -66,8 +66,7 @@
 
 geom::Size mcla::AndroidClientBuffer::size() const
 {
-    return geom::Size{geom::Width{native_window_buffer->width},
-                      geom::Height{native_window_buffer->height}};
+    return {native_window_buffer->width, native_window_buffer->height};
 }
 
 geom::Stride mcla::AndroidClientBuffer::stride() const

=== modified file 'src/server/graphics/android/buffer.cpp'
--- src/server/graphics/android/buffer.cpp	2013-06-14 19:30:20 +0000
+++ src/server/graphics/android/buffer.cpp	2013-07-12 11:57:23 +0000
@@ -51,8 +51,7 @@
 
 geom::Size mga::Buffer::size() const
 {
-    return geom::Size{geom::Width{native_buffer->width},
-                      geom::Height{native_buffer->height}};
+    return {native_buffer->width, native_buffer->height};
 }
 
 geom::Stride mga::Buffer::stride() const

=== modified file 'src/server/graphics/android/fb_device.cpp'
--- src/server/graphics/android/fb_device.cpp	2013-05-17 20:29:13 +0000
+++ src/server/graphics/android/fb_device.cpp	2013-07-12 11:57:23 +0000
@@ -50,8 +50,7 @@
 
 geom::Size mga::FBDevice::display_size() const
 {
-    return geom::Size{geom::Width{fb_device->width},
-                      geom::Height{fb_device->height}};
+    return {fb_device->width, fb_device->height};
 } 
 
 geom::PixelFormat mga::FBDevice::display_format() const

=== modified file 'src/server/graphics/android/hwc11_device.cpp'
--- src/server/graphics/android/hwc11_device.cpp	2013-05-17 20:17:16 +0000
+++ src/server/graphics/android/hwc11_device.cpp	2013-07-12 11:57:23 +0000
@@ -60,7 +60,7 @@
     hwc_device->getDisplayAttributes(hwc_device.get(), HWC_DISPLAY_PRIMARY, primary_display_config,
                                      size_request, size_values);
 
-    return geom::Size{geom::Width{size_values[0]}, geom::Height{size_values[1]}};
+    return {size_values[0], size_values[1]};
 }
 
 geom::PixelFormat mga::HWC11Device::display_format() const

=== modified file 'src/server/graphics/gbm/gbm_buffer.cpp'
--- src/server/graphics/gbm/gbm_buffer.cpp	2013-05-29 04:53:18 +0000
+++ src/server/graphics/gbm/gbm_buffer.cpp	2013-07-12 11:57:23 +0000
@@ -104,8 +104,7 @@
 
 geom::Size mgg::GBMBuffer::size() const
 {
-    return {geom::Width{gbm_bo_get_width(gbm_handle.get())},
-            geom::Height{gbm_bo_get_height(gbm_handle.get())}};
+    return {gbm_bo_get_width(gbm_handle.get()), gbm_bo_get_height(gbm_handle.get())};
 }
 
 geom::Stride mgg::GBMBuffer::stride() const

=== modified file 'src/server/graphics/gbm/gbm_cursor.cpp'
--- src/server/graphics/gbm/gbm_cursor.cpp	2013-06-06 10:47:23 +0000
+++ src/server/graphics/gbm/gbm_cursor.cpp	2013-07-12 11:57:23 +0000
@@ -56,8 +56,7 @@
         current_position(),
         buffer(*platform)
 {
-    set_image(black_arrow.pixel_data,
-              geometry::Size{geometry::Width(width), geometry::Height(height)});
+    set_image(black_arrow.pixel_data, geometry::Size{width, height});
 
     show_at_last_known_position();
 }
@@ -69,7 +68,7 @@
 
 void mgg::GBMCursor::set_image(const void* raw_argb, geometry::Size size)
 {
-    if (size != geometry::Size{geometry::Width(width), geometry::Height(height)})
+    if (size != geometry::Size{width, height})
         BOOST_THROW_EXCEPTION(std::logic_error("No support for cursors that aren't 64x64"));
 
     auto const count = size.width.as_uint32_t() * size.height.as_uint32_t() * sizeof(uint32_t);

=== modified file 'src/server/graphics/gbm/kms_display_configuration.cpp'
--- src/server/graphics/gbm/kms_display_configuration.cpp	2013-07-10 16:55:22 +0000
+++ src/server/graphics/gbm/kms_display_configuration.cpp	2013-07-12 11:57:23 +0000
@@ -149,8 +149,7 @@
 {
     DisplayConfigurationOutputId id{static_cast<int>(connector.connector_id)};
     DisplayConfigurationCardId card_id{0};
-    geom::Size physical_size{geom::Width{connector.mmWidth},
-                             geom::Height{connector.mmHeight}};
+    geom::Size physical_size{connector.mmWidth, connector.mmHeight};
     bool connected{connector.connection == DRM_MODE_CONNECTED};
     size_t current_mode_index{std::numeric_limits<size_t>::max()};
     std::vector<DisplayConfigurationMode> modes;
@@ -170,8 +169,7 @@
     {
         drmModeModeInfo& mode_info = connector.modes[m];
 
-        geom::Size size{geom::Width{mode_info.hdisplay},
-                        geom::Height{mode_info.vdisplay}};
+        geom::Size size{mode_info.hdisplay, mode_info.vdisplay};
 
         double vrefresh_hz = calculate_vrefresh_hz(mode_info);
 

=== modified file 'src/server/graphics/gbm/kms_output.cpp'
--- src/server/graphics/gbm/kms_output.cpp	2013-05-03 22:08:24 +0000
+++ src/server/graphics/gbm/kms_output.cpp	2013-07-12 11:57:23 +0000
@@ -132,7 +132,7 @@
 geom::Size mgg::KMSOutput::size() const
 {
     drmModeModeInfo const& mode(connector->modes[mode_index]);
-    return geom::Size{geom::Width{mode.hdisplay}, geom::Height{mode.vdisplay}};
+    return {mode.hdisplay, mode.vdisplay};
 }
 
 bool mgg::KMSOutput::set_crtc(uint32_t fb_id)

=== modified file 'src/server/shell/surface_creation_parameters.cpp'
--- src/server/shell/surface_creation_parameters.cpp	2013-05-21 17:16:43 +0000
+++ src/server/shell/surface_creation_parameters.cpp	2013-07-12 11:57:23 +0000
@@ -47,7 +47,7 @@
     geometry::Width::ValueType width,
     geometry::Height::ValueType height)
 {
-    return of_size(geometry::Size(geometry::Width(width), geometry::Height(height)));
+    return of_size({width, height});
 }
 
 msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_position(geometry::Point const& new_top_left)

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2013-07-11 13:41:09 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2013-07-12 11:57:23 +0000
@@ -477,17 +477,16 @@
         {
             static GeometryList positions;
             positions[test_client_1] = geom::Rectangle{geom::Point{0, 0},
-                geom::Size{geom::Width{client_width}, geom::Height{client_height}}};
+                geom::Size{client_width, client_height}};
             positions[test_client_2] = geom::Rectangle{geom::Point{screen_width/2, screen_height/2},
-                geom::Size{geom::Width{client_width}, geom::Height{client_height}}};
+                geom::Size{client_width, client_height}};
 
             return std::make_shared<StaticPlacementStrategy>(positions);
         }
         
         geom::Rectangle the_screen_geometry() override
         {
-            return geom::Rectangle{geom::Point{0, 0},
-                    geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}};
+            return geom::Rectangle{geom::Point{0, 0}, geom::Size{screen_width, screen_height}};
         }
 
         void inject_input() override
@@ -575,11 +574,11 @@
     static int const screen_height = 100;
     
     static geom::Rectangle const screen_geometry{geom::Point{0, 0},
-        geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}};
+        geom::Size{screen_width, screen_height}};
 
     static std::initializer_list<geom::Rectangle> client_input_regions = {
-        {geom::Point{0, 0}, {geom::Width{screen_width-80}, geom::Height{screen_height}}},
-        {geom::Point{screen_width-20, 0}, {geom::Width{screen_width-80}, geom::Height{screen_height}}}
+        {geom::Point{0, 0}, {screen_width-80, screen_height}},
+        {geom::Point{screen_width-20, 0}, {screen_width-80, screen_height}}
     };
 
     struct ServerConfiguration : mtf::InputTestingServerConfiguration
@@ -682,7 +681,7 @@
     static int const screen_height = 100;
     
     static geom::Rectangle const screen_geometry{geom::Point{0, 0},
-        geom::Size{geom::Width{screen_width}, geom::Height{screen_height}}};
+        geom::Size{screen_width, screen_height}};
 
     struct ServerConiguration : mtf::InputTestingServerConfiguration
     {

=== modified file 'tests/acceptance-tests/test_surfaceloop.cpp'
--- tests/acceptance-tests/test_surfaceloop.cpp	2013-06-03 08:14:01 +0000
+++ tests/acceptance-tests/test_surfaceloop.cpp	2013-07-12 11:57:23 +0000
@@ -39,7 +39,7 @@
 {
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
 
-geom::Size const size{geom::Width{640}, geom::Height{480}};
+geom::Size const size{640, 480};
 geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
 }
 

=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2013-06-20 11:55:33 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2013-07-12 11:57:23 +0000
@@ -448,7 +448,7 @@
     void SetUp() {
         ASSERT_FALSE(mtd::is_surface_flinger_running());
 
-        size = geom::Size{geom::Width{test_width}, geom::Height{test_height}};
+        size = geom::Size{test_width, test_height};
         pf = geom::PixelFormat::abgr_8888;
 
         auto initializer = std::make_shared<mg::NullBufferInitializer>();

=== modified file 'tests/integration-tests/compositor/test_buffer_stream.cpp'
--- tests/integration-tests/compositor/test_buffer_stream.cpp	2013-06-17 15:55:04 +0000
+++ tests/integration-tests/compositor/test_buffer_stream.cpp	2013-07-12 11:57:23 +0000
@@ -45,7 +45,7 @@
 
     std::shared_ptr<mc::Buffer> alloc_buffer(mc::BufferProperties const&)
     {
-        mc::BufferProperties properties{geom::Size{geom::Width{id}, geom::Height{id}},
+        mc::BufferProperties properties{geom::Size{id, id},
                                         geom::PixelFormat::abgr_8888,
                                         mc::BufferUsage::hardware};
         ++id;
@@ -72,7 +72,7 @@
     {
         auto allocator = std::make_shared<StubBufferAllocator>();
         auto factory = std::make_shared<mc::SwapperFactory>(allocator);
-        mc::BufferProperties properties{geom::Size{geom::Width{380}, geom::Height{210}},
+        mc::BufferProperties properties{geom::Size{380, 210},
                                         geom::PixelFormat::abgr_8888,
                                         mc::BufferUsage::hardware};
 

=== modified file 'tests/integration-tests/compositor/test_swapping_swappers.cpp'
--- tests/integration-tests/compositor/test_swapping_swappers.cpp	2013-06-11 19:55:10 +0000
+++ tests/integration-tests/compositor/test_swapping_swappers.cpp	2013-07-12 11:57:23 +0000
@@ -59,7 +59,7 @@
     {
         auto allocator = std::make_shared<MockBufferAllocator>();
         auto factory = std::make_shared<mc::SwapperFactory>(allocator, 3);
-        auto properties = mc::BufferProperties{geom::Size{geom::Width{380}, geom::Height{210}},
+        auto properties = mc::BufferProperties{geom::Size{380, 210},
                                           geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware};
         switching_bundle = std::make_shared<mc::SwitchingBundle>(factory, properties);
     }

=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-06-11 00:05:53 +0000
+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-07-12 11:57:23 +0000
@@ -42,8 +42,7 @@
 protected:
     virtual void SetUp()
     {
-        size = geom::Size{geom::Width{334},
-                          geom::Height{122}};
+        size = geom::Size{334, 122};
         pf  = geom::PixelFormat::abgr_8888;
         buffer_properties = mc::BufferProperties{size, pf, mc::BufferUsage::software};
         null_buffer_initializer = std::make_shared<mg::NullBufferInitializer>();

=== modified file 'tests/integration-tests/graphics/android/test_internal_client.cpp'
--- tests/integration-tests/graphics/android/test_internal_client.cpp	2013-07-03 22:07:12 +0000
+++ tests/integration-tests/graphics/android/test_internal_client.cpp	2013-07-12 11:57:23 +0000
@@ -76,8 +76,7 @@
 
 TEST_F(AndroidInternalClient, internal_client_creation_and_use)
 {
-    auto size = geom::Size{geom::Width{334},
-                      geom::Height{122}};
+    auto size = geom::Size{334, 122};
     auto pf  = geom::PixelFormat::abgr_8888;
     msh::SurfaceCreationParameters params;
     params.name = std::string("test");

=== modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-07-10 08:50:53 +0000
+++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-07-12 11:57:23 +0000
@@ -109,7 +109,7 @@
         display = platform->create_display(conf_policy);
         auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
         allocator = platform->create_buffer_allocator(buffer_initializer);
-        size = geom::Size{geom::Width{100}, geom::Height{100}};
+        size = geom::Size{100, 100};
         pf = geom::PixelFormat::abgr_8888;
         usage = mc::BufferUsage::hardware;
         buffer_properties = mc::BufferProperties{size, pf, usage};

=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
--- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-07-01 17:01:15 +0000
+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-07-12 11:57:23 +0000
@@ -72,7 +72,7 @@
         static const geom::Rectangle visible_rectangle
         {
             geom::Point(),
-            geom::Size{geom::Width(1024), geom::Height(1024)}
+            geom::Size{1024, 1024}
         };
 
         event_filter = std::make_shared<MockEventFilter>();

=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2013-07-05 21:27:14 +0000
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2013-07-12 11:57:23 +0000
@@ -64,9 +64,7 @@
 {
 using namespace ::testing;
 
-static const geom::Rectangle default_view_area =
-        geom::Rectangle{geom::Point(),
-                        geom::Size{geom::Width(1600), geom::Height(1400)}};
+static const geom::Rectangle default_view_area{geom::Point(), geom::Size{1600, 1400}};
 
 static const std::shared_ptr<mi::CursorListener> null_cursor_listener{};
 

=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2013-07-10 08:50:53 +0000
+++ tests/integration-tests/test_display_info.cpp	2013-07-12 11:57:23 +0000
@@ -50,7 +50,7 @@
 };
 
 geom::Rectangle const StubDisplay::rectangle{geom::Point{geom::X{25}, geom::Y{36}},
-                                             geom::Size{geom::Width{49}, geom::Height{64}}};
+                                             geom::Size{49, 64}};
 
 }
 }

=== modified file 'tests/integration-tests/test_surface_first_frame_sync.cpp'
--- tests/integration-tests/test_surface_first_frame_sync.cpp	2013-06-28 12:00:04 +0000
+++ tests/integration-tests/test_surface_first_frame_sync.cpp	2013-07-12 11:57:23 +0000
@@ -105,8 +105,7 @@
     geom::Rectangle view_area() const
     {
         return geom::Rectangle{geom::Point(),
-                               geom::Size{geom::Width(1600),
-                                          geom::Height(1600)}};
+                               geom::Size{1600, 1600}};
     }
     void make_current() {}
     void release_current() {}

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2013-07-10 08:50:53 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2013-07-12 11:57:23 +0000
@@ -50,7 +50,7 @@
 {
 char const* const mir_test_socket = mtf::test_socket_file().c_str();
 
-geom::Size const size{geom::Width{640}, geom::Height{480}};
+geom::Size const size{640, 480};
 geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
 mc::BufferUsage const usage{mc::BufferUsage::hardware};
 mc::BufferProperties const buffer_properties{size, format, usage};
@@ -97,8 +97,7 @@
     geom::Rectangle view_area() const override
     {
         return geom::Rectangle{geom::Point(),
-                               geom::Size{geom::Width(1600),
-                                          geom::Height(1600)}};
+                               geom::Size{1600, 1600}};
     }
 };
 

=== modified file 'tests/mir_test_doubles/mock_drm.cpp'
--- tests/mir_test_doubles/mock_drm.cpp	2013-07-04 07:51:30 +0000
+++ tests/mir_test_doubles/mock_drm.cpp	2013-07-12 11:57:23 +0000
@@ -65,7 +65,7 @@
                   modes_empty, connector_encoder_ids, geom::Size());
     add_connector(connector1_id, DRM_MODE_CONNECTED, encoder1_id,
                   modes, connector_encoder_ids,
-                  geom::Size{geom::Width{121}, geom::Height{144}});
+                  geom::Size{121, 144});
 
     prepare();
 }

=== modified file 'tests/mir_test_framework/input_testing_server_options.cpp'
--- tests/mir_test_framework/input_testing_server_options.cpp	2013-07-10 17:06:37 +0000
+++ tests/mir_test_framework/input_testing_server_options.cpp	2013-07-12 11:57:23 +0000
@@ -181,8 +181,7 @@
 
 geom::Rectangle mtf::InputTestingServerConfiguration::the_screen_geometry()
 {
-    static geom::Rectangle const default_geometry{geom::Point{0, 0},
-        geom::Size{geom::Width{1600}, geom::Height{1600}}};
+    static geom::Rectangle const default_geometry{geom::Point{0, 0}, geom::Size{1600, 1600}};
     return default_geometry;
 }
 

=== modified file 'tests/mir_test_framework/testing_server_options.cpp'
--- tests/mir_test_framework/testing_server_options.cpp	2013-07-10 08:50:53 +0000
+++ tests/mir_test_framework/testing_server_options.cpp	2013-07-12 11:57:23 +0000
@@ -71,9 +71,7 @@
 public:
     geom::Rectangle view_area() const override
     {
-        return geom::Rectangle{geom::Point(),
-                               geom::Size{geom::Width(1600),
-                                          geom::Height(1600)}};
+        return geom::Rectangle{geom::Point(), geom::Size{1600, 1600}};
     }
 };
 

=== modified file 'tests/unit-tests/client/android/test_client_android_registrar.cpp'
--- tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-07-04 22:33:02 +0000
+++ tests/unit-tests/client/android/test_client_android_registrar.cpp	2013-07-12 11:57:23 +0000
@@ -103,7 +103,7 @@
         auto t = geom::X(top);
         auto l = geom::Y(left);
         auto pt = geom::Point{t,l};
-        rect = geom::Rectangle{ pt, {geom::Width(width), geom::Height(height)}};
+        rect = geom::Rectangle{ pt, {width, height}};
         package = std::make_shared<MirBufferPackage>();
         package->fd_items = 4;
         package->data_items = 21;
@@ -214,7 +214,7 @@
         auto t = geom::X(top);
         auto l = geom::Y(left);
         auto pt = geom::Point{t,l};
-        rect = geom::Rectangle{ pt, {geom::Width(width), geom::Height(height)}};
+        rect = geom::Rectangle{ pt, {width, height}};
         fake_package = std::make_shared<native_handle_t>();
     }
 

=== modified file 'tests/unit-tests/compositor/test_buffer_properties.cpp'
--- tests/unit-tests/compositor/test_buffer_properties.cpp	2012-12-19 16:01:00 +0000
+++ tests/unit-tests/compositor/test_buffer_properties.cpp	2013-07-12 11:57:23 +0000
@@ -39,7 +39,7 @@
 
 TEST(buffer_properties, custom_create)
 {
-    geom::Size size{geom::Width{66}, geom::Height{166}};
+    geom::Size size{66, 166};
     geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888};
     mc::BufferUsage usage{mc::BufferUsage::hardware};
 
@@ -52,7 +52,7 @@
 
 TEST(buffer_properties, equal_properties_test_equal)
 {
-    geom::Size size{geom::Width{66}, geom::Height{166}};
+    geom::Size size{66, 166};
     geom::PixelFormat pixel_format{geom::PixelFormat::abgr_8888};
     mc::BufferUsage usage{mc::BufferUsage::hardware};
 

=== modified file 'tests/unit-tests/compositor/test_buffer_stream.cpp'
--- tests/unit-tests/compositor/test_buffer_stream.cpp	2013-06-19 18:33:24 +0000
+++ tests/unit-tests/compositor/test_buffer_stream.cpp	2013-07-12 11:57:23 +0000
@@ -45,7 +45,7 @@
 
 TEST_F(BufferStreamTest, size_query)
 {
-    geom::Size size{geom::Width{4},geom::Height{5}};
+    geom::Size size{4, 5};
     mc::BufferProperties properties {size, geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware};
     EXPECT_CALL(*mock_bundle, properties())
         .Times(1)
@@ -59,8 +59,7 @@
 TEST_F(BufferStreamTest, pixel_format_query)
 {
     geom::PixelFormat format{geom::PixelFormat::abgr_8888};
-    mc::BufferProperties properties {geom::Size{geom::Width{4},geom::Height{5}},
-                                     format, mc::BufferUsage::hardware};
+    mc::BufferProperties properties {geom::Size{4, 5}, format, mc::BufferUsage::hardware};
     EXPECT_CALL(*mock_bundle, properties())
         .Times(1)
         .WillOnce(testing::Return(properties));

=== modified file 'tests/unit-tests/compositor/test_swapper_factory.cpp'
--- tests/unit-tests/compositor/test_swapper_factory.cpp	2013-06-17 19:11:59 +0000
+++ tests/unit-tests/compositor/test_swapper_factory.cpp	2013-07-12 11:57:23 +0000
@@ -33,7 +33,7 @@
 
 namespace
 {
-static geom::Size const buf_size{geom::Width{100}, geom::Height{121}};
+static geom::Size const buf_size{100, 121};
 static geom::PixelFormat const buf_pixel_format{geom::PixelFormat::xbgr_8888};
 
 class MockGraphicBufferAllocator : public mc::GraphicBufferAllocator
@@ -56,7 +56,7 @@
 {
     SwapperFactoryTest()
         : mock_buffer_allocator{std::make_shared<testing::NiceMock<MockGraphicBufferAllocator>>()},
-          size{geom::Width{10},geom::Height{20}},
+          size{10, 20},
           pf{geom::PixelFormat::abgr_8888},
           usage{mc::BufferUsage::hardware},
           properties{size, pf, usage}

=== modified file 'tests/unit-tests/compositor/test_switching_bundle.cpp'
--- tests/unit-tests/compositor/test_switching_bundle.cpp	2013-06-14 00:08:30 +0000
+++ tests/unit-tests/compositor/test_switching_bundle.cpp	2013-07-12 11:57:23 +0000
@@ -37,7 +37,7 @@
         mock_default_swapper = std::make_shared<testing::NiceMock<mtd::MockSwapper>>();
         mock_secondary_swapper = std::make_shared<testing::NiceMock<mtd::MockSwapper>>();
         stub_buffer = std::make_shared<mtd::StubBuffer>();
-        properties = mc::BufferProperties{geom::Size{geom::Width{4}, geom::Height{2}},
+        properties = mc::BufferProperties{geom::Size{4, 2},
                                           geom::PixelFormat::abgr_8888, mc::BufferUsage::hardware};
 
         ON_CALL(*mock_swapper_factory, create_swapper_new_buffers(_,_,_))
@@ -54,7 +54,7 @@
 TEST_F(SwitchingBundleTest, sync_swapper_by_default)
 {
     using namespace testing;
-    auto actual_properties = mc::BufferProperties{geom::Size{geom::Width{7}, geom::Height{8}},
+    auto actual_properties = mc::BufferProperties{geom::Size{7, 8},
                                                   geom::PixelFormat::argb_8888, mc::BufferUsage::software};
     EXPECT_CALL(*mock_swapper_factory, create_swapper_new_buffers(_,_,mc::SwapperType::synchronous))
         .Times(1)

=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
--- tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-06-18 09:44:11 +0000
+++ tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-07-12 11:57:23 +0000
@@ -51,7 +51,7 @@
 {
 public:
     TemporaryBuffersTest()
-        : buffer_size{geom::Width{1024}, geom::Height{768}},
+        : buffer_size{1024, 768},
           buffer_stride{1024},
           buffer_pixel_format{geom::PixelFormat::abgr_8888},
           mock_buffer{std::make_shared<testing::NiceMock<mtd::MockBuffer>>(

=== modified file 'tests/unit-tests/geometry/test-rectangle.cpp'
--- tests/unit-tests/geometry/test-rectangle.cpp	2013-03-21 03:32:59 +0000
+++ tests/unit-tests/geometry/test-rectangle.cpp	2013-07-12 11:57:23 +0000
@@ -27,7 +27,7 @@
 {
     using namespace geom;
     Point const x3y9{X(3), Y(9)};
-    Size const w2h4{Width(2), Height(4)};
+    Size const w2h4{2, 4};
     Rectangle const rect{x3y9, w2h4};
 
     EXPECT_EQ(x3y9, rect.top_left);

=== modified file 'tests/unit-tests/geometry/test-size.cpp'
--- tests/unit-tests/geometry/test-size.cpp	2012-09-18 09:44:45 +0000
+++ tests/unit-tests/geometry/test-size.cpp	2013-07-12 11:57:23 +0000
@@ -26,7 +26,7 @@
 TEST(geometry, size)
 {
     using namespace geom;
-    Size const size2x4{Width(2), Height(4)};
+    Size const size2x4{2, 4};
 
     EXPECT_EQ(Width(2), size2x4.width);
     EXPECT_EQ(Height(4), size2x4.height);

=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
--- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2013-06-18 20:06:22 +0000
+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2013-07-12 11:57:23 +0000
@@ -48,7 +48,7 @@
         alloc_adaptor = std::make_shared<mga::AndroidAllocAdaptor>(mock_alloc_device);
 
         pf = geom::PixelFormat::abgr_8888;
-        size = geom::Size{geom::Width{300}, geom::Height{200}};
+        size = geom::Size{300, 200};
         usage = mga::BufferUsage::use_hardware;
     }
 

=== modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
--- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-06-14 18:20:39 +0000
+++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-07-12 11:57:23 +0000
@@ -93,7 +93,7 @@
 
     auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>();
 
-    mc::BufferProperties properties{geom::Size{geom::Width{2}, geom::Height{2}},
+    mc::BufferProperties properties{geom::Size{2, 2},
                                     geom::PixelFormat::abgr_8888,
                                     mc::BufferUsage::hardware};
     mga::AndroidGraphicBufferAllocator allocator{buffer_initializer};
@@ -110,7 +110,7 @@
     auto buffer_initializer = std::make_shared<mtd::MockBufferInitializer>();
 
     mga::AndroidGraphicBufferAllocator allocator{buffer_initializer};
-    auto size = geom::Size{geom::Width{2}, geom::Height{2}};
+    auto size = geom::Size{2, 2};
     auto pf = geom::PixelFormat::abgr_8888;
 
     EXPECT_CALL(*buffer_initializer, operator_call(_))

=== modified file 'tests/unit-tests/graphics/android/test_buffer.cpp'
--- tests/unit-tests/graphics/android/test_buffer.cpp	2013-06-14 17:26:03 +0000
+++ tests/unit-tests/graphics/android/test_buffer.cpp	2013-07-12 11:57:23 +0000
@@ -45,7 +45,7 @@
 
         default_use = mga::BufferUsage::use_hardware;
         pf = geom::PixelFormat::abgr_8888;
-        size = geom::Size{geom::Width{300}, geom::Height{200}};
+        size = geom::Size{300, 200};
         extensions = std::make_shared<mg::EGLExtensions>();
     }
 
@@ -63,8 +63,7 @@
 
     mga::Buffer buffer(mock_buffer_handle, extensions);
 
-    geom::Size expected_size{geom::Width{mock_buffer_handle->width},
-                             geom::Height{mock_buffer_handle->height}};
+    geom::Size expected_size{mock_buffer_handle->width, mock_buffer_handle->height};
     EXPECT_EQ(expected_size, buffer.size());
 }
 

=== modified file 'tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp'
--- tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2013-06-14 17:44:22 +0000
+++ tests/unit-tests/graphics/android/test_buffer_tex_bind.cpp	2013-07-12 11:57:23 +0000
@@ -38,7 +38,7 @@
         using namespace testing;
 
         stub_buffer = std::make_shared<ANativeWindowBuffer>();
-        size = geom::Size{geom::Width{300}, geom::Height{220}};
+        size = geom::Size{300, 220};
         pf = geom::PixelFormat::abgr_8888;
         extensions = std::make_shared<mg::EGLExtensions>();
 

=== modified file 'tests/unit-tests/graphics/android/test_framebuffer_factory.cpp'
--- tests/unit-tests/graphics/android/test_framebuffer_factory.cpp	2013-05-24 15:44:11 +0000
+++ tests/unit-tests/graphics/android/test_framebuffer_factory.cpp	2013-07-12 11:57:23 +0000
@@ -59,7 +59,7 @@
         ON_CALL(*mock_display_info_provider, display_format())
             .WillByDefault(Return(geom::PixelFormat::abgr_8888));
         ON_CALL(*mock_display_info_provider, display_size())
-            .WillByDefault(Return(geom::Size{geom::Width{2}, geom::Height{3}}));
+            .WillByDefault(Return(geom::Size{2, 3}));
         ON_CALL(*mock_display_info_provider, number_of_framebuffers_available())
             .WillByDefault(Return(fake_fb_num));
         ON_CALL(*mock_buffer_allocator, alloc_buffer_platform(_,_,_))

=== modified file 'tests/unit-tests/graphics/android/test_hwc10_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-05-17 20:43:23 +0000
+++ tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-07-12 11:57:23 +0000
@@ -36,7 +36,7 @@
     virtual void SetUp()
     {
         using namespace testing;
-        test_size = geom::Size{geom::Width{88}, geom::Height{4}};
+        test_size = geom::Size{88, 4};
         test_pf = geom::PixelFormat::abgr_8888;
         test_numfb = 558u;
         mock_device = std::make_shared<testing::NiceMock<mtd::MockHWCComposerDevice1>>();

=== modified file 'tests/unit-tests/graphics/android/test_hwc_display.cpp'
--- tests/unit-tests/graphics/android/test_hwc_display.cpp	2013-05-22 06:30:39 +0000
+++ tests/unit-tests/graphics/android/test_hwc_display.cpp	2013-07-12 11:57:23 +0000
@@ -70,7 +70,7 @@
 {
     using namespace testing;
 
-    geom::Size fake_display_size{geom::Width{223}, geom::Height{332}};
+    geom::Size fake_display_size{223, 332};
     EXPECT_CALL(*mock_hwc_device, display_size())
         .Times(1)
         .WillOnce(Return(fake_display_size)); 

=== modified file 'tests/unit-tests/graphics/android/test_hwc_layerlist.cpp'
--- tests/unit-tests/graphics/android/test_hwc_layerlist.cpp	2013-05-02 00:34:03 +0000
+++ tests/unit-tests/graphics/android/test_hwc_layerlist.cpp	2013-07-12 11:57:23 +0000
@@ -35,8 +35,7 @@
 
         width = 432; 
         height = 876; 
-        default_size = geom::Size{geom::Width{width},
-                       geom::Height{height}};
+        default_size = geom::Size{width, height};
 
         stub_handle_1 = std::make_shared<ANativeWindowBuffer>();
         stub_handle_2 = std::make_shared<ANativeWindowBuffer>();
@@ -66,11 +65,11 @@
     EXPECT_EQ(nullptr, layer.visibleRegionScreen.rects);
 
     geom::Rectangle r0{geom::Point{geom::X{0},geom::Y{1}},
-                       geom::Size{geom::Width{2},geom::Height{3}}}; 
+                       geom::Size{2, 3}};
     geom::Rectangle r1{geom::Point{geom::X{0},geom::Y{1}},
-                       geom::Size{geom::Width{3},geom::Height{3}}}; 
+                       geom::Size{3, 3}};
     geom::Rectangle r2{geom::Point{geom::X{1},geom::Y{1}},
-                       geom::Size{geom::Width{2},geom::Height{3}}}; 
+                       geom::Size{2, 3}};
     mga::HWCRect a(r0), b(r1), c(r2);
     mga::HWCDefaultLayer original2({a, b, c});
     layer = original2;

=== modified file 'tests/unit-tests/graphics/android/test_internal_client.cpp'
--- tests/unit-tests/graphics/android/test_internal_client.cpp	2013-06-25 05:42:49 +0000
+++ tests/unit-tests/graphics/android/test_internal_client.cpp	2013-07-12 11:57:23 +0000
@@ -37,7 +37,7 @@
     }
     geom::Size size() const
     {
-        return geom::Size{geom::Width{4},geom::Height{2}};
+        return {4, 2};
     }
     geom::PixelFormat pixel_format() const
     {

=== modified file 'tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp'
--- tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp	2013-06-25 05:42:49 +0000
+++ tests/unit-tests/graphics/android/test_internal_client_interpreter.cpp	2013-07-12 11:57:23 +0000
@@ -52,7 +52,7 @@
     void SetUp()
     {
         using namespace testing;
-        sz = geom::Size{geom::Width{4}, geom::Height{23}};
+        sz = geom::Size{4, 23};
         pf = geom::PixelFormat::abgr_8888;
         mock_cache = std::make_shared<mtd::MockInterpreterResourceCache>();
         mock_surface = std::make_shared<MockSurface>();

=== modified file 'tests/unit-tests/graphics/android/test_server_interpreter.cpp'
--- tests/unit-tests/graphics/android/test_server_interpreter.cpp	2013-05-16 19:43:56 +0000
+++ tests/unit-tests/graphics/android/test_server_interpreter.cpp	2013-07-12 11:57:23 +0000
@@ -180,7 +180,7 @@
 TEST_F(ServerRenderWindowTest, driver_inquires_about_size_without_having_been_set)
 {
     using namespace testing;
-    auto test_size = geom::Size{geom::Width{4}, geom::Height{5}};
+    geom::Size test_size{4, 5};
     EXPECT_CALL(*mock_display_poster, display_size())
         .Times(4)
         .WillRepeatedly(Return(test_size));

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp	2013-07-01 06:53:02 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp	2013-07-12 11:57:23 +0000
@@ -56,7 +56,7 @@
 
         fake_devices.add_standard_drm_devices();
 
-        size = geom::Size{geom::Width{300}, geom::Height{200}};
+        size = geom::Size{300, 200};
         pf = geom::PixelFormat::argb_8888;
         stride = geom::Stride{4 * size.width.as_uint32_t()};
         usage = mc::BufferUsage::hardware;

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-07-01 06:53:02 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-07-12 11:57:23 +0000
@@ -54,7 +54,7 @@
 
         fake_devices.add_standard_drm_devices();
 
-        size = geom::Size{geom::Width{300}, geom::Height{200}};
+        size = geom::Size{300, 200};
         pf = geom::PixelFormat::argb_8888;
         usage = mc::BufferUsage::hardware;
         buffer_properties = mc::BufferProperties{size, pf, usage};

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp	2013-07-10 08:50:53 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp	2013-07-12 11:57:23 +0000
@@ -49,7 +49,7 @@
 
 mg::DisplayConfigurationMode conf_mode_from_drm_mode(drmModeModeInfo const& mode)
 {
-    geom::Size const size{geom::Width{mode.hdisplay}, geom::Height{mode.vdisplay}};
+    geom::Size const size{mode.hdisplay, mode.vdisplay};
     double vrefresh_hz{0.0};
 
     /* Calculate vertical refresh rate from DRM mode information */
@@ -141,7 +141,7 @@
     uint32_t const connector0_id{30};
     uint32_t const connector1_id{31};
     uint32_t const connector2_id{32};
-    geom::Size const connector0_physical_size_mm{geom::Width{480}, geom::Height{270}};
+    geom::Size const connector0_physical_size_mm{480, 270};
     geom::Size const connector1_physical_size_mm{};
     geom::Size const connector2_physical_size_mm{};
     std::vector<uint32_t> possible_encoder_ids_empty;
@@ -309,10 +309,10 @@
     std::vector<uint32_t> const encoder_ids{20, 21};
     std::vector<uint32_t> const connector_ids{30, 31};
     std::vector<geom::Size> const connector_physical_sizes_mm_before{
-        {geom::Width{480}, geom::Height{270}}, {}
+        {480, 270}, {}
     };
     std::vector<geom::Size> const connector_physical_sizes_mm_after{
-        {}, {geom::Width{512}, geom::Height{642}}
+        {}, {512, 642}
     };
     std::vector<uint32_t> possible_encoder_ids_empty;
     uint32_t const possible_crtcs_mask_empty{0};

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp	2013-07-10 08:50:53 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp	2013-07-12 11:57:23 +0000
@@ -100,7 +100,7 @@
         modes0.push_back(mtd::FakeDRMResources::create_mode(1680, 1050, 119000, 1840, 1080));
         modes0.push_back(mtd::FakeDRMResources::create_mode(832, 624, 57284, 1152, 667));
 
-        geom::Size const connector_physical_size_mm{geom::Width{1597}, geom::Height{987}};
+        geom::Size const connector_physical_size_mm{1597, 987};
 
         resources.reset();
 

=== modified file 'tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp'
--- tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp	2013-06-25 05:42:49 +0000
+++ tests/unit-tests/graphics/gbm/test_internal_native_surface.cpp	2013-07-12 11:57:23 +0000
@@ -146,8 +146,7 @@
 {
     using namespace ::testing;
     
-    geom::Size const test_surface_size = geom::Size{geom::Width{17},
-                                                    geom::Height{29}};
+    geom::Size const test_surface_size{17, 29};
     geom::PixelFormat const test_pixel_format = geom::PixelFormat::xrgb_8888;
     EXPECT_CALL(*mock_surface, size())
         .Times(1)

=== modified file 'tests/unit-tests/graphics/test_default_display_configuration_policy.cpp'
--- tests/unit-tests/graphics/test_default_display_configuration_policy.cpp	2013-07-10 08:50:53 +0000
+++ tests/unit-tests/graphics/test_default_display_configuration_policy.cpp	2013-07-12 11:57:23 +0000
@@ -40,11 +40,11 @@
                 mg::DisplayConfigurationOutputId{10},
                 card_id,
                 {
-                    {geom::Size{geom::Width{123}, geom::Height{111}}, 59.9},
-                    {geom::Size{geom::Width{123}, geom::Height{111}}, 59.9},
-                    {geom::Size{geom::Width{123}, geom::Height{111}}, 59.9}
+                    {geom::Size{123, 111}, 59.9},
+                    {geom::Size{123, 111}, 59.9},
+                    {geom::Size{123, 111}, 59.9}
                 },
-                geom::Size{geom::Width{324}, geom::Height{642}},
+                geom::Size{324, 642},
                 true,
                 false,
                 geom::Point{geom::X{123}, geom::Y{343}},
@@ -56,7 +56,7 @@
                 mg::DisplayConfigurationOutputId{11},
                 card_id,
                 {},
-                geom::Size{geom::Width{566}, geom::Height{111}},
+                geom::Size{566, 111},
                 true,
                 false,
                 geom::Point(),
@@ -68,9 +68,9 @@
                 mg::DisplayConfigurationOutputId{12},
                 card_id,
                 {
-                    {geom::Size{geom::Width{523}, geom::Height{555}}, 60.0},
+                    {geom::Size{523, 555}, 60.0},
                 },
-                geom::Size{geom::Width{324}, geom::Height{642}},
+                geom::Size{324, 642},
                 true,
                 false,
                 geom::Point(),
@@ -82,7 +82,7 @@
                 mg::DisplayConfigurationOutputId{13},
                 card_id,
                 {},
-                geom::Size{geom::Width{324}, geom::Height{642}},
+                geom::Size{324, 642},
                 false,
                 false,
                 geom::Point(),

=== modified file 'tests/unit-tests/graphics/test_display_configuration.cpp'
--- tests/unit-tests/graphics/test_display_configuration.cpp	2013-07-10 08:50:53 +0000
+++ tests/unit-tests/graphics/test_display_configuration.cpp	2013-07-12 11:57:23 +0000
@@ -31,11 +31,11 @@
     mg::DisplayConfigurationOutputId{3},
     mg::DisplayConfigurationCardId{2},
     {
-        {geom::Size{geom::Width{10}, geom::Height{20}}, 60.0},
-        {geom::Size{geom::Width{10}, geom::Height{20}}, 59.0},
-        {geom::Size{geom::Width{15}, geom::Height{20}}, 59.0}
+        {geom::Size{10, 20}, 60.0},
+        {geom::Size{10, 20}, 59.0},
+        {geom::Size{15, 20}, 59.0}
     },
-    geom::Size{geom::Width{10}, geom::Height{20}},
+    geom::Size{10, 20},
     true,
     true,
     geom::Point(),
@@ -46,7 +46,7 @@
 
 TEST(DisplayConfiguration, mode_equality)
 {
-    geom::Size const size{geom::Width{10}, geom::Height{20}};
+    geom::Size const size{10, 20};
     double const vrefresh{59.9};
 
     mg::DisplayConfigurationMode const mode1{size, vrefresh};
@@ -59,8 +59,8 @@
 
 TEST(DisplayConfiguration, mode_inequality)
 {
-    geom::Size const size1{geom::Width{10}, geom::Height{20}};
-    geom::Size const size2{geom::Width{10}, geom::Height{21}};
+    geom::Size const size1{10, 20};
+    geom::Size const size2{10, 21};
     double const vrefresh1{59.9};
     double const vrefresh2{60.0};
 
@@ -111,14 +111,14 @@
 
     std::vector<mg::DisplayConfigurationMode> const modes2
     {
-        {geom::Size{geom::Width{10}, geom::Height{20}}, 60.0},
-        {geom::Size{geom::Width{10}, geom::Height{20}}, 59.9},
-        {geom::Size{geom::Width{15}, geom::Height{20}}, 59.0}
+        {geom::Size{10, 20}, 60.0},
+        {geom::Size{10, 20}, 59.9},
+        {geom::Size{15, 20}, 59.0}
     };
     std::vector<mg::DisplayConfigurationMode> const modes3
     {
-        {geom::Size{geom::Width{10}, geom::Height{20}}, 60.0},
-        {geom::Size{geom::Width{10}, geom::Height{20}}, 59.0}
+        {geom::Size{10, 20}, 60.0},
+        {geom::Size{10, 20}, 59.0}
     };
 
     output2.modes = modes2;
@@ -137,7 +137,7 @@
     mg::DisplayConfigurationOutput const output1 = tmpl_output;
     mg::DisplayConfigurationOutput output2 = tmpl_output;
 
-    geom::Size const physical_size2{geom::Width{11}, geom::Height{20}};
+    geom::Size const physical_size2{11, 20};
 
     output2.physical_size_mm = physical_size2;
 

=== modified file 'tests/unit-tests/graphics/test_gl_pixel_buffer.cpp'
--- tests/unit-tests/graphics/test_gl_pixel_buffer.cpp	2013-06-26 03:03:27 +0000
+++ tests/unit-tests/graphics/test_gl_pixel_buffer.cpp	2013-07-12 11:57:23 +0000
@@ -60,8 +60,7 @@
         using namespace testing;
 
         ON_CALL(mock_buffer, size())
-            .WillByDefault(Return(geom::Size{geom::Width{100},
-                                             geom::Height{100}}));
+            .WillByDefault(Return(geom::Size{100, 100}));
     }
 
     testing::NiceMock<mtd::MockGL> mock_gl;

=== modified file 'tests/unit-tests/graphics/test_graphics_platform.cpp'
--- tests/unit-tests/graphics/test_graphics_platform.cpp	2013-07-02 05:03:20 +0000
+++ tests/unit-tests/graphics/test_graphics_platform.cpp	2013-07-12 11:57:23 +0000
@@ -126,7 +126,7 @@
 
     ASSERT_NE(0u, supported_pixel_formats.size());
 
-    geom::Size size{geom::Width{320}, geom::Height{240}};
+    geom::Size size{320, 240};
     geom::PixelFormat const pf{supported_pixel_formats[0]};
     mc::BufferUsage usage{mc::BufferUsage::hardware};
     mc::BufferProperties buffer_properties{size, pf, usage};

=== modified file 'tests/unit-tests/input/android/test_android_input_manager.cpp'
--- tests/unit-tests/input/android/test_android_input_manager.cpp	2013-07-03 22:07:12 +0000
+++ tests/unit-tests/input/android/test_android_input_manager.cpp	2013-07-12 11:57:23 +0000
@@ -100,8 +100,7 @@
         using namespace ::testing;
 
         const geom::Rectangle default_view_area =
-            geom::Rectangle{geom::Point(),
-                            geom::Size{geom::Width(1600), geom::Height(1400)}};
+            geom::Rectangle{geom::Point(), geom::Size{1600, 1400}};
 
 
         ON_CALL(view_area, view_area())

=== modified file 'tests/unit-tests/input/android/test_android_input_reader_policy.cpp'
--- tests/unit-tests/input/android/test_android_input_reader_policy.cpp	2013-03-13 08:09:52 +0000
+++ tests/unit-tests/input/android/test_android_input_reader_policy.cpp	2013-07-12 11:57:23 +0000
@@ -33,8 +33,7 @@
 namespace mtd = mir::test::doubles;
 
 static geom::Rectangle const default_view_area = geom::Rectangle{geom::Point(),
-                                                                 geom::Size{geom::Width(1600),
-                                                                            geom::Height(1400)}};
+                                                                 geom::Size{1600, 1400}};
 
 namespace
 {

=== modified file 'tests/unit-tests/input/android/test_android_input_window_handle.cpp'
--- tests/unit-tests/input/android/test_android_input_window_handle.cpp	2013-07-05 21:27:14 +0000
+++ tests/unit-tests/input/android/test_android_input_window_handle.cpp	2013-07-12 11:57:23 +0000
@@ -60,8 +60,7 @@
 {
     using namespace ::testing;
 
-    geom::Size const default_surface_size = geom::Size{geom::Width{256},
-                                                      geom::Height{256}};
+    geom::Size const default_surface_size{256, 256};
     geom::Point const default_surface_top_left = geom::Point{geom::X{10}, geom::Y{10}};
     std::string const testing_surface_name = "Test";
 

=== modified file 'tests/unit-tests/input/android/test_android_pointer_controller.cpp'
--- tests/unit-tests/input/android/test_android_pointer_controller.cpp	2013-03-13 08:09:52 +0000
+++ tests/unit-tests/input/android/test_android_pointer_controller.cpp	2013-07-12 11:57:23 +0000
@@ -36,8 +36,7 @@
 namespace mtd = mir::test::doubles;
 
 static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(),
-                                                                 geom::Size{geom::Width(1600),
-                                                                            geom::Height(1400)}};
+                                                                 geom::Size{1600, 1400}};
 
 namespace
 {

=== modified file 'tests/unit-tests/input/test_input_surface_info.cpp'
--- tests/unit-tests/input/test_input_surface_info.cpp	2013-07-05 23:36:24 +0000
+++ tests/unit-tests/input/test_input_surface_info.cpp	2013-07-12 11:57:23 +0000
@@ -41,7 +41,7 @@
     }
 
     geom::Point primitive_pt{geom::X{1}, geom::Y{1}};
-    geom::Size primitive_sz{geom::Width{1}, geom::Height{1}};
+    geom::Size primitive_sz{1, 1};
     geom::Rectangle primitive_rect{primitive_pt, primitive_sz};
     mtd::MockSurfaceInfo primitive_info;
 };
@@ -89,8 +89,8 @@
 TEST_F(InputSurfaceInfo, set_input_region)
 {
     std::vector<geom::Rectangle> const rectangles = {
-        {{geom::X{0}, geom::Y{0}}, {geom::Width{1}, geom::Height{1}}}, //region0
-        {{geom::X{1}, geom::Y{1}}, {geom::Width{1}, geom::Height{1}}}  //region1
+        {{geom::X{0}, geom::Y{0}}, geom::Size{1, 1}}, //region0
+        {{geom::X{1}, geom::Y{1}}, geom::Size{1, 1}}  //region1
     };
 
     mi::SurfaceDataStorage input_info(mt::fake_shared(primitive_info));

=== modified file 'tests/unit-tests/shell/test_consuming_placement_strategy.cpp'
--- tests/unit-tests/shell/test_consuming_placement_strategy.cpp	2013-05-21 17:16:43 +0000
+++ tests/unit-tests/shell/test_consuming_placement_strategy.cpp	2013-07-12 11:57:23 +0000
@@ -31,8 +31,7 @@
 namespace
 {
 static const geom::Rectangle default_view_area = geom::Rectangle{geom::Point(),
-                                                                 geom::Size{geom::Width(1600),
-                                                                            geom::Height(1600)}};
+                                                                 geom::Size{1600, 1600}};
 
 struct ConsumingPlacementStrategySetup : public testing::Test
 {
@@ -66,7 +65,7 @@
 {
     using namespace ::testing;
 
-    const geom::Size requested_size = geom::Size{geom::Width{100}, geom::Height{100}};
+    const geom::Size requested_size = geom::Size{100, 100};
 
     EXPECT_CALL(*viewable_area, view_area()).Times(1);
 

=== modified file 'tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp'
--- tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp	2013-07-01 06:36:33 +0000
+++ tests/unit-tests/shell/test_threaded_snapshot_strategy.cpp	2013-07-12 11:57:23 +0000
@@ -67,7 +67,7 @@
     using namespace testing;
 
     void const* pixels{reinterpret_cast<void*>(0xabcd)};
-    geom::Size size{geom::Width{10}, geom::Height{11}};
+    geom::Size size{10, 11};
     geom::Stride stride{123};
 
     MockPixelBuffer pixel_buffer;

=== modified file 'tests/unit-tests/surfaces/test_surface.cpp'
--- tests/unit-tests/surfaces/test_surface.cpp	2013-07-08 17:04:31 +0000
+++ tests/unit-tests/surfaces/test_surface.cpp	2013-07-12 11:57:23 +0000
@@ -68,7 +68,7 @@
 TEST(SurfaceCreationParametersTest, builder_mutators)
 {
     using namespace geom;
-    Size const size{Width{1024}, Height{768}};
+    Size const size{1024, 768};
     mc::BufferUsage const usage{mc::BufferUsage::hardware};
     geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
     std::string name{"surface"};
@@ -87,7 +87,7 @@
 TEST(SurfaceCreationParametersTest, equality)
 {
     using namespace geom;
-    Size const size{Width{1024}, Height{768}};
+    Size const size{1024, 768};
     mc::BufferUsage const usage{mc::BufferUsage::hardware};
     geom::PixelFormat const format{geom::PixelFormat::abgr_8888};
 
@@ -109,8 +109,8 @@
 {
     using namespace geom;
 
-    std::vector<Size> const sizes{{Width{1024}, Height{768}},
-                                  {Width{1025}, Height{768}}};
+    std::vector<Size> const sizes{{1024, 768},
+                                  {1025, 768}};
 
     std::vector<mc::BufferUsage> const usages{mc::BufferUsage::hardware,
                                               mc::BufferUsage::software};
@@ -165,7 +165,7 @@
 
         surface_name = "test_surfaceA";
         pf = geom::PixelFormat::abgr_8888;
-        size = geom::Size{geom::Width{43}, geom::Height{420}};
+        size = geom::Size{43, 420};
         rect = geom::Rectangle{geom::Point{geom::X{0}, geom::Y{0}}, size};
         stride = geom::Stride{4 * size.width.as_uint32_t()};
         mock_buffer_stream = std::make_shared<testing::NiceMock<mtd::MockBufferStream>>();
@@ -316,7 +316,7 @@
         std::shared_ptr<mi::InputChannel>(), null_change_cb);
     surf.set_rotation(60.0f, glm::vec3{0.0f, 0.0f, 1.0f});
 
-    geom::Size s{geom::Width{55}, geom::Height{66}};
+    geom::Size s{55, 66};
     ON_CALL(*mock_basic_info, size_and_position())
         .WillByDefault(Return(geom::Rectangle{geom::Point{geom::X{}, geom::Y{}},s}));
 
@@ -347,7 +347,7 @@
 {
     using namespace testing;
 
-    const geom::Size sz{geom::Width{85}, geom::Height{43}};
+    const geom::Size sz{85, 43};
     const geom::Rectangle origin{geom::Point{geom::X{77}, geom::Y{88}}, sz};
     const geom::Rectangle moved_pt{geom::Point{geom::X{55}, geom::Y{66}}, sz};
 

=== modified file 'tests/unit-tests/surfaces/test_surface_info.cpp'
--- tests/unit-tests/surfaces/test_surface_info.cpp	2013-07-08 17:04:31 +0000
+++ tests/unit-tests/surfaces/test_surface_info.cpp	2013-07-12 11:57:23 +0000
@@ -29,7 +29,7 @@
     {
         name = std::string("aa");
         top_left = geom::Point{geom::X{4}, geom::Y{7}};
-        size = geom::Size{geom::Width{5}, geom::Height{9}};
+        size = geom::Size{5, 9};
     }
     std::string name;
     geom::Point top_left;

=== modified file 'tests/unit-tests/surfaces/test_surface_stack.cpp'
--- tests/unit-tests/surfaces/test_surface_stack.cpp	2013-07-06 00:24:51 +0000
+++ tests/unit-tests/surfaces/test_surface_stack.cpp	2013-07-12 11:57:23 +0000
@@ -181,7 +181,7 @@
     ms::SurfaceStack stack(mt::fake_shared(buffer_stream_factory), 
         mt::fake_shared(input_factory), mt::fake_shared(input_registrar));
     std::weak_ptr<ms::Surface> surface = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
 
     stack.destroy_surface(surface);
 }
@@ -235,11 +235,11 @@
         mt::fake_shared(input_factory), mt::fake_shared(input_registrar));
 
     auto surface1 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
     auto surface2 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
     auto surface3 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
 
     mtd::MockSurfaceRenderer renderer;
     MockFilterForRenderables filter;
@@ -277,11 +277,11 @@
         mt::fake_shared(input_factory), mt::fake_shared(input_registrar));
 
     auto surface1 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
     auto surface2 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
     auto surface3 = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
 
     mtd::MockSurfaceRenderer renderer;
     MockFilterForRenderables filter;
@@ -311,7 +311,7 @@
     mtd::StubInputRegistrar input_registrar;
 
 
-    geom::Size const size{geom::Size{geom::Width{1024}, geom::Height{768}}};
+    geom::Size const size{1024, 768};
     geom::PixelFormat const format{geom::PixelFormat::bgr_888};
     mc::BufferUsage const usage{mc::BufferUsage::software};
 
@@ -364,7 +364,7 @@
     stack.set_change_callback(std::bind(&MockCallback::call, &mock_cb));
 
     std::weak_ptr<ms::Surface> surface = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
 }
 
 TEST(SurfaceStack, destroy_surface_notifies_changes)
@@ -381,7 +381,7 @@
     stack.set_change_callback(std::bind(&MockCallback::call, &mock_cb));
 
     std::weak_ptr<ms::Surface> surface = stack.create_surface(
-        msh::a_surface().of_size(geom::Size{geom::Width{1024}, geom::Height{768}}), default_depth);
+        msh::a_surface().of_size({1024, 768}), default_depth);
 
     Mock::VerifyAndClearExpectations(&mock_cb);
     EXPECT_CALL(mock_cb, call()).Times(1);
@@ -423,8 +423,7 @@
     using namespace ::testing;
     geom::Point const requested_top_left{geom::X{50},
                                          geom::Y{17}};
-    geom::Size const requested_size{geom::Width{1024}, 
-                                    geom::Height{768}};
+    geom::Size const requested_size{1024, 768};
     
     ms::SurfaceStack stack{std::make_shared<StubBufferStreamFactory>(),
         std::make_shared<StubInputChannelFactory>(),
@@ -444,8 +443,8 @@
     using namespace ::testing;
     geom::Point const requested_top_left{geom::X{50},
                                          geom::Y{17}};
-    geom::Size const requested_size{geom::Width{1024}, geom::Height{768}}; 
-    geom::Size const stream_size{geom::Width{1025}, geom::Height{769}};
+    geom::Size const requested_size{1024, 768};
+    geom::Size const stream_size{1025, 769};
 
     MockBufferStreamFactory buffer_stream_factory;
     auto stream = std::make_shared<mtd::MockBufferStream>();