Merge lp:~kdub/mir/native-buffer-type into lp:~mir-team/mir/trunk

[Kevin DuBois]

use MirNativeBuffer as the platform independent type to represent the platform's native handle

improve handling of platform specific buffer handles accross the system by using a type, MirNativeBuffer to describe the platform-specific buffer type

This is a branch that I split off from my internal-client work for android.
MirBufferPackage is the native handle for the gbm/mesa platform. ANativeWindowBuffer is the native handle for android.
This branch addresses these problems
1) On the client side, we were using mcl::ClientBuffer::get_native_handle() for android, and mcl::ClientBuffer::get_buffer_package() for gbm. Both these functions did the same thing; that is, to get the native buffer handle for the driver. Consolidate these functions

2) On the server side, we had mc::Buffer::get_ipc_package(), which was always a bit strange that the concept of ipc was tied into our concept of a graphics buffer. I introduce a new function, mc::Buffer::native_buffer_handle() that returns the platform-specific buffer handle. This function will, in a subsequent MP, allow us to deprecate get_ipc_package() from mc::Buffer and put it elsewhere.

Currently, with lp:mir and mesa/gbm internal clients, we use get_ipc_package() to pack the ipc package, and then immediately unpack it to submit to driver. This is usually just 2 ints on gbm, but could be 40+ on android, so this avoids that work, and gives us a server-side representation of the buffer whenever we need it.

[Kevin DuBois (kdub)]

an interesting way that this branch manifested itself was that it showed that mir_surface_get_current_buffer() always returned the MirBufferPackage, which is the GBM platform's native type. This branch adds a new function to the client api, mir_surface_get_platform_type, which allows the user of mir_surface_get_current_buffer() to interpret the buffer they get from this function correctly.

This is really only used by xmir at the moment, so I'm working on updating xmir to support the api change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:672
http://jenkins.qa.ubuntu.com/job/mir-ci/563/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/653
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/47/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

1623 + //auto buffer_package = std::make_shared<MirBufferPackage>();
1624 + //ON_CALL(*this, native_buffer_handle())
1625 + // .WillByDefault(Return(buffer_package));

don't keep dead code in comments.

1673 +#if 0
1674 TEST_F(MirClientSurfaceTest, client_buffer_uses_ipc_message_from_server_on_create)
1675 {
1676 using namespace testing;
1677 @@ -391,6 +394,7 @@
1678 /* check for same contents */
1679 EXPECT_THAT(*submitted_package, BufferPackageMatches(mock_server_tool->server_package));
1680 }
1681 +#endif

don't keep dead code in conditionals.

1689 +#if 0
1690 TEST_F(MirClientSurfaceTest, get_buffer_returns_last_received_buffer_package)
1691 {
1692 using namespace testing;
1693 @@ -520,7 +525,7 @@
1694
1695 EXPECT_THAT(*surface->get_current_buffer_package(), BufferPackageMatches(mock_server_tool->server_package));
1696 }
1697 -
1698 +#endif

don't keep dead code in conditionals.

review: Needs Fixing

[Kevin DuBois (kdub)]

oops, sorry about the dead code... fixed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:673
http://jenkins.qa.ubuntu.com/job/mir-ci/565/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/299

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'examples/demo_client.c'
--- examples/demo_client.c	2013-05-02 00:11:18 +0000
+++ examples/demo_client.c	2013-05-09 15:25:39 +0000
@@ -40,6 +40,8 @@
 /// \snippet demo_client.c surface_release_tag
 ///\subsection connection_release We release our connection
 /// \snippet demo_client.c connection_release_tag
+///\subsection get the raw, platform-specific buffer handle for the current buffer
+/// \snippet demo_client.c get_current_buffer_tag
 /// \example demo_client.c A simple mir client
 ///\section MirDemoState MirDemoState
 /// The handles needs to be accessible both to callbacks and to the control function.
@@ -156,13 +158,18 @@
     {
         // We can query the current graphics buffer attributes
         {
-            MirBufferPackage buffer_package;
-            buffer_package.data_items = -1;
-            buffer_package.fd_items = -1;
+            ///\internal [get_current_buffer_tag]
+            MirNativeBuffer* buffer_package = NULL;
             mir_surface_get_current_buffer(mcd.surface, &buffer_package);
-            assert(0 <= buffer_package.data_items);
-            assert(0 <= buffer_package.fd_items);
-
+            assert(buffer_package != NULL);
+            if (mir_platform_type_gbm == mir_surface_get_platform_type(mcd.surface))
+            {
+                // Interpret buffer_package as MirBufferPackage
+            } else if (mir_platform_type_android == mir_surface_get_platform_type(mcd.surface))
+            {
+                // Interpret buffer_package as ANativeWindowBuffer
+            }
+            ///\internal [get_current_buffer_tag]
             // In a real application we'd render into the current buffer
         }
 

=== modified file 'include/client/mir_toolkit/mir_client_library.h'
--- include/client/mir_toolkit/mir_client_library.h	2013-05-02 00:11:18 +0000
+++ include/client/mir_toolkit/mir_client_library.h	2013-05-09 15:25:39 +0000
@@ -18,6 +18,7 @@
 #ifndef MIR_CLIENT_LIBRARY_H
 #define MIR_CLIENT_LIBRARY_H
 
+#include <mir_toolkit/mir_native_buffer.h>
 #include <mir_toolkit/client_types.h>
 #include <mir_toolkit/common.h>
 
@@ -176,12 +177,21 @@
 void mir_surface_get_parameters(MirSurface *surface, MirSurfaceParameters *parameters);
 
 /**
+ * Get the underlying platform type so the buffer obtained in "raw" representation
+ * in mir_surface_get_current_buffer() can be understood 
+ *   \pre                     The surface is valid
+ *   \param [in] surface      The surface
+ *   \return                  One of mir_platform_type_android or mir_platform_type_gbm
+ */
+MirPlatformType mir_surface_get_platform_type(MirSurface *surface);
+
+/**
  * Get a surface's buffer in "raw" representation.
  *   \pre                         The surface is valid
  *   \param [in] surface          The surface
  *   \param [out] buffer_package  Structure to be populated
  */
-void mir_surface_get_current_buffer(MirSurface *surface, MirBufferPackage *buffer_package);
+void mir_surface_get_current_buffer(MirSurface *surface, MirNativeBuffer **buffer_package);
 
 /**
  * Get a surface's graphics_region, i.e., map the graphics buffer to main

=== modified file 'include/server/mir/compositor/buffer.h'
--- include/server/mir/compositor/buffer.h	2013-04-24 05:22:20 +0000
+++ include/server/mir/compositor/buffer.h	2013-05-09 15:25:39 +0000
@@ -20,6 +20,7 @@
 #define MIR_COMPOSITOR_BUFFER_H_
 
 #include "mir/surfaces/graphic_region.h"
+#include "mir_toolkit/mir_native_buffer.h"
 
 #include <memory>
 
@@ -36,6 +37,7 @@
     virtual ~Buffer() {}
 
     virtual std::shared_ptr<BufferIPCPackage> get_ipc_package() const = 0;
+    virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const = 0;
     virtual BufferID id() const = 0;
 
 protected:

=== modified file 'include/shared/mir_toolkit/client_types.h'
--- include/shared/mir_toolkit/client_types.h	2013-05-02 00:11:18 +0000
+++ include/shared/mir_toolkit/client_types.h	2013-05-09 15:25:39 +0000
@@ -118,7 +118,15 @@
 
 enum { mir_platform_package_max = 32 };
 
-/** TODO */
+/**
+ * The native buffer type for the system the client is connected on
+ */
+typedef enum MirPlatformType
+{
+    mir_platform_type_gbm,
+    mir_platform_type_android    
+} MirPlatformType;
+
 typedef struct MirPlatformPackage
 {
     int data_items;
@@ -128,22 +136,6 @@
     int fd[mir_platform_package_max];
 } MirPlatformPackage;
 
-enum { mir_buffer_package_max = 32 };
-
-/** TODO */
-typedef struct MirBufferPackage
-{
-    int data_items;
-    int fd_items;
-
-    int data[mir_buffer_package_max];
-    int fd[mir_buffer_package_max];
-
-    int stride;
-    int age; /**< Number of frames submitted by the client since the client has rendered to this buffer. */
-             /**< This has the same semantics as the EGL_EXT_buffer_age extension */
-             /**< \see http://www.khronos.org/registry/egl/extensions/EXT/EGL_EXT_buffer_age.txt */
-} MirBufferPackage;
 
 /**
  * Retrieved information about a MirSurface. This is most useful for learning

=== modified file 'include/shared/mir_toolkit/mesa/native_display.h'
--- include/shared/mir_toolkit/mesa/native_display.h	2013-05-02 00:11:18 +0000
+++ include/shared/mir_toolkit/mesa/native_display.h	2013-05-09 15:25:39 +0000
@@ -18,6 +18,7 @@
 #ifndef MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
 #define MIR_TOOLKIT_MESA_NATIVE_DISPLAY_H
 
+#include "mir_toolkit/mir_native_buffer.h"
 #include "mir_toolkit/client_types.h"
 
 #ifdef __cplusplus

=== added file 'include/shared/mir_toolkit/mir_native_buffer.h'
--- include/shared/mir_toolkit/mir_native_buffer.h	1970-01-01 00:00:00 +0000
+++ include/shared/mir_toolkit/mir_native_buffer.h	2013-05-09 15:25:39 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2012 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by:
+ *   Kevin DuBois <[e-mail]>
+ */
+
+#ifndef MIR_CLIENT_MIR_NATIVE_BUFFER_H_
+#define MIR_CLIENT_MIR_NATIVE_BUFFER_H_
+
+enum { mir_buffer_package_max = 32 };
+typedef struct MirBufferPackage
+{
+    int data_items;
+    int fd_items;
+
+    int data[mir_buffer_package_max];
+    int fd[mir_buffer_package_max];
+
+    int stride;
+    int age; /**< Number of frames submitted by the client since the client has rendered to this buffer. */
+             /**< This has the same semantics as the EGL_EXT_buffer_age extension */
+             /**< \see http://www.khronos.org/registry/egl/extensions/EXT/EGL_EXT_buffer_age.txt */
+} MirBufferPackage;
+
+#ifdef ANDROID
+struct ANativeWindowBuffer;
+typedef struct ANativeWindowBuffer MirNativeBuffer;
+#else
+typedef struct MirBufferPackage MirNativeBuffer; 
+#endif
+#endif /* MIR_CLIENT_MIR_NATIVE_BUFFER_H_ */

=== modified file 'include/test/mir_test_doubles/mock_alloc_adaptor.h'
--- include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-05-09 15:25:39 +0000
@@ -20,7 +20,6 @@
 #define MIR_TEST_DOUBLES_MOCK_ALLOC_ADAPTOR_H_
 
 #include "src/server/graphics/android/graphic_alloc_adaptor.h"
-#include "src/server/graphics/android/android_buffer.h"
 
 #include <system/window.h>
 #include <gmock/gmock.h>

=== removed file 'include/test/mir_test_doubles/mock_android_buffer.h'
--- include/test/mir_test_doubles/mock_android_buffer.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_android_buffer.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Thomas Voss <[e-mail]>
- */
-
-#ifndef MIR_TEST_DOUBLES_MOCK_ANDROID_BUFFER_H_
-#define MIR_TEST_DOUBLES_MOCK_ANDROID_BUFFER_H_
-
-#include "src/server/graphics/android/android_buffer.h"
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
-
-namespace mir
-{
-namespace test
-{
-namespace doubles
-{
-
-struct MockAndroidBuffer : public mir::graphics::android::AndroidBuffer
-{
- public:
-    MockAndroidBuffer()
-    {
-        using namespace testing;
-        ON_CALL(*this, native_buffer_handle())
-            .WillByDefault(Return(std::make_shared<ANativeWindowBuffer>()));
-    }
-
-    MOCK_CONST_METHOD0(size, geometry::Size());
-    MOCK_CONST_METHOD0(stride, geometry::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
-    MOCK_CONST_METHOD0(get_ipc_package, std::shared_ptr<compositor::BufferIPCPackage>());
-
-    MOCK_METHOD0(bind_to_texture, void());
-    MOCK_CONST_METHOD0(id, compositor::BufferID());
-    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<ANativeWindowBuffer>());
-};
-
-}
-}
-}
-
-#endif // MIR_TEST_DOUBLES_MOCK_ANDROID_BUFFER_H_

=== modified file 'include/test/mir_test_doubles/mock_buffer.h'
--- include/test/mir_test_doubles/mock_buffer.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_buffer.h	2013-05-09 15:25:39 +0000
@@ -59,12 +59,15 @@
                 .WillByDefault(Return(empty_package));
         ON_CALL(*this, id())
                 .WillByDefault(Return(compositor::BufferID{4}));
+        ON_CALL(*this, native_buffer_handle())
+                .WillByDefault(Return(std::shared_ptr<MirNativeBuffer>()));
     }
 
     MOCK_CONST_METHOD0(size, geometry::Size());
     MOCK_CONST_METHOD0(stride, geometry::Stride());
     MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
     MOCK_CONST_METHOD0(get_ipc_package, std::shared_ptr<compositor::BufferIPCPackage>());
+    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<MirNativeBuffer>());
 
     MOCK_METHOD0(bind_to_texture, void());
     MOCK_CONST_METHOD0(id, compositor::BufferID());

=== modified file 'include/test/mir_test_doubles/mock_display_support_provider.h'
--- include/test/mir_test_doubles/mock_display_support_provider.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_display_support_provider.h	2013-05-09 15:25:39 +0000
@@ -35,7 +35,7 @@
     MOCK_CONST_METHOD0(display_size, geometry::Size());
     MOCK_CONST_METHOD0(display_format, geometry::PixelFormat());
     MOCK_CONST_METHOD0(number_of_framebuffers_available, unsigned int());
-    MOCK_METHOD1(set_next_frontbuffer, void(std::shared_ptr<mir::graphics::android::AndroidBuffer> const&));
+    MOCK_METHOD1(set_next_frontbuffer, void(std::shared_ptr<mir::compositor::Buffer> const&));
 };
 }
 }

=== modified file 'include/test/mir_test_doubles/mock_hwc_interface.h'
--- include/test/mir_test_doubles/mock_hwc_interface.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/mock_hwc_interface.h	2013-05-09 15:25:39 +0000
@@ -39,7 +39,7 @@
     MOCK_CONST_METHOD0(display_size, geometry::Size());
     MOCK_CONST_METHOD0(display_format, geometry::PixelFormat());
     MOCK_CONST_METHOD0(number_of_framebuffers_available, unsigned int());
-    MOCK_METHOD1(set_next_frontbuffer, void(std::shared_ptr<mir::graphics::android::AndroidBuffer> const&));
+    MOCK_METHOD1(set_next_frontbuffer, void(std::shared_ptr<mir::compositor::Buffer> const&));
 };
 
 }

=== modified file 'include/test/mir_test_doubles/mock_hwc_organizer.h'
--- include/test/mir_test_doubles/mock_hwc_organizer.h	2013-04-23 15:21:23 +0000
+++ include/test/mir_test_doubles/mock_hwc_organizer.h	2013-05-09 15:25:39 +0000
@@ -34,7 +34,7 @@
 {
     ~MockHWCOrganizer() noexcept {}
     MOCK_CONST_METHOD0(native_list, graphics::android::LayerList const&());
-    MOCK_METHOD1(set_fb_target, void(std::shared_ptr<graphics::android::AndroidBuffer> const&));
+    MOCK_METHOD1(set_fb_target, void(std::shared_ptr<compositor::Buffer> const&));
 };
 
 }

=== modified file 'include/test/mir_test_doubles/stub_buffer.h'
--- include/test/mir_test_doubles/stub_buffer.h	2013-04-24 05:22:20 +0000
+++ include/test/mir_test_doubles/stub_buffer.h	2013-05-09 15:25:39 +0000
@@ -53,8 +53,15 @@
 
     virtual geometry::PixelFormat pixel_format() const { return buf_pixel_format; }
 
-    virtual std::shared_ptr<compositor::BufferIPCPackage> get_ipc_package() const { return std::make_shared<compositor::BufferIPCPackage>(); }
+    virtual std::shared_ptr<compositor::BufferIPCPackage> get_ipc_package() const
+    {
+        return std::make_shared<compositor::BufferIPCPackage>();
+    }
 
+    virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const
+    {
+        return std::shared_ptr<MirNativeBuffer>();
+    }
     virtual void bind_to_texture() {}
 
     geometry::Size const buf_size;

=== modified file 'src/client/aging_buffer.h'
--- src/client/aging_buffer.h	2013-04-24 05:22:20 +0000
+++ src/client/aging_buffer.h	2013-05-09 15:25:39 +0000
@@ -30,6 +30,8 @@
 {
 public:
     AgingBuffer();
+    ~AgingBuffer() noexcept {};
+
     virtual uint32_t age() const;
     virtual void increment_age();
     virtual void mark_as_submitted();

=== modified file 'src/client/android/android_client_buffer.cpp'
--- src/client/android/android_client_buffer.cpp	2013-04-24 05:22:20 +0000
+++ src/client/android/android_client_buffer.cpp	2013-05-09 15:25:39 +0000
@@ -30,7 +30,8 @@
  : creation_package(package),
    buffer_registrar(registrar),
    rect({{geom::X(0),geom::Y(0)}, size}),
-   buffer_pf(pf)
+   buffer_pf(pf),
+   native_window_buffer(std::make_shared<ANativeWindowBuffer>())
 {
     creation_package = std::move(package);
     native_handle = std::shared_ptr<const native_handle_t> (convert_to_native_handle(creation_package));
@@ -45,17 +46,17 @@
 }
 void mcla::AndroidClientBuffer::pack_native_window_buffer()
 {
-    native_window_buffer.height = static_cast<int32_t>(rect.size.height.as_uint32_t());
-    native_window_buffer.width =  static_cast<int32_t>(rect.size.width.as_uint32_t());
-    native_window_buffer.stride = creation_package->stride;
-    native_window_buffer.usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
+    native_window_buffer->height = static_cast<int32_t>(rect.size.height.as_uint32_t());
+    native_window_buffer->width =  static_cast<int32_t>(rect.size.width.as_uint32_t());
+    native_window_buffer->stride = creation_package->stride;
+    native_window_buffer->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
 
-    native_window_buffer.handle = native_handle.get();
-    native_window_buffer.common.incRef = &incRef;
-    native_window_buffer.common.decRef = &incRef;
+    native_window_buffer->handle = native_handle.get();
+    native_window_buffer->common.incRef = &incRef;
+    native_window_buffer->common.decRef = &incRef;
 }
 
-mcla::AndroidClientBuffer::~AndroidClientBuffer()
+mcla::AndroidClientBuffer::~AndroidClientBuffer() noexcept
 {
     buffer_registrar->unregister_buffer(native_handle.get());
 }
@@ -112,12 +113,7 @@
     return buffer_pf;
 }
 
-MirNativeBuffer mcla::AndroidClientBuffer::get_native_handle()
-{
-    return &native_window_buffer;
-}
-
-std::shared_ptr<MirBufferPackage> mcla::AndroidClientBuffer::get_buffer_package() const
-{
-    return creation_package;
+std::shared_ptr<ANativeWindowBuffer> mcla::AndroidClientBuffer::native_buffer_handle() const
+{
+    return native_window_buffer;
 }

=== modified file 'src/client/android/android_client_buffer.h'
--- src/client/android/android_client_buffer.h	2013-04-24 05:22:20 +0000
+++ src/client/android/android_client_buffer.h	2013-05-09 15:25:39 +0000
@@ -40,14 +40,13 @@
     AndroidClientBuffer(std::shared_ptr<AndroidRegistrar> const&,
                         std::shared_ptr<MirBufferPackage> const&,
                         geometry::Size size, geometry::PixelFormat pf);
-    ~AndroidClientBuffer();
+    ~AndroidClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
     geometry::Stride stride() const;
     geometry::PixelFormat pixel_format() const;
-    MirNativeBuffer get_native_handle();
-    std::shared_ptr<MirBufferPackage> get_buffer_package() const;
+    std::shared_ptr<ANativeWindowBuffer> native_buffer_handle() const;
 
     AndroidClientBuffer(const AndroidClientBuffer&) = delete;
     AndroidClientBuffer& operator=(const AndroidClientBuffer&) = delete;
@@ -62,7 +61,7 @@
     const geometry::Rectangle rect;
     const geometry::PixelFormat buffer_pf;
 
-    ANativeWindowBuffer native_window_buffer;
+    std::shared_ptr<ANativeWindowBuffer> native_window_buffer;
 };
 
 }

=== modified file 'src/client/android/android_client_platform.cpp'
--- src/client/android/android_client_platform.cpp	2013-04-24 05:22:20 +0000
+++ src/client/android/android_client_platform.cpp	2013-05-09 15:25:39 +0000
@@ -102,3 +102,8 @@
     *native_display = EGL_DEFAULT_DISPLAY;
     return native_display;
 }
+
+MirPlatformType mcla::AndroidClientPlatform::platform_type() const
+{
+    return mir_platform_type_android; 
+} 

=== modified file 'src/client/android/android_client_platform.h'
--- src/client/android/android_client_platform.h	2013-04-24 05:22:20 +0000
+++ src/client/android/android_client_platform.h	2013-05-09 15:25:39 +0000
@@ -32,6 +32,7 @@
 class AndroidClientPlatform : public ClientPlatform
 {
 public:
+    MirPlatformType platform_type() const; 
     std::shared_ptr<ClientBufferFactory> create_buffer_factory();
     std::shared_ptr<EGLNativeWindowType> create_egl_native_window(ClientSurface *surface);
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display();

=== modified file 'src/client/android/client_surface_interpreter.cpp'
--- src/client/android/client_surface_interpreter.cpp	2013-04-24 05:22:20 +0000
+++ src/client/android/client_surface_interpreter.cpp	2013-05-09 15:25:39 +0000
@@ -29,18 +29,18 @@
 {
 }
 
-ANativeWindowBuffer* mcla::ClientSurfaceInterpreter::driver_requests_buffer()
+MirNativeBuffer* mcla::ClientSurfaceInterpreter::driver_requests_buffer()
 {
     auto buffer = surface.get_current_buffer();
-    auto buffer_to_driver = buffer->get_native_handle();
+    auto buffer_to_driver = buffer->native_buffer_handle();
     buffer_to_driver->format = driver_pixel_format;
 
-    return buffer_to_driver;
+    return buffer_to_driver.get();
 }
 
 static void empty(MirSurface * /*surface*/, void * /*client_context*/)
 {}
-void mcla::ClientSurfaceInterpreter::driver_returns_buffer(ANativeWindowBuffer*, std::shared_ptr<mga::SyncObject> const& sync_fence)
+void mcla::ClientSurfaceInterpreter::driver_returns_buffer(MirNativeBuffer*, std::shared_ptr<mga::SyncObject> const& sync_fence)
 {
     sync_fence->wait();
     mir_wait_for(surface.next_buffer(empty, NULL));

=== modified file 'src/client/android/client_surface_interpreter.h'
--- src/client/android/client_surface_interpreter.h	2013-04-24 05:22:20 +0000
+++ src/client/android/client_surface_interpreter.h	2013-05-09 15:25:39 +0000
@@ -34,8 +34,8 @@
 public:
     explicit ClientSurfaceInterpreter(ClientSurface& surface);
 
-    ANativeWindowBuffer* driver_requests_buffer();
-    void driver_returns_buffer(ANativeWindowBuffer*, std::shared_ptr<graphics::android::SyncObject> const&);
+    MirNativeBuffer* driver_requests_buffer();
+    void driver_returns_buffer(MirNativeBuffer*, std::shared_ptr<graphics::android::SyncObject> const&);
     void dispatch_driver_request_format(int format);
     int  driver_requests_info(int key) const;
 private:

=== modified file 'src/client/client_buffer.h'
--- src/client/client_buffer.h	2013-04-24 05:22:20 +0000
+++ src/client/client_buffer.h	2013-05-09 15:25:39 +0000
@@ -20,7 +20,8 @@
 #ifndef MIR_CLIENT_CLIENT_BUFFER_H_
 #define MIR_CLIENT_CLIENT_BUFFER_H_
 
-#include "mir_native_buffer.h"
+#include "mir_toolkit/mir_native_buffer.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/pixel_format.h"
 #include "mir/geometry/size.h"
 
@@ -51,6 +52,7 @@
 class ClientBuffer
 {
 public:
+    virtual ~ClientBuffer() = default;
     virtual std::shared_ptr<MemoryRegion> secure_for_cpu_write() = 0;
     virtual geometry::Size size() const = 0;
     virtual geometry::Stride stride() const = 0;
@@ -58,9 +60,7 @@
     virtual uint32_t age() const = 0;
     virtual void increment_age() = 0;
     virtual void mark_as_submitted() = 0;
-
-    virtual MirNativeBuffer get_native_handle() = 0;
-    virtual std::shared_ptr<MirBufferPackage> get_buffer_package() const = 0;
+    virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const = 0;
 };
 
 }

=== modified file 'src/client/client_platform.h'
--- src/client/client_platform.h	2013-04-24 05:22:20 +0000
+++ src/client/client_platform.h	2013-05-09 15:25:39 +0000
@@ -18,6 +18,8 @@
 #ifndef MIR_CLIENT_CLIENT_PLATFORM_H_
 #define MIR_CLIENT_CLIENT_PLATFORM_H_
 
+#include "mir_toolkit/client_types.h"
+
 #include <EGL/eglplatform.h>
 #include <memory>
 
@@ -36,6 +38,7 @@
     ClientPlatform(const ClientPlatform& p) = delete;
     ClientPlatform& operator=(const ClientPlatform& p) = delete;
 
+    virtual MirPlatformType platform_type() const = 0; 
     virtual std::shared_ptr<ClientBufferFactory> create_buffer_factory() = 0;
     virtual std::shared_ptr<EGLNativeWindowType> create_egl_native_window(ClientSurface *surface) = 0;
     virtual std::shared_ptr<EGLNativeDisplayType> create_egl_native_display() = 0;

=== modified file 'src/client/gbm/gbm_client_buffer.cpp'
--- src/client/gbm/gbm_client_buffer.cpp	2013-04-24 05:22:20 +0000
+++ src/client/gbm/gbm_client_buffer.cpp	2013-05-09 15:25:39 +0000
@@ -133,7 +133,7 @@
 {
 }
 
-mclg::GBMClientBuffer::~GBMClientBuffer()
+mclg::GBMClientBuffer::~GBMClientBuffer() noexcept
 {
     // TODO (@raof): Error reporting? It should not be possible for this to fail; if it does,
     //               something's seriously wrong.
@@ -166,13 +166,8 @@
     return buffer_pf;
 }
 
-std::shared_ptr<MirBufferPackage> mclg::GBMClientBuffer::get_buffer_package() const
+std::shared_ptr<MirNativeBuffer> mclg::GBMClientBuffer::native_buffer_handle() const
 {
     creation_package->age = age();
     return creation_package;
 }
-
-MirNativeBuffer mclg::GBMClientBuffer::get_native_handle()
-{
-    return NULL;
-}

=== modified file 'src/client/gbm/gbm_client_buffer.h'
--- src/client/gbm/gbm_client_buffer.h	2013-04-24 05:22:20 +0000
+++ src/client/gbm/gbm_client_buffer.h	2013-05-09 15:25:39 +0000
@@ -43,14 +43,13 @@
                     geometry::Size size,
                     geometry::PixelFormat pf);
 
-    virtual ~GBMClientBuffer();
+    virtual ~GBMClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
     geometry::Stride stride() const;
     geometry::PixelFormat pixel_format() const;
-    std::shared_ptr<MirBufferPackage> get_buffer_package() const;
-    MirNativeBuffer get_native_handle();
+    std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
 
     GBMClientBuffer(const GBMClientBuffer&) = delete;
     GBMClientBuffer& operator=(const GBMClientBuffer&) = delete;

=== modified file 'src/client/gbm/gbm_client_platform.cpp'
--- src/client/gbm/gbm_client_platform.cpp	2013-04-24 05:22:20 +0000
+++ src/client/gbm/gbm_client_platform.cpp	2013-05-09 15:25:39 +0000
@@ -144,3 +144,8 @@
 
     return std::shared_ptr<EGLNativeDisplayType>(egl_native_display, NativeDisplayDeleter(display_container));
 }
+
+MirPlatformType mclg::GBMClientPlatform::platform_type() const
+{
+    return mir_platform_type_gbm; 
+} 

=== modified file 'src/client/gbm/gbm_client_platform.h'
--- src/client/gbm/gbm_client_platform.h	2013-04-24 05:22:20 +0000
+++ src/client/gbm/gbm_client_platform.h	2013-05-09 15:25:39 +0000
@@ -39,6 +39,7 @@
                       std::shared_ptr<DRMFDHandler> const& drm_fd_handler,
                       EGLNativeDisplayContainer& display_container);
 
+    MirPlatformType platform_type() const; 
     std::shared_ptr<ClientBufferFactory> create_buffer_factory();
     std::shared_ptr<EGLNativeWindowType> create_egl_native_window(ClientSurface *surface);
     std::shared_ptr<EGLNativeDisplayType> create_egl_native_display();

=== modified file 'src/client/gbm/mesa_native_display_container.cpp'
--- src/client/gbm/mesa_native_display_container.cpp	2013-04-24 05:22:20 +0000
+++ src/client/gbm/mesa_native_display_container.cpp	2013-05-09 15:25:39 +0000
@@ -21,6 +21,7 @@
 #include "mir_toolkit/mesa/native_display.h"
 #include "mir_toolkit/mir_client_library.h"
 
+#include <cstring>
 #include <unordered_set>
 #include <mutex>
 
@@ -45,7 +46,9 @@
                                                MirBufferPackage* buffer_package)
 {
     MirSurface* ms = static_cast<MirSurface*>(surface);
-    mir_surface_get_current_buffer(ms, buffer_package);
+    MirBufferPackage * current_package;
+    mir_surface_get_current_buffer(ms, &current_package);
+    memcpy(buffer_package, current_package, sizeof(MirBufferPackage));
 }
 
 static void buffer_advanced_callback(MirSurface*  /* surface */,

=== modified file 'src/client/mir_client_library.cpp'
--- src/client/mir_client_library.cpp	2013-05-02 00:11:18 +0000
+++ src/client/mir_client_library.cpp	2013-05-09 15:25:39 +0000
@@ -183,19 +183,15 @@
     *parameters = surface->get_parameters();
 }
 
-void mir_surface_get_current_buffer(MirSurface *surface, MirBufferPackage * buffer_package_out)
+MirPlatformType mir_surface_get_platform_type(MirSurface * surface)
+{
+    return surface->platform_type();
+}
+
+void mir_surface_get_current_buffer(MirSurface * surface, MirNativeBuffer ** buffer_package_out)
 {
     auto package = surface->get_current_buffer_package();
-
-    buffer_package_out->data_items = package->data_items;
-    buffer_package_out->fd_items = package->fd_items;
-    for(auto i=0; i<mir_buffer_package_max; i++)
-    {
-        buffer_package_out->data[i] = package->data[i];
-        buffer_package_out->fd[i] = package->fd[i];
-    }
-
-    buffer_package_out->stride = package->stride;
+    *buffer_package_out = package.get();
 }
 
 void mir_connection_get_platform(MirConnection *connection, MirPlatformPackage *platform_package)

=== removed file 'src/client/mir_native_buffer.h'
--- src/client/mir_native_buffer.h	2013-04-24 05:22:20 +0000
+++ src/client/mir_native_buffer.h	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by:
- *   Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_CLIENT_MIR_NATIVE_BUFFER_H_
-#define MIR_CLIENT_MIR_NATIVE_BUFFER_H_
-
-#ifdef ANDROID
-struct ANativeWindowBuffer;
-typedef ANativeWindowBuffer* MirNativeBuffer;
-#else
-typedef void* MirNativeBuffer;
-#endif
-
-#endif /* MIR_CLIENT_MIR_NATIVE_BUFFER_H_ */

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2013-05-01 23:30:06 +0000
+++ src/client/mir_surface.cpp	2013-05-09 15:25:39 +0000
@@ -195,10 +195,10 @@
     return connection->release_surface(this, callback, context);
 }
 
-std::shared_ptr<MirBufferPackage> MirSurface::get_current_buffer_package()
+std::shared_ptr<MirNativeBuffer> MirSurface::get_current_buffer_package()
 {
-    auto buffer = buffer_depository->current_buffer();
-    return buffer->get_buffer_package();
+    auto buffer = get_current_buffer();
+    return buffer->native_buffer_handle();
 }
 
 std::shared_ptr<mcl::ClientBuffer> MirSurface::get_current_buffer()
@@ -321,3 +321,9 @@
     if (handle_event_callback)
         handle_event_callback(&e);
 }
+
+MirPlatformType MirSurface::platform_type()
+{
+    auto platform = connection->get_client_platform();
+    return platform->platform_type();
+}

=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h	2013-04-24 05:22:20 +0000
+++ src/client/mir_surface.h	2013-05-09 15:25:39 +0000
@@ -24,6 +24,7 @@
 #include "mir/geometry/dimensions.h"
 #include "mir_toolkit/mir_client_library.h"
 #include "mir_toolkit/common.h"
+#include "mir_toolkit/mir_native_buffer.h"
 #include "client_buffer_depository.h"
 #include "mir_wait_handle.h"
 #include "mir_client_surface.h"
@@ -75,7 +76,8 @@
     MirWaitHandle* next_buffer(mir_surface_lifecycle_callback callback, void * context);
     MirWaitHandle* get_create_wait_handle();
 
-    std::shared_ptr<MirBufferPackage> get_current_buffer_package();
+    std::shared_ptr<MirNativeBuffer> get_current_buffer_package();
+    MirPlatformType platform_type();
     std::shared_ptr<mir::client::ClientBuffer> get_current_buffer();
     void get_cpu_region(MirGraphicsRegion& region);
     void release_cpu_region();

=== modified file 'src/server/compositor/temporary_buffers.cpp'
--- src/server/compositor/temporary_buffers.cpp	2013-04-24 05:22:20 +0000
+++ src/server/compositor/temporary_buffers.cpp	2013-05-09 15:25:39 +0000
@@ -81,3 +81,7 @@
     return buffer->get_ipc_package();
 }
 
+std::shared_ptr<MirNativeBuffer> mc::TemporaryBuffer::native_buffer_handle() const
+{
+    return buffer->native_buffer_handle();
+}

=== modified file 'src/server/compositor/temporary_buffers.h'
--- src/server/compositor/temporary_buffers.h	2013-04-24 05:22:20 +0000
+++ src/server/compositor/temporary_buffers.h	2013-05-09 15:25:39 +0000
@@ -39,6 +39,7 @@
     BufferID id() const;
     void bind_to_texture();
     std::shared_ptr<BufferIPCPackage> get_ipc_package() const;
+    std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
 
 protected:
     explicit TemporaryBuffer(std::shared_ptr<Buffer> const& real_buffer);

=== removed file 'src/server/graphics/android/android_buffer.h'
--- src/server/graphics/android/android_buffer.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/android_buffer.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright © 2012,2013 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by:
- *   Kevin DuBois <[e-mail]>
- */
-
-#ifndef MIR_GRAPHICS_ANDROID_ANDROID_BUFFER_H_
-#define MIR_GRAPHICS_ANDROID_ANDROID_BUFFER_H_
-
-#include "mir/compositor/buffer_basic.h"
-
-#include <system/window.h>
-#include <memory>
-
-namespace mir
-{
-namespace graphics
-{
-namespace android
-{
-
-class AndroidBuffer : public compositor::BufferBasic
-{
-public:
-    virtual ~AndroidBuffer() = default;
-    virtual std::shared_ptr<ANativeWindowBuffer> native_buffer_handle() const = 0;
-protected:
-    AndroidBuffer() = default;
-    AndroidBuffer(AndroidBuffer const&) = delete;
-    AndroidBuffer& operator=(AndroidBuffer const&) = delete;
-
-};
-
-}
-}
-}
-
-#endif /* MIR_GRAPHICS_ANDROID_ANDROID_BUFFER_H_ */

=== modified file 'src/server/graphics/android/android_buffer_allocator.cpp'
--- src/server/graphics/android/android_buffer_allocator.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/android_buffer_allocator.cpp	2013-05-09 15:25:39 +0000
@@ -75,7 +75,7 @@
     return alloc_buffer_platform(buffer_properties.size, buffer_properties.format, usage);
 }
 
-std::shared_ptr<mga::AndroidBuffer> mga::AndroidGraphicBufferAllocator::alloc_buffer_platform(
+std::shared_ptr<mga::Buffer> mga::AndroidGraphicBufferAllocator::alloc_buffer_platform(
     geom::Size sz, geom::PixelFormat pf, mga::BufferUsage use)
 {
     auto buffer = std::make_shared<Buffer>(alloc_device, sz, pf, use);

=== modified file 'src/server/graphics/android/android_graphic_buffer_allocator.h'
--- src/server/graphics/android/android_graphic_buffer_allocator.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/android_graphic_buffer_allocator.h	2013-05-09 15:25:39 +0000
@@ -46,7 +46,7 @@
     std::shared_ptr<compositor::Buffer> alloc_buffer(
         compositor::BufferProperties const& buffer_properties);
 
-    std::shared_ptr<AndroidBuffer> alloc_buffer_platform(
+    std::shared_ptr<Buffer> alloc_buffer_platform(
         geometry::Size sz, geometry::PixelFormat pf, BufferUsage use);
 
     std::vector<geometry::PixelFormat> supported_pixel_formats();

=== modified file 'src/server/graphics/android/buffer.h'
--- src/server/graphics/android/buffer.h	2013-04-16 20:55:50 +0000
+++ src/server/graphics/android/buffer.h	2013-05-09 15:25:39 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_BUFFER_H_
 #define MIR_GRAPHICS_ANDROID_BUFFER_H_
 
-#include "android_buffer.h"
+#include "mir/compositor/buffer_basic.h"
 #include "android_buffer_handle.h"
 
 #include <map>
@@ -38,22 +38,20 @@
 {
 
 class GraphicAllocAdaptor;
-class Buffer: public AndroidBuffer 
+class Buffer: public compositor::BufferBasic 
 {
 public:
     Buffer(const std::shared_ptr<GraphicAllocAdaptor>& device,
                   geometry::Size size, geometry::PixelFormat pf, BufferUsage use);
     ~Buffer();
 
-    /* from BufferBasic */
     geometry::Size size() const;
     geometry::Stride stride() const;
     geometry::PixelFormat pixel_format() const;
+    void bind_to_texture();
     std::shared_ptr<compositor::BufferIPCPackage> get_ipc_package() const;
-    void bind_to_texture();
-
-    /* android-specific */
     std::shared_ptr<ANativeWindowBuffer> native_buffer_handle() const;
+
 private:
     std::shared_ptr<GraphicAllocAdaptor> const alloc_device;
 

=== modified file 'src/server/graphics/android/default_framebuffer_factory.cpp'
--- src/server/graphics/android/default_framebuffer_factory.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/default_framebuffer_factory.cpp	2013-05-09 15:25:39 +0000
@@ -18,11 +18,12 @@
  */
 
 #include "mir/graphics/android/mir_native_window.h"
+#include "buffer.h"
 #include "default_framebuffer_factory.h"
 #include "fb_device.h"
+#include "fb_simple_swapper.h"
 #include "graphic_buffer_allocator.h"
 #include "server_render_window.h"
-#include "fb_simple_swapper.h"
 
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
@@ -43,7 +44,7 @@
     auto size = info_provider->display_size();
     auto pf = info_provider->display_format();
     auto num_framebuffers = info_provider->number_of_framebuffers_available(); 
-    std::vector<std::shared_ptr<mga::AndroidBuffer>> buffers; 
+    std::vector<std::shared_ptr<mc::Buffer>> buffers; 
     for( auto i = 0u; i < num_framebuffers; ++i)
     {
         buffers.push_back(buffer_allocator->alloc_buffer_platform(size, pf, mga::BufferUsage::use_framebuffer_gles));

=== modified file 'src/server/graphics/android/display_support_provider.h'
--- src/server/graphics/android/display_support_provider.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/display_support_provider.h	2013-05-09 15:25:39 +0000
@@ -25,12 +25,15 @@
 
 namespace mir
 {
+namespace compositor
+{
+class Buffer;
+}
 namespace graphics
 {
 namespace android
 {
 
-class AndroidBuffer;
 class DisplaySupportProvider
 {
 public:
@@ -41,7 +44,7 @@
     virtual unsigned int number_of_framebuffers_available() const = 0;
     //this function schedules the next frontbuffer to be "buffer" parameter. depending on implementation, it may
     //post immediately, or be deferred.
-    virtual void set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer) = 0;
+    virtual void set_next_frontbuffer(std::shared_ptr<compositor::Buffer> const& buffer) = 0;
 
 protected:
     DisplaySupportProvider() = default;

=== modified file 'src/server/graphics/android/fb_device.cpp'
--- src/server/graphics/android/fb_device.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/fb_device.cpp	2013-05-09 15:25:39 +0000
@@ -19,13 +19,14 @@
 #include "mir/compositor/buffer.h"
 
 #include "fb_device.h"
-#include "android_buffer.h"
+#include "buffer.h"
 #include "android_format_conversion-inl.h"
 
 #include <algorithm>
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
  
@@ -34,7 +35,7 @@
 {
 }
 
-void mga::FBDevice::set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer)
+void mga::FBDevice::set_next_frontbuffer(std::shared_ptr<mc::Buffer> const& buffer)
 {
     auto handle = buffer->native_buffer_handle();
     if (fb_device->post(fb_device.get(), handle->handle) != 0)

=== modified file 'src/server/graphics/android/fb_device.h'
--- src/server/graphics/android/fb_device.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/fb_device.h	2013-05-09 15:25:39 +0000
@@ -39,7 +39,7 @@
     geometry::PixelFormat display_format() const; 
     unsigned int number_of_framebuffers_available() const;
 
-    void set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer);
+    void set_next_frontbuffer(std::shared_ptr<compositor::Buffer> const& buffer);
 private:
     std::shared_ptr<framebuffer_device_t> const fb_device;
 };

=== modified file 'src/server/graphics/android/fb_simple_swapper.cpp'
--- src/server/graphics/android/fb_simple_swapper.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/fb_simple_swapper.cpp	2013-05-09 15:25:39 +0000
@@ -22,9 +22,10 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 
-std::shared_ptr<mga::AndroidBuffer> mga::FBSimpleSwapper::compositor_acquire()
+std::shared_ptr<mc::Buffer> mga::FBSimpleSwapper::compositor_acquire()
 {
     std::unique_lock<std::mutex> lk(queue_lock);
     while (queue.empty())
@@ -37,7 +38,7 @@
     return buffer;
 }
 
-void mga::FBSimpleSwapper::compositor_release(std::shared_ptr<mga::AndroidBuffer> const& released_buffer)
+void mga::FBSimpleSwapper::compositor_release(std::shared_ptr<mc::Buffer> const& released_buffer)
 {
     std::unique_lock<std::mutex> lk(queue_lock);
 

=== modified file 'src/server/graphics/android/fb_simple_swapper.h'
--- src/server/graphics/android/fb_simple_swapper.h	2013-04-16 21:19:35 +0000
+++ src/server/graphics/android/fb_simple_swapper.h	2013-05-09 15:25:39 +0000
@@ -37,8 +37,8 @@
 class FBSimpleSwapper : public FBSwapper
 {
 public:
-    template<typename AndroidBufferPtrContainer>
-    explicit FBSimpleSwapper(AndroidBufferPtrContainer const& buffer_list)
+    template<typename BufferPtrContainer>
+    explicit FBSimpleSwapper(BufferPtrContainer const& buffer_list)
     {
         for (auto& buffer : buffer_list)
         {
@@ -46,14 +46,14 @@
         }
     }
 
-    std::shared_ptr<AndroidBuffer> compositor_acquire();
-    void compositor_release(std::shared_ptr<AndroidBuffer> const& released_buffer);
+    std::shared_ptr<compositor::Buffer> compositor_acquire();
+    void compositor_release(std::shared_ptr<compositor::Buffer> const& released_buffer);
 
 private:
     std::mutex queue_lock;
     std::condition_variable cv;
 
-    std::queue<std::shared_ptr<AndroidBuffer>> queue;
+    std::queue<std::shared_ptr<compositor::Buffer>> queue;
 };
 
 }

=== modified file 'src/server/graphics/android/fb_swapper.h'
--- src/server/graphics/android/fb_swapper.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/fb_swapper.h	2013-05-09 15:25:39 +0000
@@ -24,20 +24,24 @@
 
 namespace mir
 {
+namespace compositor
+{
+class Buffer;
+}
 namespace graphics
 {
 namespace android
 {
 
-class AndroidBuffer;
+class Buffer;
 
-class FBSwapper // (todo: for composition bypass, inherit from mc::BufferSwapper)
-{
+//TODO: remove this interface. FBSimpleSwapper should inherit from mc::BufferSwapper
+class FBSwapper{
 public:
     virtual ~FBSwapper() = default;
 
-    virtual std::shared_ptr<AndroidBuffer> compositor_acquire() = 0;
-    virtual void compositor_release(std::shared_ptr<AndroidBuffer> const& released_buffer) = 0;
+    virtual std::shared_ptr<compositor::Buffer> compositor_acquire() = 0;
+    virtual void compositor_release(std::shared_ptr<compositor::Buffer> const& released_buffer) = 0;
 protected:
     FBSwapper() = default;
     FBSwapper(FBSwapper const&) = delete;

=== modified file 'src/server/graphics/android/graphic_buffer_allocator.h'
--- src/server/graphics/android/graphic_buffer_allocator.h	2013-04-16 20:55:50 +0000
+++ src/server/graphics/android/graphic_buffer_allocator.h	2013-05-09 15:25:39 +0000
@@ -29,8 +29,8 @@
 {
 namespace android
 {
+class Buffer;
 
-class AndroidBuffer;
 class GraphicBufferAllocator: public compositor::GraphicBufferAllocator
 {
 public:
@@ -39,7 +39,7 @@
 
     virtual std::shared_ptr<compositor::Buffer> alloc_buffer(
         compositor::BufferProperties const& buffer_properties) = 0;
-    virtual std::shared_ptr<AndroidBuffer> alloc_buffer_platform(
+    virtual std::shared_ptr<Buffer> alloc_buffer_platform(
         geometry::Size sz, geometry::PixelFormat pf, BufferUsage use) = 0;
     virtual std::vector<geometry::PixelFormat> supported_pixel_formats() = 0;
 

=== modified file 'src/server/graphics/android/hwc10_device.cpp'
--- src/server/graphics/android/hwc10_device.cpp	2013-04-23 15:21:23 +0000
+++ src/server/graphics/android/hwc10_device.cpp	2013-05-09 15:25:39 +0000
@@ -22,6 +22,7 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
@@ -51,7 +52,7 @@
     return fb_device->number_of_framebuffers_available();
 }
 
-void mga::HWC10Device::set_next_frontbuffer(std::shared_ptr<mga::AndroidBuffer> const& buffer)
+void mga::HWC10Device::set_next_frontbuffer(std::shared_ptr<mc::Buffer> const& buffer)
 {
     fb_device->set_next_frontbuffer(buffer);
 }

=== modified file 'src/server/graphics/android/hwc10_device.h'
--- src/server/graphics/android/hwc10_device.h	2013-04-23 15:21:23 +0000
+++ src/server/graphics/android/hwc10_device.h	2013-05-09 15:25:39 +0000
@@ -39,7 +39,7 @@
     geometry::Size display_size() const; 
     geometry::PixelFormat display_format() const;
     unsigned int number_of_framebuffers_available() const;
-    void set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer);
+    void set_next_frontbuffer(std::shared_ptr<compositor::Buffer> const& buffer);
  
     void commit_frame(EGLDisplay dpy, EGLSurface sur);
 private:

=== modified file 'src/server/graphics/android/hwc11_device.cpp'
--- src/server/graphics/android/hwc11_device.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/hwc11_device.cpp	2013-05-09 15:25:39 +0000
@@ -22,6 +22,7 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
@@ -71,7 +72,7 @@
     return 2u;
 }
  
-void mga::HWC11Device::set_next_frontbuffer(std::shared_ptr<mga::AndroidBuffer> const& buffer)
+void mga::HWC11Device::set_next_frontbuffer(std::shared_ptr<mc::Buffer> const& buffer)
 {
     layer_organizer->set_fb_target(buffer);
     fb_device->set_next_frontbuffer(buffer);

=== modified file 'src/server/graphics/android/hwc11_device.h'
--- src/server/graphics/android/hwc11_device.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/hwc11_device.h	2013-05-09 15:25:39 +0000
@@ -41,7 +41,7 @@
     geometry::Size display_size() const; 
     geometry::PixelFormat display_format() const;
     unsigned int number_of_framebuffers_available() const;
-    void set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer);
+    void set_next_frontbuffer(std::shared_ptr<compositor::Buffer> const& buffer);
  
     void commit_frame(EGLDisplay dpy, EGLSurface sur);
 

=== modified file 'src/server/graphics/android/hwc_common_device.h'
--- src/server/graphics/android/hwc_common_device.h	2013-04-23 15:21:23 +0000
+++ src/server/graphics/android/hwc_common_device.h	2013-05-09 15:25:39 +0000
@@ -49,7 +49,7 @@
     void wait_for_vsync();
 
     virtual geometry::Size display_size() const = 0;
-    virtual void set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer) = 0;
+    virtual void set_next_frontbuffer(std::shared_ptr<compositor::Buffer> const& buffer) = 0;
     virtual void commit_frame(EGLDisplay dpy, EGLSurface sur) = 0;
 
     void notify_vsync();

=== modified file 'src/server/graphics/android/hwc_device.h'
--- src/server/graphics/android/hwc_device.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/hwc_device.h	2013-05-09 15:25:39 +0000
@@ -39,7 +39,7 @@
     virtual geometry::Size display_size() const = 0; 
     virtual geometry::PixelFormat display_format() const = 0; 
     virtual unsigned int number_of_framebuffers_available() const = 0;
-    virtual void set_next_frontbuffer(std::shared_ptr<AndroidBuffer> const& buffer) = 0;
+    virtual void set_next_frontbuffer(std::shared_ptr<compositor::Buffer> const& buffer) = 0;
 
     virtual void wait_for_vsync() = 0;
     virtual void commit_frame(EGLDisplay dpy, EGLSurface sur) = 0;

=== modified file 'src/server/graphics/android/hwc_layerlist.cpp'
--- src/server/graphics/android/hwc_layerlist.cpp	2013-04-17 00:22:29 +0000
+++ src/server/graphics/android/hwc_layerlist.cpp	2013-05-09 15:25:39 +0000
@@ -17,10 +17,11 @@
  */
 
 #include "hwc_layerlist.h"
-#include "android_buffer.h"
+#include "buffer.h"
 
 #include <cstring>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 namespace geom=mir::geometry;
 
@@ -94,7 +95,7 @@
     return layer_list;
 }
 
-void mga::HWCLayerList::set_fb_target(std::shared_ptr<mga::AndroidBuffer> const& buffer)
+void mga::HWCLayerList::set_fb_target(std::shared_ptr<mc::Buffer> const& buffer)
 {
     auto handle = buffer->native_buffer_handle();
 

=== modified file 'src/server/graphics/android/hwc_layerlist.h'
--- src/server/graphics/android/hwc_layerlist.h	2013-04-17 00:22:29 +0000
+++ src/server/graphics/android/hwc_layerlist.h	2013-05-09 15:25:39 +0000
@@ -26,12 +26,15 @@
 #include <initializer_list>
 namespace mir
 {
+namespace compositor
+{
+class Buffer;
+}
 namespace graphics
 {
 namespace android
 {
 
-class AndroidBuffer;
 class HWCDefaultLayer;
 typedef struct std::vector<std::shared_ptr<HWCDefaultLayer>> LayerList;
  
@@ -72,7 +75,7 @@
 public:
     virtual ~HWCLayerOrganizer() = default;
     virtual const LayerList& native_list() const = 0;
-    virtual void set_fb_target(std::shared_ptr<AndroidBuffer> const&) = 0;
+    virtual void set_fb_target(std::shared_ptr<compositor::Buffer> const&) = 0;
 
 protected:
     HWCLayerOrganizer() = default;
@@ -87,7 +90,7 @@
     HWCLayerList();
     const LayerList& native_list() const;
 
-    void set_fb_target(std::shared_ptr<AndroidBuffer> const&);
+    void set_fb_target(std::shared_ptr<compositor::Buffer> const&);
 
 private:
     LayerList layer_list;

=== modified file 'src/server/graphics/android/server_render_window.cpp'
--- src/server/graphics/android/server_render_window.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/server_render_window.cpp	2013-05-09 15:25:39 +0000
@@ -21,7 +21,7 @@
 #include "server_render_window.h"
 #include "display_support_provider.h"
 #include "fb_swapper.h"
-#include "android_buffer.h"
+#include "buffer.h"
 #include "android_format_conversion-inl.h"
 
 #include <boost/throw_exception.hpp>

=== modified file 'src/server/graphics/android/server_render_window.h'
--- src/server/graphics/android/server_render_window.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/android/server_render_window.h	2013-05-09 15:25:39 +0000
@@ -31,6 +31,10 @@
 
 namespace mir
 {
+namespace compositor
+{
+class Buffer;
+}
 namespace graphics
 {
 namespace android
@@ -38,7 +42,6 @@
 
 class FBSwapper;
 class DisplaySupportProvider;
-class AndroidBuffer;
 class ServerRenderWindow : public AndroidDriverInterpreter 
 {
 public:
@@ -54,7 +57,7 @@
     std::shared_ptr<FBSwapper> const swapper;
     std::shared_ptr<DisplaySupportProvider> const poster;
 
-    std::unordered_map<ANativeWindowBuffer*, std::shared_ptr<AndroidBuffer>> buffers_in_driver;
+    std::unordered_map<ANativeWindowBuffer*, std::shared_ptr<compositor::Buffer>> buffers_in_driver;
 
     int format;
 }; 

=== modified file 'src/server/graphics/gbm/gbm_buffer.cpp'
--- src/server/graphics/gbm/gbm_buffer.cpp	2013-04-24 05:22:20 +0000
+++ src/server/graphics/gbm/gbm_buffer.cpp	2013-05-09 15:25:39 +0000
@@ -127,3 +127,8 @@
 {
     texture_binder->bind_to_texture();
 }
+
+std::shared_ptr<MirNativeBuffer> mgg::GBMBuffer::native_buffer_handle() const
+{
+    return std::make_shared<MirNativeBuffer>();
+}

=== modified file 'src/server/graphics/gbm/gbm_buffer.h'
--- src/server/graphics/gbm/gbm_buffer.h	2013-04-24 05:22:20 +0000
+++ src/server/graphics/gbm/gbm_buffer.h	2013-05-09 15:25:39 +0000
@@ -54,6 +54,7 @@
     virtual geometry::PixelFormat pixel_format() const;
 
     virtual std::shared_ptr<compositor::BufferIPCPackage> get_ipc_package() const;
+    virtual std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
 
     virtual void bind_to_texture();
 

=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2013-04-24 05:22:20 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2013-05-09 15:25:39 +0000
@@ -21,7 +21,6 @@
 #include "mir/compositor/buffer_ipc_package.h"
 #include "mir/compositor/buffer_properties.h"
 #include "mir/graphics/buffer_initializer.h"
-#include "src/server/graphics/android/android_buffer.h"
 #include "src/server/graphics/android/android_graphic_buffer_allocator.h"
 
 #include "mir_test/draw/android_graphics.h"

=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-04-24 05:22:20 +0000
+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-05-09 15:25:39 +0000
@@ -16,7 +16,6 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/graphics/platform.h"
 #include "src/server/graphics/android/android_graphic_buffer_allocator.h"
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/null_display_report.h"
@@ -43,9 +42,6 @@
 protected:
     virtual void SetUp()
     {
-        platform = mg::create_platform(std::make_shared<mg::NullDisplayReport>());
-        ASSERT_TRUE(platform != NULL);
-
         size = geom::Size{geom::Width{334},
                           geom::Height{122}};
         pf  = geom::PixelFormat::abgr_8888;
@@ -58,8 +54,6 @@
     geom::PixelFormat pf;
     mc::BufferProperties buffer_properties;
     mtd::TestGrallocMapper sw_renderer;
-
-    std::shared_ptr<mg::Platform> platform;
 };
 
 }
@@ -98,7 +92,6 @@
     auto allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(null_buffer_initializer);
     auto strategy = std::make_shared<mc::SwapperFactory>(allocator);
     mc::BufferProperties actual;
-    mc::BufferID id{34};
     auto swapper = strategy->create_swapper(actual, buffer_properties);
     auto returned_buffer = swapper->client_acquire();
 

=== modified file 'tests/unit-tests/client/android/test_client_android_buffer.cpp'
--- tests/unit-tests/client/android/test_client_android_buffer.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/android/test_client_android_buffer.cpp	2013-05-09 15:25:39 +0000
@@ -286,7 +286,7 @@
     buffer = std::make_shared<mcla::AndroidClientBuffer>(mock_android_registrar, std::move(package),
                                                         size, pf);
 
-    auto native_handle = buffer->get_native_handle();
+    auto native_handle = buffer->native_buffer_handle();
 
     ASSERT_NE(nullptr, native_handle);
     EXPECT_EQ(buffer_handle, native_handle->handle);
@@ -297,7 +297,7 @@
     buffer = std::make_shared<mcla::AndroidClientBuffer>(mock_android_registrar, std::move(package),
                                                         size, pf);
 
-    auto native_handle = buffer->get_native_handle();
+    auto native_handle = buffer->native_buffer_handle();
 
     ASSERT_NE(nullptr, native_handle);
     EXPECT_EQ(width.as_uint32_t(), static_cast<uint32_t>(native_handle->width));
@@ -308,7 +308,7 @@
 {
     buffer = std::make_shared<mcla::AndroidClientBuffer>(mock_android_registrar, std::move(package), size, pf);
 
-    auto native_handle = buffer->get_native_handle();
+    auto native_handle = buffer->native_buffer_handle();
     int correct_usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
     ASSERT_NE(nullptr, native_handle);
     EXPECT_EQ(correct_usage, native_handle->usage);
@@ -318,7 +318,7 @@
 {
     buffer = std::make_shared<mcla::AndroidClientBuffer>(mock_android_registrar, std::move(package), size, pf);
 
-    auto native_handle = buffer->get_native_handle();
+    auto native_handle = buffer->native_buffer_handle();
     ASSERT_NE(nullptr, native_handle);
     EXPECT_EQ(static_cast<int32_t>(stride.as_uint32_t()), native_handle->stride);
 }
@@ -327,7 +327,7 @@
 {
     buffer = std::make_shared<mcla::AndroidClientBuffer>(mock_android_registrar, std::move(package), size, pf);
 
-    auto native_handle = buffer->get_native_handle();
+    auto native_handle = buffer->native_buffer_handle();
 
     ASSERT_NE(nullptr, native_handle);
     ASSERT_NE(nullptr, native_handle->common.incRef);
@@ -336,19 +336,3 @@
     native_handle->common.incRef(NULL);
     native_handle->common.decRef(NULL);
 }
-
-TEST_F(ClientAndroidBufferTest, buffer_returns_creation_package)
-{
-    buffer = std::make_shared<mcla::AndroidClientBuffer>(mock_android_registrar, std::move(package), size, pf);
-
-    auto package_return = buffer->get_buffer_package();
-
-    EXPECT_EQ(package->data_items, package_return->data_items);
-    EXPECT_EQ(package->fd_items, package_return->fd_items);
-    EXPECT_EQ(package->stride, package_return->stride);
-    for(auto i=0; i<mir_buffer_package_max; i++)
-        EXPECT_EQ(package->data[i], package_return->data[i]);
-    for(auto i=0; i<mir_buffer_package_max; i++)
-        EXPECT_EQ(package->fd[i], package_return->fd[i]);
-}
-

=== modified file 'tests/unit-tests/client/android/test_client_surface_interpreter.cpp'
--- tests/unit-tests/client/android/test_client_surface_interpreter.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/android/test_client_surface_interpreter.cpp	2013-05-09 15:25:39 +0000
@@ -40,9 +40,12 @@
     MockClientBuffer()
     {
         using namespace testing;
-        ON_CALL(*this, get_native_handle())
-            .WillByDefault(Return(&buffer));
+        buffer = std::make_shared<ANativeWindowBuffer>();
+        ON_CALL(*this, native_buffer_handle())
+            .WillByDefault(Return(buffer));
     }
+    ~MockClientBuffer() noexcept {}
+
     MOCK_METHOD0(secure_for_cpu_write, std::shared_ptr<mcl::MemoryRegion>());
     MOCK_CONST_METHOD0(size, geom::Size());
     MOCK_CONST_METHOD0(stride, geom::Stride());
@@ -52,10 +55,9 @@
     MOCK_METHOD0(mark_as_submitted, void());
     MOCK_METHOD0(increment_age, void());
 
-    MOCK_CONST_METHOD0(get_buffer_package, std::shared_ptr<MirBufferPackage>());
-    MOCK_METHOD0(get_native_handle, ANativeWindowBuffer*());
+    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<MirNativeBuffer>());
 
-    ANativeWindowBuffer buffer;
+    std::shared_ptr<ANativeWindowBuffer> buffer;
     native_handle_t handle;
 };
 
@@ -116,21 +118,21 @@
 {
     using namespace testing;
     native_handle_t handle;
-    ANativeWindowBuffer buffer;
-    buffer.handle = &handle;
+    auto buffer = std::make_shared<ANativeWindowBuffer>();
+    buffer->handle = &handle;
 
     testing::NiceMock<MockMirSurface> mock_surface{surf_params};
     mcla::ClientSurfaceInterpreter interpreter(mock_surface);
 
-    EXPECT_CALL(*mock_client_buffer, get_native_handle())
+    EXPECT_CALL(*mock_client_buffer, native_buffer_handle())
         .Times(1)
-        .WillOnce(Return(&buffer));
+        .WillOnce(Return(buffer));
     EXPECT_CALL(mock_surface, get_current_buffer())
         .Times(1)
         .WillOnce(Return(mock_client_buffer));
 
     auto returned_buffer = interpreter.driver_requests_buffer();
-    EXPECT_EQ(&buffer, returned_buffer);
+    EXPECT_EQ(buffer.get(), returned_buffer);
 }
 
 TEST_F(AndroidInterpreterTest, native_window_queue_advances_buffer)

=== modified file 'tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp'
--- tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/gbm/test_gbm_client_buffer.cpp	2013-05-09 15:25:39 +0000
@@ -82,7 +82,7 @@
 
     mclg::GBMClientBuffer buffer(drm_fd_handler, std::move(package), size, pf);
 
-    auto package_return = buffer.get_buffer_package();
+    auto package_return = buffer.native_buffer_handle();
     EXPECT_EQ(package_return->data_items, package_copy->data_items);
     EXPECT_EQ(package_return->fd_items, package_copy->fd_items);
     EXPECT_EQ(package_return->stride, package_copy->stride);

=== modified file 'tests/unit-tests/client/test_aging_buffer.cpp'
--- tests/unit-tests/client/test_aging_buffer.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/test_aging_buffer.cpp	2013-05-09 15:25:39 +0000
@@ -51,12 +51,7 @@
         exit(1);
     }
 
-    std::shared_ptr<MirBufferPackage> get_buffer_package() const
-    {
-        exit(1);
-    }
-
-    MirNativeBuffer get_native_handle()
+    std::shared_ptr<MirNativeBuffer> native_buffer_handle() const
     {
         exit(1);
     }

=== modified file 'tests/unit-tests/client/test_client_buffer_depository.cpp'
--- tests/unit-tests/client/test_client_buffer_depository.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/test_client_buffer_depository.cpp	2013-05-09 15:25:39 +0000
@@ -42,7 +42,7 @@
     }
 
     MOCK_METHOD0(Destroy, void());
-    virtual ~MockBuffer()
+    virtual ~MockBuffer() noexcept
     {
         Destroy();
     }
@@ -52,8 +52,7 @@
     MOCK_CONST_METHOD0(size, geom::Size());
     MOCK_CONST_METHOD0(stride, geom::Stride());
     MOCK_CONST_METHOD0(pixel_format, geom::PixelFormat());
-    MOCK_CONST_METHOD0(get_buffer_package, std::shared_ptr<MirBufferPackage>());
-    MOCK_METHOD0(get_native_handle, MirNativeBuffer());
+    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<MirNativeBuffer>());
 };
 
 struct MockClientBufferFactory : public mcl::ClientBufferFactory

=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
--- tests/unit-tests/client/test_client_mir_surface.cpp	2013-05-01 23:30:06 +0000
+++ tests/unit-tests/client/test_client_mir_surface.cpp	2013-05-09 15:25:39 +0000
@@ -160,14 +160,11 @@
 
 struct MockBuffer : public mcl::ClientBuffer
 {
-    explicit MockBuffer(std::shared_ptr<MirBufferPackage> const& contents)
-    {
-        using namespace testing;
-
-        auto buffer_package = std::make_shared<MirBufferPackage>();
-        *buffer_package = *contents;
-        ON_CALL(*this, get_buffer_package())
-            .WillByDefault(Return(buffer_package));
+    MockBuffer()
+    {
+    }
+    ~MockBuffer() noexcept
+    {
     }
 
     MOCK_METHOD0(secure_for_cpu_write, std::shared_ptr<mcl::MemoryRegion>());
@@ -177,8 +174,7 @@
     MOCK_CONST_METHOD0(age, uint32_t());
     MOCK_METHOD0(increment_age, void());
     MOCK_METHOD0(mark_as_submitted, void());
-    MOCK_CONST_METHOD0(get_buffer_package, std::shared_ptr<MirBufferPackage>());
-    MOCK_METHOD0(get_native_handle, MirNativeBuffer());
+    MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<MirNativeBuffer>());
 };
 
 struct MockClientBufferFactory : public mcl::ClientBufferFactory
@@ -187,11 +183,11 @@
     {
         using namespace testing;
 
-        emptybuffer=std::make_shared<NiceMock<MockBuffer>>(std::make_shared<MirBufferPackage>());
+        emptybuffer=std::make_shared<NiceMock<MockBuffer>>();
 
         ON_CALL(*this, create_buffer(_,_,_))
             .WillByDefault(DoAll(SaveArg<0>(&current_package),
-                                 InvokeWithoutArgs([this] () {this->current_buffer = std::make_shared<NiceMock<MockBuffer>>(current_package);}),
+                                 InvokeWithoutArgs([this] () {this->current_buffer = std::make_shared<NiceMock<MockBuffer>>();}),
                                  ReturnPointee(&current_buffer)));
     }
 
@@ -204,9 +200,12 @@
     std::shared_ptr<mcl::ClientBuffer> emptybuffer;
 };
 
-
 struct StubClientPlatform : public mcl::ClientPlatform
 {
+    MirPlatformType platform_type() const
+    {
+        return mir_platform_type_android; 
+    } 
     std::shared_ptr<mcl::ClientBufferFactory> create_buffer_factory()
     {
         return std::shared_ptr<MockClientBufferFactory>();
@@ -510,15 +509,13 @@
                                                  nullptr);
     auto wait_handle = surface->get_create_wait_handle();
     wait_handle->wait_for_result();
-
-    EXPECT_THAT(*surface->get_current_buffer_package(), BufferPackageMatches(mock_server_tool->server_package));
+    Mock::VerifyAndClearExpectations(mock_buffer_factory.get());
 
     EXPECT_CALL(*mock_buffer_factory, create_buffer(_,_,_))
         .Times(1);
     auto buffer_wait_handle = surface->next_buffer(&empty_surface_callback, nullptr);
     buffer_wait_handle->wait_for_result();
-
-    EXPECT_THAT(*surface->get_current_buffer_package(), BufferPackageMatches(mock_server_tool->server_package));
+    Mock::VerifyAndClearExpectations(mock_buffer_factory.get());
 }
 
 TEST_F(MirClientSurfaceTest, default_surface_type)
@@ -589,14 +586,9 @@
     void increment_age() {}
     void mark_as_submitted() {}
 
-    std::shared_ptr<MirBufferPackage> get_buffer_package() const
-    {
-        return std::shared_ptr<MirBufferPackage>();
-    }
-
-    MirNativeBuffer get_native_handle()
-    {
-        return MirNativeBuffer();
+    std::shared_ptr<MirNativeBuffer> native_buffer_handle() const
+    {
+        return std::shared_ptr<MirNativeBuffer>();
     }
 
     geom::Size size_;

=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
--- tests/unit-tests/client/test_client_platform.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/client/test_client_platform.cpp	2013-05-09 15:25:39 +0000
@@ -40,6 +40,20 @@
 #endif
 };
 
+TEST_F(ClientPlatformTest, platform_name)
+{
+    mtd::MockClientContext context;
+    mcl::NativeClientPlatformFactory factory;
+    auto platform = factory.create_client_platform(&context);
+    
+#ifdef ANDROID
+    auto type = mir_platform_type_android;
+#else
+    auto type = mir_platform_type_gbm;
+#endif
+    EXPECT_EQ(type, platform->platform_type());
+}
+
 TEST_F(ClientPlatformTest, platform_creates)
 {
     mtd::MockClientContext context;

=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
--- tests/unit-tests/client/test_mir_connection.cpp	2013-04-25 09:48:54 +0000
+++ tests/unit-tests/client/test_mir_connection.cpp	2013-05-09 15:25:39 +0000
@@ -80,6 +80,7 @@
             .WillByDefault(Return(native_display));
     }
 
+    MOCK_CONST_METHOD0(platform_type, MirPlatformType()); 
     MOCK_METHOD0(create_buffer_factory, std::shared_ptr<mcl::ClientBufferFactory>());
     MOCK_METHOD1(create_egl_native_window, std::shared_ptr<EGLNativeWindowType>(mcl::ClientSurface*));
     MOCK_METHOD0(create_egl_native_display, std::shared_ptr<EGLNativeDisplayType>());

=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
--- tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-05-09 15:25:39 +0000
@@ -166,3 +166,12 @@
 
     proxy_buffer.id();
 }
+
+TEST_F(TemporaryBuffersTest, base_test_native_buffer_handle)
+{
+    TemporaryTestBuffer proxy_buffer(mock_buffer);
+    EXPECT_CALL(*mock_buffer, native_buffer_handle())
+        .Times(1);
+
+    proxy_buffer.native_buffer_handle();
+}

=== modified file 'tests/unit-tests/graphics/android/test_fb_device.cpp'
--- tests/unit-tests/graphics/android/test_fb_device.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/graphics/android/test_fb_device.cpp	2013-05-09 15:25:39 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir_test_doubles/mock_fb_hal_device.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 #include "src/server/graphics/android/fb_device.h"
 #include "mir_test/hw_mock.h"
 
@@ -42,7 +42,7 @@
         format = HAL_PIXEL_FORMAT_RGBA_8888;
 
         fb_hal_mock = std::make_shared<mtd::MockFBHalDevice>(width, height, format, fbnum); 
-        mock_buffer = std::make_shared<NiceMock<mtd::MockAndroidBuffer>>();
+        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>();
 
         dummy_buffer = std::make_shared<ANativeWindowBuffer>();
         dummy_buffer->handle = (buffer_handle_t) 0x4893;
@@ -52,7 +52,7 @@
 
     unsigned int width, height, format, fbnum;
     std::shared_ptr<mtd::MockFBHalDevice> fb_hal_mock;
-    std::shared_ptr<mtd::MockAndroidBuffer> mock_buffer;
+    std::shared_ptr<mtd::MockBuffer> mock_buffer;
     std::shared_ptr<ANativeWindowBuffer> dummy_buffer;
     mt::HardwareAccessMock hw_access_mock;
 };

=== modified file 'tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp'
--- tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/graphics/android/test_fb_simple_swapper.cpp	2013-05-09 15:25:39 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "src/server/graphics/android/fb_simple_swapper.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 
 #include <future>
 #include <initializer_list>
@@ -34,19 +34,19 @@
 public:
     virtual void SetUp()
     {
-        buffer1 = std::make_shared<mtd::MockAndroidBuffer>();
-        buffer2 = std::make_shared<mtd::MockAndroidBuffer>();
-        buffer3 = std::make_shared<mtd::MockAndroidBuffer>();
+        buffer1 = std::make_shared<mtd::MockBuffer>();
+        buffer2 = std::make_shared<mtd::MockBuffer>();
+        buffer3 = std::make_shared<mtd::MockBuffer>();
     }
 
-    std::shared_ptr<mga::AndroidBuffer> buffer1;
-    std::shared_ptr<mga::AndroidBuffer> buffer2;
-    std::shared_ptr<mga::AndroidBuffer> buffer3;
+    std::shared_ptr<mc::Buffer> buffer1;
+    std::shared_ptr<mc::Buffer> buffer2;
+    std::shared_ptr<mc::Buffer> buffer3;
 };
 
 TEST_F(FBSimpleSwapperTest, simple_swaps_returns_valid)
 {
-    std::initializer_list<std::shared_ptr<mga::AndroidBuffer>> double_list{buffer1, buffer2};
+    std::initializer_list<std::shared_ptr<mc::Buffer>> double_list{buffer1, buffer2};
     mga::FBSimpleSwapper fb_swapper(double_list);
 
     auto test_buffer = fb_swapper.compositor_acquire();
@@ -56,7 +56,7 @@
 
 TEST_F(FBSimpleSwapperTest, simple_swaps_return_aba_pattern)
 {
-    std::initializer_list<std::shared_ptr<mga::AndroidBuffer>> double_list{buffer1, buffer2};
+    std::initializer_list<std::shared_ptr<mc::Buffer>> double_list{buffer1, buffer2};
     mga::FBSimpleSwapper fb_swapper(double_list);
 
     auto test_buffer_1 = fb_swapper.compositor_acquire();
@@ -74,7 +74,7 @@
 
 TEST_F(FBSimpleSwapperTest, triple_swaps_return_abcab_pattern)
 {
-    std::initializer_list<std::shared_ptr<mga::AndroidBuffer>> triple_list{buffer1, buffer2, buffer3};
+    std::initializer_list<std::shared_ptr<mc::Buffer>> triple_list{buffer1, buffer2, buffer3};
     mga::FBSimpleSwapper fb_swapper(triple_list);
 
     auto test_buffer_1 = fb_swapper.compositor_acquire();
@@ -103,7 +103,7 @@
 
 TEST_F(FBSimpleSwapperTest, synctest)
 {
-    std::vector<std::shared_ptr<mga::AndroidBuffer>> test_buffers{buffer1, buffer2};
+    std::vector<std::shared_ptr<mc::Buffer>> test_buffers{buffer1, buffer2};
     mga::FBSimpleSwapper fb_swapper(test_buffers);
 
     std::vector<std::shared_ptr<mc::Buffer>> blist;

=== modified file 'tests/unit-tests/graphics/android/test_framebuffer_factory.cpp'
--- tests/unit-tests/graphics/android/test_framebuffer_factory.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/graphics/android/test_framebuffer_factory.cpp	2013-05-09 15:25:39 +0000
@@ -41,7 +41,7 @@
 {
 public:
     MOCK_METHOD1(alloc_buffer, std::shared_ptr<mc::Buffer>(mc::BufferProperties const&)); 
-    MOCK_METHOD3(alloc_buffer_platform, std::shared_ptr<mga::AndroidBuffer>(geom::Size, geom::PixelFormat, mga::BufferUsage));
+    MOCK_METHOD3(alloc_buffer_platform, std::shared_ptr<mga::Buffer>(geom::Size, geom::PixelFormat, mga::BufferUsage));
     MOCK_METHOD0(supported_pixel_formats, std::vector<geom::PixelFormat>());
 };
 }
@@ -62,7 +62,7 @@
         ON_CALL(*mock_display_info_provider, number_of_framebuffers_available())
             .WillByDefault(Return(fake_fb_num));
         ON_CALL(*mock_buffer_allocator, alloc_buffer_platform(_,_,_))
-            .WillByDefault(Return(std::shared_ptr<mga::AndroidBuffer>()));
+            .WillByDefault(Return(std::shared_ptr<mga::Buffer>()));
     }
 
     std::shared_ptr<MockAndroidGraphicBufferAllocator> mock_buffer_allocator;

=== modified file 'tests/unit-tests/graphics/android/test_hwc10_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-04-22 21:33:40 +0000
+++ tests/unit-tests/graphics/android/test_hwc10_device.cpp	2013-05-09 15:25:39 +0000
@@ -20,9 +20,10 @@
 #include "mir_test_doubles/mock_display_support_provider.h"
 #include "mir_test_doubles/mock_hwc_composer_device_1.h"
 #include "mir_test_doubles/mock_hwc_organizer.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 #include <gtest/gtest.h>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 namespace mtd=mir::test::doubles;
 namespace geom=mir::geometry;
@@ -85,7 +86,7 @@
 
 TEST_F(HWC10Device, hwc10_set_next_frontbuffer)
 {
-    std::shared_ptr<mga::AndroidBuffer> mock_buffer = std::make_shared<mtd::MockAndroidBuffer>();
+    std::shared_ptr<mc::Buffer> mock_buffer = std::make_shared<mtd::MockBuffer>();
     EXPECT_CALL(*mock_fbdev, set_next_frontbuffer(mock_buffer))
         .Times(1);
 

=== modified file 'tests/unit-tests/graphics/android/test_hwc11_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc11_device.cpp	2013-04-20 00:08:22 +0000
+++ tests/unit-tests/graphics/android/test_hwc11_device.cpp	2013-05-09 15:25:39 +0000
@@ -21,10 +21,11 @@
 #include "mir_test_doubles/mock_display_support_provider.h"
 #include "mir_test_doubles/mock_hwc_composer_device_1.h"
 #include "mir_test_doubles/mock_hwc_organizer.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 #include "mir_test/egl_mock.h"
 #include <gtest/gtest.h>
 
+namespace mc=mir::compositor;
 namespace mga=mir::graphics::android;
 namespace mtd=mir::test::doubles;
 
@@ -223,7 +224,7 @@
 
 TEST_F(HWC11Device, hwc_device_set_next_frontbuffer_adds_to_layerlist)
 {
-    std::shared_ptr<mga::AndroidBuffer> mock_buffer = std::make_shared<mtd::MockAndroidBuffer>();
+    std::shared_ptr<mc::Buffer> mock_buffer = std::make_shared<mtd::MockBuffer>();
     EXPECT_CALL(*this->mock_organizer, set_fb_target(mock_buffer))
         .Times(1);
  
@@ -233,7 +234,7 @@
 
 TEST_F(HWC11Device, hwc_device_set_next_frontbuffer_posts)
 {
-    std::shared_ptr<mga::AndroidBuffer> mock_buffer = std::make_shared<mtd::MockAndroidBuffer>();
+    std::shared_ptr<mc::Buffer> mock_buffer = std::make_shared<mtd::MockBuffer>();
     EXPECT_CALL(*this->mock_display_support_provider, set_next_frontbuffer(mock_buffer))
         .Times(1);
 

=== modified file 'tests/unit-tests/graphics/android/test_hwc_device.cpp'
--- tests/unit-tests/graphics/android/test_hwc_device.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/graphics/android/test_hwc_device.cpp	2013-05-09 15:25:39 +0000
@@ -21,7 +21,7 @@
 #include "src/server/graphics/android/hwc_layerlist.h"
 #include "mir_test_doubles/mock_hwc_composer_device_1.h"
 #include "mir_test_doubles/mock_hwc_organizer.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/mock_display_support_provider.h"
 
 #include <thread>

=== modified file 'tests/unit-tests/graphics/android/test_hwc_layerlist.cpp'
--- tests/unit-tests/graphics/android/test_hwc_layerlist.cpp	2013-04-17 00:22:29 +0000
+++ tests/unit-tests/graphics/android/test_hwc_layerlist.cpp	2013-05-09 15:25:39 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "src/server/graphics/android/hwc_layerlist.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 #include "hwc_struct_helper-inl.h"
 #include <gtest/gtest.h>
 
@@ -41,7 +41,7 @@
         stub_handle_1 = std::make_shared<ANativeWindowBuffer>();
         stub_handle_2 = std::make_shared<ANativeWindowBuffer>();
 
-        mock_buffer = std::make_shared<NiceMock<mtd::MockAndroidBuffer>>();
+        mock_buffer = std::make_shared<NiceMock<mtd::MockBuffer>>();
         ON_CALL(*mock_buffer, native_buffer_handle())
             .WillByDefault(Return(stub_handle_1));
         ON_CALL(*mock_buffer, size())
@@ -55,7 +55,7 @@
 
     std::shared_ptr<ANativeWindowBuffer> stub_handle_1;
     std::shared_ptr<ANativeWindowBuffer> stub_handle_2;
-    std::shared_ptr<mtd::MockAndroidBuffer> mock_buffer;
+    std::shared_ptr<mtd::MockBuffer> mock_buffer;
 };
 
 TEST(HWCLayerDeepCopy, hwc_layer)

=== modified file 'tests/unit-tests/graphics/android/test_server_interpreter.cpp'
--- tests/unit-tests/graphics/android/test_server_interpreter.cpp	2013-04-24 05:22:20 +0000
+++ tests/unit-tests/graphics/android/test_server_interpreter.cpp	2013-05-09 15:25:39 +0000
@@ -20,7 +20,7 @@
 #include "src/server/graphics/android/fb_swapper.h"
 
 #include "mir_test_doubles/mock_display_support_provider.h"
-#include "mir_test_doubles/mock_android_buffer.h"
+#include "mir_test_doubles/mock_buffer.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -43,17 +43,17 @@
 struct MockFBSwapper : public mga::FBSwapper
 {
     ~MockFBSwapper() noexcept {}
-    MOCK_METHOD0(compositor_acquire, std::shared_ptr<mga::AndroidBuffer>());
-    MOCK_METHOD1(compositor_release, void(std::shared_ptr<mga::AndroidBuffer> const& released_buffer));
+    MOCK_METHOD0(compositor_acquire, std::shared_ptr<mc::Buffer>());
+    MOCK_METHOD1(compositor_release, void(std::shared_ptr<mc::Buffer> const& released_buffer));
 }; 
 struct ServerRenderWindowTest : public ::testing::Test
 {
     virtual void SetUp()
     {
         using namespace testing;
-        mock_buffer1 = std::make_shared<NiceMock<mtd::MockAndroidBuffer>>();
-        mock_buffer2 = std::make_shared<NiceMock<mtd::MockAndroidBuffer>>();
-        mock_buffer3 = std::make_shared<NiceMock<mtd::MockAndroidBuffer>>();
+        mock_buffer1 = std::make_shared<NiceMock<mtd::MockBuffer>>();
+        mock_buffer2 = std::make_shared<NiceMock<mtd::MockBuffer>>();
+        mock_buffer3 = std::make_shared<NiceMock<mtd::MockBuffer>>();
         mock_swapper = std::make_shared<NiceMock<MockFBSwapper>>();
         mock_display_poster = std::make_shared<NiceMock<mtd::MockDisplaySupportProvider>>();
         ON_CALL(*mock_display_poster, display_format())
@@ -61,9 +61,9 @@
         stub_sync = std::make_shared<StubFence>();
     }
 
-    std::shared_ptr<mtd::MockAndroidBuffer> mock_buffer1;
-    std::shared_ptr<mtd::MockAndroidBuffer> mock_buffer2;
-    std::shared_ptr<mtd::MockAndroidBuffer> mock_buffer3;
+    std::shared_ptr<mtd::MockBuffer> mock_buffer1;
+    std::shared_ptr<mtd::MockBuffer> mock_buffer2;
+    std::shared_ptr<mtd::MockBuffer> mock_buffer3;
     std::shared_ptr<MockFBSwapper> mock_swapper;
     std::shared_ptr<mtd::MockDisplaySupportProvider> mock_display_poster;
     std::shared_ptr<StubFence> stub_sync;
@@ -106,7 +106,7 @@
     render_window.driver_requests_buffer();
     testing::Mock::VerifyAndClearExpectations(mock_swapper.get());
 
-    std::shared_ptr<mga::AndroidBuffer> buf1 = mock_buffer1;
+    std::shared_ptr<mc::Buffer> buf1 = mock_buffer1;
     EXPECT_CALL(*mock_swapper, compositor_release(buf1))
         .Times(1);
     EXPECT_CALL(*stub_sync, wait())
@@ -147,9 +147,9 @@
     auto handle3 = render_window.driver_requests_buffer();
     testing::Mock::VerifyAndClearExpectations(mock_swapper.get());
 
-    std::shared_ptr<mga::AndroidBuffer> buf1 = mock_buffer1;
-    std::shared_ptr<mga::AndroidBuffer> buf2 = mock_buffer2;
-    std::shared_ptr<mga::AndroidBuffer> buf3 = mock_buffer3;
+    std::shared_ptr<mc::Buffer> buf1 = mock_buffer1;
+    std::shared_ptr<mc::Buffer> buf2 = mock_buffer2;
+    std::shared_ptr<mc::Buffer> buf3 = mock_buffer3;
     EXPECT_CALL(*mock_swapper, compositor_release(buf1))
         .Times(1);
     EXPECT_CALL(*mock_swapper, compositor_release(buf2))
@@ -183,13 +183,17 @@
     using namespace testing;
     mga::ServerRenderWindow render_window(mock_swapper, mock_display_poster);
 
+    auto stub_anw = std::make_shared<ANativeWindowBuffer>();
     mc::BufferID id{442}, returned_id;
     EXPECT_CALL(*mock_swapper, compositor_acquire())
         .Times(1)
         .WillOnce(Return(mock_buffer1));
     EXPECT_CALL(*mock_swapper, compositor_release(_))
         .Times(1);
-    std::shared_ptr<mga::AndroidBuffer> buf1 = mock_buffer1;
+    std::shared_ptr<mc::Buffer> buf1 = mock_buffer1;
+    EXPECT_CALL(*mock_buffer1, native_buffer_handle())
+        .Times(1)
+        .WillOnce(Return(stub_anw));
     EXPECT_CALL(*mock_display_poster, set_next_frontbuffer(buf1))
         .Times(1);