Merge lp:~kdub/mir/reduce-mediator-dependencies into lp:~mir-team/mir/trunk

[Kevin DuBois]

mf::SessionMediator had both mc::GraphicBufferAllocator and mg::Platform as a dependency. This is because it needed to query the /platform's/ supported pixel types. Tease out this dependency by moving the function to get the platform's pixel formats from the buffer factory to the platform, and eliminate the graphic buffer factory interface from the SessionMediator

mf::SessionMediator had both mc::GraphicBufferAllocator and mg::Platform as a dependency. This is because it needed to query the /platform's/ supported pixel types. Tease out this dependency by moving the function to get the platform's pixel formats from the buffer factory to the platform, and eliminate the graphic buffer factory interface from the SessionMediator

[Kevin DuBois (kdub)]

I think that mg::Platform is probably also an unneeded dependency for SessionMediator, but we can tease that out in a subsequent mp

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:714
http://jenkins.qa.ubuntu.com/job/mir-ci/651/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/136
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/136/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

I am not sure about this. We are talking about the pixel format of created buffers, so the buffer allocator, which receives requests for buffer creation, seems to me to be the one who should know/provide that information, not the Platform in general.

Is there another reason we want to eliminate the allocator dependency from session mediator, besides reducing the number of dependencies?

I think we are attacking the problem from the wrong angle, though. The session mediator doesn't need to know about either the mg::Platform or the mc::BufferAllocator. It just needs leaner mf::IPCPackaging and mf::SupportedPixelFormats interfaces, that could be implemented by whichever object we want (even an adapter object if needed).

Needs Information == Needs Discussion

review: Needs Information

[Alan Griffiths (alan-griffiths)]

I agree with all the motivations discussed by Kevin and Alexandros - it is wrong that SessionMediator has a dependency on GraphicBufferAllocator simply so that it can provide the information needed to form a request to Shell::create_surface_for().

But I don't see that moving this dependency to mg::Platform is the right approach.

Surely, the method ought to go to Shell (or Session?) - as that is the interface that (eventually, after a round trip to the client) consumes the information. (Admittedly Shell doesn't have direct access to the supported pixels either, so there's a domino effect.)

Needs Discussion

PS why the sudden urge to fix this? Is there some new motivation that's come to light but hasn't been mentioned?

review: Needs Fixing

[Kevin DuBois (kdub)]

It seems the best approach for correcting the dependency would be to get the BufferAllocator and the Platform to be owned somewhere else and the SessionMediator to access this through the appropriate interface... I'm not too attached to this branch, so I think I'll reject it in favor of refactoring a different way.

as to the 'why the sudden urge to fix this', in another branch, I was working on getting the swapinterval0 messages to come over the wire, and finding things in this part of the code difficult to mock/test.

Unmerged revisions

714. By Kevin DuBois on 2013-05-31

get android tests to pass

713. By Kevin DuBois on 2013-05-31

get all gbm to compile/pass

712. By Kevin DuBois on 2013-05-30

change session mediator test so we dont depend on the buffer allocator in the frontend

711. By Robert Ancell on 2013-05-30

Revert removal of mir_connection_drm_auth_magic() - it is required for XMir.

Approved by PS Jenkins bot, Robert Carr, Alexandros Frantzis, Chris Halse Rogers.

710. By Alan Griffiths on 2013-05-30

graphics::android: add some customization points to DefaultFramebufferFactory.

Approved by PS Jenkins bot, Alexandros Frantzis, Robert Ancell, Robert Carr.

709. By Robert Carr on 2013-05-30

Demote old input logs to a legacy report. Replace with a new InputReport interface and both logging and LTTNG based implementations.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

708. By Alexandros Frantzis on 2013-05-30

client: Move rpc components to their own subdirectory and namespace.

Approved by Alan Griffiths, Robert Carr, PS Jenkins bot.

707. By Alan Griffiths on 2013-05-29

compositor: another destructor marked non-throwing.

Approved by PS Jenkins bot, Robert Carr.

706. By Alexandros Frantzis on 2013-05-29

client: Introduce RpcReport class and logging implementation for it.

Approved by Alan Griffiths, Kevin DuBois, Robert Ancell, PS Jenkins bot.

705. By Robert Ancell on 2013-05-29

Close dmabuf file descriptor when the GBMBuffer is destroyed. Fixes: https://bugs.launchpad.net/bugs/1185183.

Approved by Alan Griffiths, Alexandros Frantzis, PS Jenkins bot.

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-05-21 17:16:43 +0000
+++ examples/render_surfaces.cpp	2013-05-31 00:41:23 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir/compositor/default_compositing_strategy.h"
-#include "mir/compositor/graphic_buffer_allocator.h"
+#include "mir/graphics/platform.h"
 #include "mir/frontend/communicator.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/geometry/size.h"
@@ -376,7 +376,7 @@
         float const angular_step = 2.0 * M_PI / moveables.size();
         float const w = display_size.width.as_uint32_t();
         float const h = display_size.height.as_uint32_t();
-        auto const surface_pf = the_buffer_allocator()->supported_pixel_formats()[0];
+        auto const surface_pf = the_graphics_platform()->supported_pixel_formats()[0];
 
         int i = 0;
         for (auto& m : moveables)

=== modified file 'include/server/mir/compositor/graphic_buffer_allocator.h'
--- include/server/mir/compositor/graphic_buffer_allocator.h	2013-05-24 15:44:11 +0000
+++ include/server/mir/compositor/graphic_buffer_allocator.h	2013-05-31 00:41:23 +0000
@@ -21,7 +21,6 @@
 
 #include "mir/compositor/buffer.h"
 
-#include <vector>
 #include <memory>
 
 namespace mir
@@ -39,8 +38,6 @@
     virtual std::shared_ptr<Buffer> alloc_buffer(
         BufferProperties const& buffer_properties) = 0;
 
-    virtual std::vector<geometry::PixelFormat> supported_pixel_formats() = 0;
-
 protected:
     GraphicBufferAllocator() = default;
     GraphicBufferAllocator(const GraphicBufferAllocator&) = delete;

=== modified file 'include/server/mir/frontend/session_mediator.h'
--- include/server/mir/frontend/session_mediator.h	2013-05-30 03:50:54 +0000
+++ include/server/mir/frontend/session_mediator.h	2013-05-31 00:41:23 +0000
@@ -62,7 +62,6 @@
         std::shared_ptr<Shell> const& shell,
         std::shared_ptr<graphics::Platform> const& graphics_platform,
         std::shared_ptr<graphics::ViewableArea> const& viewable_area,
-        std::shared_ptr<compositor::GraphicBufferAllocator> const& buffer_allocator,
         std::shared_ptr<SessionMediatorReport> const& report,
         std::shared_ptr<events::EventSink> const& event_sink,
         std::shared_ptr<ResourceCache> const& resource_cache);

=== modified file 'include/server/mir/graphics/platform.h'
--- include/server/mir/graphics/platform.h	2013-05-17 18:18:20 +0000
+++ include/server/mir/graphics/platform.h	2013-05-31 00:41:23 +0000
@@ -20,7 +20,10 @@
 #ifndef MIR_GRAPHICS_PLATFORM_H_
 #define MIR_GRAPHICS_PLATFORM_H_
 
+#include "mir/geometry/pixel_format.h"
+
 #include <memory>
+#include <vector>
 
 namespace mir
 {
@@ -62,6 +65,7 @@
                                   std::shared_ptr<compositor::Buffer> const& buffer) const = 0;
     
     virtual std::shared_ptr<InternalClient> create_internal_client() = 0;
+    virtual std::vector<geometry::PixelFormat> supported_pixel_formats() = 0;
 };
 
 // Create and return a new graphics platform.

=== modified file 'include/test/mir_test_doubles/stub_platform.h'
--- include/test/mir_test_doubles/stub_platform.h	2013-05-17 18:18:20 +0000
+++ include/test/mir_test_doubles/stub_platform.h	2013-05-31 00:41:23 +0000
@@ -57,6 +57,11 @@
                           std::shared_ptr<compositor::Buffer> const&) const
     {
     }
+    
+    virtual std::vector<geometry::PixelFormat> supported_pixel_formats()
+    {
+        return std::vector<geometry::PixelFormat>();
+    }
 };
 }
 }

=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-05-28 18:24:07 +0000
+++ src/server/default_server_configuration.cpp	2013-05-31 00:41:23 +0000
@@ -123,7 +123,6 @@
             shell,
             graphics_platform,
             graphics_display,
-            buffer_allocator,
             sm_report,
             sink,
             resource_cache());

=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2013-05-22 00:44:25 +0000
+++ src/server/frontend/session_mediator.cpp	2013-05-31 00:41:23 +0000
@@ -27,7 +27,6 @@
 #include "mir/compositor/buffer_id.h"
 #include "mir/compositor/buffer.h"
 #include "mir/surfaces/buffer_bundle.h"
-#include "mir/compositor/graphic_buffer_allocator.h"
 #include "mir/geometry/dimensions.h"
 #include "mir/graphics/platform.h"
 #include "mir/graphics/viewable_area.h"
@@ -46,14 +45,12 @@
     std::shared_ptr<frontend::Shell> const& shell,
     std::shared_ptr<graphics::Platform> const & graphics_platform,
     std::shared_ptr<graphics::ViewableArea> const& viewable_area,
-    std::shared_ptr<compositor::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<SessionMediatorReport> const& report,
     std::shared_ptr<events::EventSink> const& event_sink,
     std::shared_ptr<ResourceCache> const& resource_cache) :
     shell(shell),
     graphics_platform(graphics_platform),
     viewable_area(viewable_area),
-    buffer_allocator(buffer_allocator),
     report(report),
     event_sink(event_sink),
     resource_cache(resource_cache),
@@ -85,7 +82,7 @@
     display_info->set_width(view_area.size.width.as_uint32_t());
     display_info->set_height(view_area.size.height.as_uint32_t());
 
-    auto supported_pixel_formats = buffer_allocator->supported_pixel_formats();
+    auto supported_pixel_formats = graphics_platform->supported_pixel_formats();
     for (auto pf : supported_pixel_formats)
         display_info->add_supported_pixel_format(static_cast<uint32_t>(pf));
 

=== modified file 'src/server/graphics/android/android_buffer_allocator.cpp'
--- src/server/graphics/android/android_buffer_allocator.cpp	2013-05-01 22:05:55 +0000
+++ src/server/graphics/android/android_buffer_allocator.cpp	2013-05-31 00:41:23 +0000
@@ -83,17 +83,6 @@
     return buffer;
 }
 
-std::vector<geom::PixelFormat> mga::AndroidGraphicBufferAllocator::supported_pixel_formats()
-{
-    static std::vector<geom::PixelFormat> const pixel_formats{
-        geom::PixelFormat::abgr_8888,
-        geom::PixelFormat::xbgr_8888,
-        geom::PixelFormat::bgr_888
-    };
-
-    return pixel_formats;
-}
-
 mga::BufferUsage mga::AndroidGraphicBufferAllocator::convert_from_compositor_usage(mc::BufferUsage usage)
 {
     switch (usage)

=== modified file 'src/server/graphics/android/android_graphic_buffer_allocator.h'
--- src/server/graphics/android/android_graphic_buffer_allocator.h	2013-05-24 15:51:37 +0000
+++ src/server/graphics/android/android_graphic_buffer_allocator.h	2013-05-31 00:41:23 +0000
@@ -50,8 +50,6 @@
     std::shared_ptr<Buffer> alloc_buffer_platform(
         geometry::Size sz, geometry::PixelFormat pf, BufferUsage use);
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats();
-
     static BufferUsage convert_from_compositor_usage(compositor::BufferUsage usage);
 
 private:

=== modified file 'src/server/graphics/android/android_platform.cpp'
--- src/server/graphics/android/android_platform.cpp	2013-05-24 15:44:11 +0000
+++ src/server/graphics/android/android_platform.cpp	2013-05-31 00:41:23 +0000
@@ -33,6 +33,7 @@
 namespace mga=mir::graphics::android;
 namespace mc=mir::compositor;
 namespace mf=mir::frontend;
+namespace geom = mir::geometry;
 
 mga::AndroidPlatform::AndroidPlatform(std::shared_ptr<mg::DisplayReport> const& display_report)
     : display_report(display_report)
@@ -98,6 +99,17 @@
     return std::make_shared<mga::InternalClient>();
 }
 
+std::vector<geom::PixelFormat> mga::AndroidPlatform::supported_pixel_formats()
+{
+    static std::vector<geom::PixelFormat> const pixel_formats{
+        geom::PixelFormat::abgr_8888,
+        geom::PixelFormat::xbgr_8888,
+        geom::PixelFormat::bgr_888
+    };
+
+    return pixel_formats;
+}
+
 std::shared_ptr<mg::Platform> mg::create_platform(std::shared_ptr<DisplayReport> const& display_report)
 {
     return std::make_shared<mga::AndroidPlatform>(display_report);

=== modified file 'src/server/graphics/android/android_platform.h'
--- src/server/graphics/android/android_platform.h	2013-05-24 14:11:14 +0000
+++ src/server/graphics/android/android_platform.h	2013-05-31 00:41:23 +0000
@@ -44,6 +44,7 @@
     std::shared_ptr<InternalClient> create_internal_client();
     void fill_ipc_package(std::shared_ptr<compositor::BufferIPCPacker> const& packer,
                           std::shared_ptr<compositor::Buffer> const& buffer) const;
+    std::vector<geometry::PixelFormat> supported_pixel_formats();
 
 private:
     // TODO a design that has this and create_buffer_allocator is missing simplicity

=== modified file 'src/server/graphics/gbm/gbm_buffer_allocator.cpp'
--- src/server/graphics/gbm/gbm_buffer_allocator.cpp	2013-04-29 23:59:18 +0000
+++ src/server/graphics/gbm/gbm_buffer_allocator.cpp	2013-05-31 00:41:23 +0000
@@ -182,13 +182,3 @@
 
     return buffer;
 }
-
-std::vector<geom::PixelFormat> mgg::GBMBufferAllocator::supported_pixel_formats()
-{
-    static std::vector<geom::PixelFormat> const pixel_formats{
-        geom::PixelFormat::argb_8888,
-        geom::PixelFormat::xrgb_8888
-    };
-
-    return pixel_formats;
-}

=== modified file 'src/server/graphics/gbm/gbm_buffer_allocator.h'
--- src/server/graphics/gbm/gbm_buffer_allocator.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/gbm/gbm_buffer_allocator.h	2013-05-31 00:41:23 +0000
@@ -20,7 +20,6 @@
 #define MIR_PLATFORM_GBM_GBM_BUFFER_ALLOCATOR_H_
 
 #include "mir/compositor/graphic_buffer_allocator.h"
-#include "mir/compositor/buffer_id.h"
 
 #include <memory>
 
@@ -45,8 +44,6 @@
     virtual std::shared_ptr<compositor::Buffer> alloc_buffer(
         compositor::BufferProperties const& buffer_properties);
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats();
-
 private:
     std::shared_ptr<GBMPlatform> platform;
     std::shared_ptr<graphics::BufferInitializer> buffer_initializer;

=== modified file 'src/server/graphics/gbm/gbm_platform.cpp'
--- src/server/graphics/gbm/gbm_platform.cpp	2013-05-30 03:50:54 +0000
+++ src/server/graphics/gbm/gbm_platform.cpp	2013-05-31 00:41:23 +0000
@@ -34,6 +34,8 @@
 namespace mg = mir::graphics;
 namespace mgg = mg::gbm;
 namespace mc = mir::compositor;
+namespace geom = mir::geometry;
+
 namespace
 {
 
@@ -143,6 +145,16 @@
     return std::make_shared<mgg::InternalClient>(internal_native_display);
 }
 
+std::vector<geom::PixelFormat> mgg::GBMPlatform::supported_pixel_formats()
+{
+    static std::vector<geom::PixelFormat> const pixel_formats{
+        geom::PixelFormat::argb_8888,
+        geom::PixelFormat::xrgb_8888
+    };
+
+    return pixel_formats;
+}
+
 std::shared_ptr<mg::Platform> mg::create_platform(std::shared_ptr<DisplayReport> const& report)
 {
     auto real_fops = std::make_shared<RealVTFileOperations>();

=== modified file 'src/server/graphics/gbm/gbm_platform.h'
--- src/server/graphics/gbm/gbm_platform.h	2013-05-30 03:50:54 +0000
+++ src/server/graphics/gbm/gbm_platform.h	2013-05-31 00:41:23 +0000
@@ -52,6 +52,7 @@
 
     void fill_ipc_package(std::shared_ptr<compositor::BufferIPCPacker> const& packer,
                           std::shared_ptr<compositor::Buffer> const& buffer) const;
+    std::vector<geometry::PixelFormat> supported_pixel_formats();
 
     /* From DRMAuthenticator */
     void drm_auth_magic(drm_magic_t magic);

=== modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-05-17 18:48:07 +0000
+++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-05-31 00:41:23 +0000
@@ -74,11 +74,6 @@
     {
         return std::shared_ptr<mc::Buffer>(new StubBufferThread());
     }
-
-    std::vector<geom::PixelFormat> supported_pixel_formats()
-    {
-        return std::vector<geom::PixelFormat>();
-    }
 };
 
 class StubGraphicPlatform : public mg::Platform
@@ -108,6 +103,11 @@
     void fill_ipc_package(std::shared_ptr<mc::BufferIPCPacker> const&, std::shared_ptr<mc::Buffer> const&) const
     {
     }
+
+    std::vector<geom::PixelFormat> supported_pixel_formats()
+    {
+        return std::vector<geom::PixelFormat>();
+    }
 };
 
 class GBMBufferIntegration : public ::testing::Test

=== modified file 'tests/integration-tests/test_display_info.cpp'
--- tests/integration-tests/test_display_info.cpp	2013-05-17 18:18:20 +0000
+++ tests/integration-tests/test_display_info.cpp	2013-05-31 00:41:23 +0000
@@ -71,18 +71,6 @@
         return std::shared_ptr<mc::Buffer>(new mtd::StubBuffer());
     }
 
-    std::vector<geom::PixelFormat> supported_pixel_formats()
-    {
-        return pixel_formats;
-    }
-
-    static std::vector<geom::PixelFormat> const pixel_formats;
-};
-
-std::vector<geom::PixelFormat> const StubGraphicBufferAllocator::pixel_formats{
-    geom::PixelFormat::bgr_888,
-    geom::PixelFormat::abgr_8888,
-    geom::PixelFormat::xbgr_8888
 };
 
 class StubPlatform : public mg::Platform
@@ -113,7 +101,20 @@
                           std::shared_ptr<mc::Buffer> const&) const
     {
     }
-};
+
+    std::vector<geom::PixelFormat> supported_pixel_formats()
+    {
+        return pixel_formats;
+    }
+    static std::vector<geom::PixelFormat> const pixel_formats;
+};
+
+std::vector<geom::PixelFormat> const StubPlatform::pixel_formats{
+    geom::PixelFormat::bgr_888,
+    geom::PixelFormat::abgr_8888,
+    geom::PixelFormat::xbgr_8888
+};
+
 
 void connection_callback(MirConnection* connection, void* context)
 {
@@ -159,12 +160,12 @@
             EXPECT_EQ(StubDisplay::rectangle.size.height.as_uint32_t(),
                       static_cast<uint32_t>(info.height));
 
-            ASSERT_EQ(StubGraphicBufferAllocator::pixel_formats.size(),
+            ASSERT_EQ(StubPlatform::pixel_formats.size(),
                       static_cast<uint32_t>(info.supported_pixel_format_items));
 
             for (int i = 0; i < info.supported_pixel_format_items; ++i)
             {
-                EXPECT_EQ(StubGraphicBufferAllocator::pixel_formats[i],
+                EXPECT_EQ(StubPlatform::pixel_formats[i],
                           static_cast<geom::PixelFormat>(info.supported_pixel_format[i]));
             }
 

=== modified file 'tests/integration-tests/test_drm_auth_magic.cpp'
--- tests/integration-tests/test_drm_auth_magic.cpp	2013-05-30 03:50:54 +0000
+++ tests/integration-tests/test_drm_auth_magic.cpp	2013-05-31 00:41:23 +0000
@@ -89,6 +89,11 @@
     {
     }
 
+    std::vector<geom::PixelFormat> supported_pixel_formats()
+    {
+        return std::vector<geom::PixelFormat>();
+    }
+
     MOCK_METHOD1(drm_auth_magic, void(unsigned int));
 };
 

=== modified file 'tests/integration-tests/test_surfaceloop.cpp'
--- tests/integration-tests/test_surfaceloop.cpp	2013-05-24 15:44:11 +0000
+++ tests/integration-tests/test_surfaceloop.cpp	2013-05-31 00:41:23 +0000
@@ -98,11 +98,6 @@
         std::shared_ptr<mc::Buffer> (mc::BufferProperties const&));
 
 
-    std::vector<geom::PixelFormat> supported_pixel_formats()
-    {
-        return std::vector<geom::PixelFormat>();
-    }
-
     std::unique_ptr<mc::Buffer> on_create_swapper(mc::BufferProperties const&)
     {
         return std::unique_ptr<mc::Buffer>(new mtd::StubBuffer(::buffer_properties));
@@ -366,6 +361,12 @@
                               std::shared_ptr<mc::Buffer> const&) const
         {
         }
+
+        std::vector<geom::PixelFormat> supported_pixel_formats()
+        {
+            return std::vector<geom::PixelFormat>();
+        }
+
     };
 
     std::shared_ptr<mg::Platform> the_graphics_platform()
@@ -503,6 +504,11 @@
                               std::shared_ptr<mc::Buffer> const&) const
         {
         }
+
+        std::vector<geom::PixelFormat> supported_pixel_formats()
+        {
+            return std::vector<geom::PixelFormat>();
+        }
     };
 
     std::shared_ptr<mg::Platform> the_graphics_platform()

=== modified file 'tests/mir_test_framework/testing_server_options.cpp'
--- tests/mir_test_framework/testing_server_options.cpp	2013-05-21 15:11:41 +0000
+++ tests/mir_test_framework/testing_server_options.cpp	2013-05-31 00:41:23 +0000
@@ -66,11 +66,6 @@
     {
         return std::unique_ptr<mc::Buffer>(new mtd::StubBuffer(properties));
     }
-
-    std::vector<geom::PixelFormat> supported_pixel_formats()
-    {
-        return std::vector<geom::PixelFormat>();
-    }
 };
 
 class StubDisplay : public mg::Display
@@ -127,6 +122,11 @@
                           std::shared_ptr<mc::Buffer> const&) const
     {
     }
+
+    std::vector<geom::PixelFormat> supported_pixel_formats()
+    {
+        return std::vector<geom::PixelFormat>();
+    }
 };
 
 class StubRenderer : public mg::Renderer

=== modified file 'tests/unit-tests/frontend/test_session_mediator.cpp'
--- tests/unit-tests/frontend/test_session_mediator.cpp	2013-05-30 03:50:54 +0000
+++ tests/unit-tests/frontend/test_session_mediator.cpp	2013-05-31 00:41:23 +0000
@@ -87,24 +87,6 @@
 
 int const StubbedSession::testing_client_input_fd{11};
 
-class MockGraphicBufferAllocator : public mc::GraphicBufferAllocator
-{
-public:
-    MockGraphicBufferAllocator()
-    {
-        ON_CALL(*this, supported_pixel_formats())
-            .WillByDefault(testing::Return(std::vector<geom::PixelFormat>()));
-    }
-
-    std::shared_ptr<mc::Buffer> alloc_buffer(mc::BufferProperties const&)
-    {
-        return std::shared_ptr<mc::Buffer>();
-    }
-
-    MOCK_METHOD0(supported_pixel_formats, std::vector<geom::PixelFormat>());
-    ~MockGraphicBufferAllocator() noexcept {}
-};
-
 class MockPlatform : public mg::Platform
 {
  public:
@@ -117,6 +99,8 @@
             .WillByDefault(Return(std::make_shared<mtd::NullDisplay>()));
         ON_CALL(*this, get_ipc_package())
             .WillByDefault(Return(std::make_shared<mg::PlatformIPCPackage>()));
+        ON_CALL(*this, supported_pixel_formats())
+            .WillByDefault(Return(std::vector<geom::PixelFormat>({})));
     }
 
     MOCK_METHOD1(create_buffer_allocator, std::shared_ptr<mc::GraphicBufferAllocator>(std::shared_ptr<mg::BufferInitializer> const&));
@@ -125,6 +109,7 @@
     MOCK_METHOD0(create_internal_client, std::shared_ptr<mg::InternalClient>());
     MOCK_CONST_METHOD2(fill_ipc_package, void(std::shared_ptr<mc::BufferIPCPacker> const&,
                                               std::shared_ptr<mc::Buffer> const&));
+    MOCK_METHOD0(supported_pixel_formats, std::vector<geom::PixelFormat>());
 };
 
 class NullEventSink : public mir::events::EventSink
@@ -139,11 +124,9 @@
         : shell{std::make_shared<testing::NiceMock<mtd::MockShell>>()},
           graphics_platform{std::make_shared<MockPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
-          buffer_allocator{std::make_shared<testing::NiceMock<MockGraphicBufferAllocator>>()},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, graphics_platform, graphics_display,
-                   buffer_allocator, report, 
+          mediator{shell, graphics_platform, graphics_display, report,
                    std::make_shared<NullEventSink>(),
                    resource_cache},
           stubbed_session{std::make_shared<StubbedSession>()},
@@ -158,7 +141,6 @@
     std::shared_ptr<testing::NiceMock<mtd::MockShell>> const shell;
     std::shared_ptr<MockPlatform> const graphics_platform;
     std::shared_ptr<mg::Display> const graphics_display;
-    std::shared_ptr<testing::NiceMock<MockGraphicBufferAllocator>> const buffer_allocator;
     std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
     mf::SessionMediator mediator;
@@ -309,7 +291,7 @@
         geom::PixelFormat::xbgr_8888
     };
 
-    EXPECT_CALL(*buffer_allocator, supported_pixel_formats())
+    EXPECT_CALL(*graphics_platform, supported_pixel_formats())
         .WillOnce(Return(pixel_formats));
 
     mediator.connect(nullptr, &connect_parameters, &connection, null_callback.get());

=== modified file 'tests/unit-tests/frontend/test_session_mediator_android.cpp'
--- tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-05-30 03:50:54 +0000
+++ tests/unit-tests/frontend/test_session_mediator_android.cpp	2013-05-31 00:41:23 +0000
@@ -16,7 +16,6 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "mir/compositor/graphic_buffer_allocator.h"
 #include "mir/frontend/session_mediator_report.h"
 #include "mir/frontend/session_mediator.h"
 #include "mir/frontend/resource_cache.h"
@@ -49,20 +48,6 @@
 namespace
 {
 
-class StubGraphicBufferAllocator : public mc::GraphicBufferAllocator
-{
-public:
-    std::shared_ptr<mc::Buffer> alloc_buffer(mc::BufferProperties const&)
-    {
-        return std::shared_ptr<mc::Buffer>();
-    }
-
-    virtual std::vector<geom::PixelFormat> supported_pixel_formats()
-    {
-        return std::vector<geom::PixelFormat>();
-    }
-};
-
 class NullEventSink : public mir::events::EventSink
 {
 public:
@@ -75,11 +60,9 @@
         : shell{std::make_shared<mtd::StubShell>()},
           graphics_platform{std::make_shared<mtd::StubPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
-          buffer_allocator{std::make_shared<StubGraphicBufferAllocator>()},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, graphics_platform, graphics_display,
-                   buffer_allocator, report,
+          mediator{shell, graphics_platform, graphics_display, report,
                    std::make_shared<NullEventSink>(),
                    resource_cache},
           null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}
@@ -89,7 +72,6 @@
     std::shared_ptr<mtd::StubShell> const shell;
     std::shared_ptr<mtd::StubPlatform> const graphics_platform;
     std::shared_ptr<mg::Display> const graphics_display;
-    std::shared_ptr<mc::GraphicBufferAllocator> const buffer_allocator;
     std::shared_ptr<mf::SessionMediatorReport> const report;
     std::shared_ptr<mf::ResourceCache> const resource_cache;
     mf::SessionMediator mediator;

=== modified file 'tests/unit-tests/frontend/test_session_mediator_gbm.cpp'
--- tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-05-30 03:50:54 +0000
+++ tests/unit-tests/frontend/test_session_mediator_gbm.cpp	2013-05-31 00:41:23 +0000
@@ -49,27 +49,13 @@
 namespace
 {
 
-class StubGraphicBufferAllocator : public mc::GraphicBufferAllocator
-{
-public:
-    std::shared_ptr<mc::Buffer> alloc_buffer(mc::BufferProperties const&)
-    {
-        return std::shared_ptr<mc::Buffer>();
-    }
-
-    virtual std::vector<geom::PixelFormat> supported_pixel_formats()
-    {
-        return std::vector<geom::PixelFormat>();
-    }
-};
-
 class MockAuthenticatingPlatform : public mg::Platform, public mg::DRMAuthenticator
 {
  public:
     std::shared_ptr<mc::GraphicBufferAllocator> create_buffer_allocator(
             const std::shared_ptr<mg::BufferInitializer>& /*buffer_initializer*/)
     {
-        return std::shared_ptr<StubGraphicBufferAllocator>();
+        return std::shared_ptr<mc::GraphicBufferAllocator>();
     }
 
     std::shared_ptr<mg::Display> create_display()
@@ -92,6 +78,11 @@
     {
     }
 
+    virtual std::vector<geom::PixelFormat> supported_pixel_formats()
+    {
+        return std::vector<geom::PixelFormat>();
+    }
+
     MOCK_METHOD1(drm_auth_magic, void(drm_magic_t));
 };
 
@@ -107,11 +98,9 @@
         : shell{std::make_shared<mtd::StubShell>()},
           mock_platform{std::make_shared<MockAuthenticatingPlatform>()},
           graphics_display{std::make_shared<mtd::NullDisplay>()},
-          buffer_allocator{std::make_shared<StubGraphicBufferAllocator>()},
           report{std::make_shared<mf::NullSessionMediatorReport>()},
           resource_cache{std::make_shared<mf::ResourceCache>()},
-          mediator{shell, mock_platform, graphics_display,
-                   buffer_allocator, report,
+          mediator{shell, mock_platform, graphics_display, report,
                    std::make_shared<NullEventSink>(),
                    resource_cache},
           null_callback{google::protobuf::NewPermanentCallback(google::protobuf::DoNothing)}

=== modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
--- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-05-24 15:51:37 +0000
+++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-05-31 00:41:23 +0000
@@ -54,37 +54,6 @@
     mga::AndroidGraphicBufferAllocator allocator(null_buffer_initializer);
 }
 
-TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_contain_common_formats)
-{
-    mga::AndroidGraphicBufferAllocator allocator{null_buffer_initializer};
-    auto supported_pixel_formats = allocator.supported_pixel_formats();
-
-    auto abgr_8888_count = std::count(supported_pixel_formats.begin(),
-                                      supported_pixel_formats.end(),
-                                      geom::PixelFormat::abgr_8888);
-
-    auto xbgr_8888_count = std::count(supported_pixel_formats.begin(),
-                                      supported_pixel_formats.end(),
-                                      geom::PixelFormat::xbgr_8888);
-
-    auto bgr_888_count = std::count(supported_pixel_formats.begin(),
-                                    supported_pixel_formats.end(),
-                                    geom::PixelFormat::bgr_888);
-
-    EXPECT_EQ(1, abgr_8888_count);
-    EXPECT_EQ(1, xbgr_8888_count);
-    EXPECT_EQ(1, bgr_888_count);
-}
-
-TEST_F(AndroidGraphicBufferAllocatorTest, supported_pixel_formats_have_sane_default_in_first_position)
-{
-    mga::AndroidGraphicBufferAllocator allocator{null_buffer_initializer};
-    auto supported_pixel_formats = allocator.supported_pixel_formats();
-
-    ASSERT_FALSE(supported_pixel_formats.empty());
-    EXPECT_EQ(geom::PixelFormat::abgr_8888, supported_pixel_formats[0]);
-}
-
 TEST_F(AndroidGraphicBufferAllocatorTest, alloc_buffer_calls_initializer)
 {
     using namespace testing;

=== modified file 'tests/unit-tests/graphics/android/test_android_platform.cpp'
--- tests/unit-tests/graphics/android/test_android_platform.cpp	2013-05-17 18:48:07 +0000
+++ tests/unit-tests/graphics/android/test_android_platform.cpp	2013-05-31 00:41:23 +0000
@@ -29,7 +29,7 @@
 namespace mtd=mir::test::doubles;
 namespace geom=mir::geometry;
 
-class PlatformBufferIPCPackaging : public ::testing::Test
+class AndroidPlatform : public ::testing::Test
 {
 protected:
     virtual void SetUp()
@@ -71,7 +71,7 @@
 };
 
 /* ipc packaging tests */
-TEST_F(PlatformBufferIPCPackaging, test_ipc_data_packed_correctly)
+TEST_F(AndroidPlatform, test_ipc_data_packed_correctly)
 {
     auto mock_buffer = std::make_shared<mtd::MockBuffer>();
     geom::Stride dummy_stride(4390);
@@ -101,3 +101,37 @@
     platform->fill_ipc_package(mock_packer, mock_buffer);
 
 }
+
+TEST(AndroidPlatformFormats, supported_pixel_formats_contain_common_formats)
+{
+    auto stub_display_report = std::make_shared<mg::NullDisplayReport>();
+    auto platform = mg::create_platform(stub_display_report);
+    auto supported_pixel_formats = platform->supported_pixel_formats();
+
+    auto abgr_8888_count = std::count(supported_pixel_formats.begin(),
+                                      supported_pixel_formats.end(),
+                                      geom::PixelFormat::abgr_8888);
+
+    auto xbgr_8888_count = std::count(supported_pixel_formats.begin(),
+                                      supported_pixel_formats.end(),
+                                      geom::PixelFormat::xbgr_8888);
+
+    auto bgr_888_count = std::count(supported_pixel_formats.begin(),
+                                    supported_pixel_formats.end(),
+                                    geom::PixelFormat::bgr_888);
+
+    EXPECT_EQ(1, abgr_8888_count);
+    EXPECT_EQ(1, xbgr_8888_count);
+    EXPECT_EQ(1, bgr_888_count);
+}
+
+TEST(AndroidPlatformFormats, supported_pixel_formats_have_sane_default_in_first_position)
+{
+    auto stub_display_report = std::make_shared<mg::NullDisplayReport>();
+    auto platform = mg::create_platform(stub_display_report);
+    auto supported_pixel_formats = platform->supported_pixel_formats();
+
+    ASSERT_FALSE(supported_pixel_formats.empty());
+    EXPECT_EQ(geom::PixelFormat::abgr_8888, supported_pixel_formats[0]);
+}
+

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-05-20 15:55:48 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-05-31 00:41:23 +0000
@@ -254,27 +254,3 @@
         mgg::GBMBufferAllocator allocator(platform, mock_buffer_initializer);
     }, std::runtime_error);
 }
-
-TEST_F(GBMBufferAllocatorTest, supported_pixel_formats_contain_common_formats)
-{
-    auto supported_pixel_formats = allocator->supported_pixel_formats();
-
-    auto argb_8888_count = std::count(supported_pixel_formats.begin(),
-                                      supported_pixel_formats.end(),
-                                      geom::PixelFormat::argb_8888);
-
-    auto xrgb_8888_count = std::count(supported_pixel_formats.begin(),
-                                      supported_pixel_formats.end(),
-                                      geom::PixelFormat::xrgb_8888);
-
-    EXPECT_EQ(1, argb_8888_count);
-    EXPECT_EQ(1, xrgb_8888_count);
-}
-
-TEST_F(GBMBufferAllocatorTest, supported_pixel_formats_have_sane_default_in_first_position)
-{
-    auto supported_pixel_formats = allocator->supported_pixel_formats();
-
-    ASSERT_FALSE(supported_pixel_formats.empty());
-    EXPECT_EQ(geom::PixelFormat::argb_8888, supported_pixel_formats[0]);
-}

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_platform.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_platform.cpp	2013-05-30 03:50:54 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_platform.cpp	2013-05-31 00:41:23 +0000
@@ -42,6 +42,7 @@
 namespace mg = mir::graphics;
 namespace mgg = mir::graphics::gbm;
 namespace mtd = mir::test::doubles;
+namespace geom = mir::geometry;
 
 namespace
 {
@@ -276,3 +277,29 @@
 
     EXPECT_FALSE(detector.detected_concurrent_calls());
 }
+
+TEST_F(GBMGraphicsPlatform, supported_pixel_formats_contain_common_formats)
+{
+    auto platform = create_platform();
+    auto supported_pixel_formats = platform->supported_pixel_formats();
+
+    auto argb_8888_count = std::count(supported_pixel_formats.begin(),
+                                      supported_pixel_formats.end(),
+                                      geom::PixelFormat::argb_8888);
+
+    auto xrgb_8888_count = std::count(supported_pixel_formats.begin(),
+                                      supported_pixel_formats.end(),
+                                      geom::PixelFormat::xrgb_8888);
+
+    EXPECT_EQ(1, argb_8888_count);
+    EXPECT_EQ(1, xrgb_8888_count);
+}
+
+TEST_F(GBMGraphicsPlatform, supported_pixel_formats_have_sane_default_in_first_position)
+{
+    auto platform = create_platform();
+    auto supported_pixel_formats = platform->supported_pixel_formats();
+
+    ASSERT_FALSE(supported_pixel_formats.empty());
+    EXPECT_EQ(geom::PixelFormat::argb_8888, supported_pixel_formats[0]);
+}

=== modified file 'tests/unit-tests/graphics/test_graphics_platform.cpp'
--- tests/unit-tests/graphics/test_graphics_platform.cpp	2013-05-20 15:55:48 +0000
+++ tests/unit-tests/graphics/test_graphics_platform.cpp	2013-05-31 00:41:23 +0000
@@ -41,6 +41,7 @@
 namespace mg = mir::graphics;
 namespace ml = mir::logging;
 namespace geom = mir::geometry;
+namespace geom = mir::geometry;
 namespace mtd = mir::test::doubles;
 
 class GraphicsPlatform : public ::testing::Test
@@ -113,7 +114,7 @@
 {
     auto platform = create_platform();
     auto allocator = platform->create_buffer_allocator(buffer_initializer);
-    auto supported_pixel_formats = allocator->supported_pixel_formats();
+    auto supported_pixel_formats = platform->supported_pixel_formats();
 
     ASSERT_NE(0u, supported_pixel_formats.size());