Merge lp:~afrantzis/mir/fix-mako-ci-use-steady-clock into lp:mir/0.1

[Alexandros Frantzis]

tests: Use steady_clock to keep track of timeouts and intervals

The previously used system_clock is affected by changes in the
system clock. This causes issues when such a change occurs
while we are keeping track of a timeout or an elapsed time interval.

tests: Use steady_clock to keep track of timeouts and intervals

The previously used system_clock is affected by changes in the system clock. This causes issues when such a change occurs while we are keeping track of a timeout or an elapsed time interval.

An instance of this problem occured when running integration tests in CI on real devices, because during startup the devices updated their system clock to match the current date. Our tests happened to run early enough for this to happen while we were waiting for a timeout to occur, most commonly while waiting for the client or server processes to finish.

Note that steady_clock is really steady only in g++ 4.8.1 and later. Previously it was the same as system_clock.

[Alan Griffiths (alan-griffiths)]

target mir/devel

review: Needs Resubmitting

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-21 03:23:50 +0000
+++ CMakeLists.txt	2013-12-18 14:40:47 +0000
@@ -87,13 +87,13 @@
 )
 endif(MIR_DISABLE_EPOLL_REACTOR)
 
-# Default to gbm backend
+# Default to mesa backend
 set(
   MIR_PLATFORM
-  gbm
+  mesa
   CACHE
   STRING
-  "graphics backend to build (options are 'gbm' or 'android')"
+  "graphics backend to build (options are 'mesa' or 'android')"
 )
 
 find_package(EGL REQUIRED)
@@ -124,14 +124,14 @@
 
   #ctest does not work for android, so turn test discovery off
   set(DISABLE_GTEST_TEST_DISCOVERY ON)
-elseif (MIR_PLATFORM STREQUAL "gbm")
+elseif (MIR_PLATFORM STREQUAL "mesa")
   find_package( PkgConfig )
   pkg_check_modules( GBM REQUIRED gbm>=9.0.0)
   pkg_check_modules( DRM REQUIRED libdrm )
   pkg_check_modules( UDEV REQUIRED libudev )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__GBM__")
 else ()
-  message (FATAL_ERROR "MIR_BACKEND must be either 'android' or 'gbm'")
+  message (FATAL_ERROR "MIR_BACKEND must be either 'android' or 'mesa'")
 endif()
 
 set(MIR_ANDROID_INCLUDE_DIRECTORIES) # to be filled by android-input

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2013-08-28 03:41:48 +0000
+++ cmake/MirCommon.cmake	2013-12-18 14:40:47 +0000
@@ -19,8 +19,15 @@
     valgrind)
 
   if(VALGRIND_EXECUTABLE)
-    set(VALGRIND_ARGS "--error-exitcode=1 --trace-children=yes")
+    if(MIR_PLATFORM STREQUAL "android")
+	  # don't exit with an error when valgrind find errors
+      #set(VALGRIND_ARGS "--error-exitcode=1")
+    else()
+      set(VALGRIND_ARGS "--error-exitcode=1 --trace-children=yes")
+    endif()
+
     set(ENABLE_MEMCHECK_FLAG "--enable-memcheck")
+
   else(VALGRIND_EXECUTABLE)
     message("Not enabling memcheck as valgrind is missing on your system")
   endif(VALGRIND_EXECUTABLE)

=== modified file 'debian/control'
--- debian/control	2013-11-21 03:16:21 +0000
+++ debian/control	2013-12-18 14:40:47 +0000
@@ -69,7 +69,7 @@
  .
  Contains the protocol's definition files.
 
-Package: libmirserver11
+Package: libmirserver12
 Section: libs
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
@@ -115,7 +115,7 @@
 Architecture: i386 amd64 armhf arm64
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libmirserver11 (= ${binary:Version}),
+Depends: libmirserver12 (= ${binary:Version}),
          libmirprotobuf-dev (= ${binary:Version}),
          mircommon-dev (= ${binary:Version}),
          libglm-dev,

=== renamed file 'debian/libmirserver11.install' => 'debian/libmirserver12.install'
--- debian/libmirserver11.install	2013-11-21 03:16:21 +0000
+++ debian/libmirserver12.install	2013-12-18 14:40:47 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libmirserver.so.11
+usr/lib/*/libmirserver.so.12

=== modified file 'debian/mir-test-tools.install'
--- debian/mir-test-tools.install	2013-08-28 03:41:48 +0000
+++ debian/mir-test-tools.install	2013-12-18 14:40:47 +0000
@@ -1,3 +1,6 @@
 usr/bin/mir_stress
+usr/bin/mir_unit_tests
+usr/bin/mir_acceptance_tests
+usr/bin/mir_integration_tests
 usr/lib/*/mir/tools/libmirclientlttng.so
 usr/lib/*/mir/tools/libmirserverlttng.so

=== modified file 'debian/rules'
--- debian/rules	2013-11-21 03:16:21 +0000
+++ debian/rules	2013-12-18 14:40:47 +0000
@@ -21,10 +21,7 @@
 ifeq ($(DEB_HOST_ARCH),armhf)
 	dh_auto_configure -- \
 	  $(COMMON_CONFIGURE_OPTIONS) \
-	  -DMIR_PLATFORM=android \
-	  -DMIR_ENABLE_UNIT_TESTS=NO \
-	  -DMIR_ENABLE_ACCEPTANCE_TESTS=NO \
-	  -DMIR_ENABLE_INTEGRATION_TESTS=NO
+	  -DMIR_PLATFORM=android 
 else
 ifeq ($(DEB_HOST_ARCH),powerpc)
 	dh_auto_configure -- \

=== modified file 'doc/building_source_for_android.md'
--- doc/building_source_for_android.md	2013-11-21 03:16:21 +0000
+++ doc/building_source_for_android.md	2013-12-18 14:40:47 +0000
@@ -66,7 +66,6 @@
     
     Then you should run:
 
-        $ dpkg --add-architecture armhf
         $ apt-get update
 
     To test, try downloading a package like this:

=== modified file 'examples/demo-inprocess-surface-client/inprocess_egl_client.cpp'
--- examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-11-21 03:16:21 +0000
+++ examples/demo-inprocess-surface-client/inprocess_egl_client.cpp	2013-12-18 14:40:47 +0000
@@ -92,7 +92,7 @@
     auto params = msh::a_surface().of_name("Inprocess EGL Demo")
         .of_size(surface_size)
         .of_buffer_usage(mg::BufferUsage::hardware)
-        .of_pixel_format(geom::PixelFormat::argb_8888);
+        .of_pixel_format(mir_pixel_format_argb_8888);
     auto session = shell->open_session("Inprocess client", std::make_shared<NullEventSink>());
     // TODO: Why do we get an ID? ~racarr
     auto surface = session->get_surface(shell->create_surface_for(session, params));

=== modified file 'examples/demo-shell/window_manager.cpp'
--- examples/demo-shell/window_manager.cpp	2013-11-21 12:34:49 +0000
+++ examples/demo-shell/window_manager.cpp	2013-12-18 14:40:47 +0000
@@ -27,6 +27,7 @@
 #include "mir/compositor/compositor.h"
 
 #include <linux/input.h>
+#include <android/keycodes.h>  // TODO remove this dependency
 
 #include <cassert>
 #include <cstdlib>
@@ -133,7 +134,9 @@
             focus_controller->focus_next();
             return true;
         }
-        if (event.key.modifiers & mir_key_modifier_alt && event.key.scan_code == KEY_P)
+        else if ((event.key.modifiers & mir_key_modifier_alt &&
+                  event.key.scan_code == KEY_P) ||
+                 (event.key.key_code == AKEYCODE_POWER))
         {
             compositor->stop();
             auto conf = display->configuration();
@@ -155,7 +158,8 @@
             display_off = !display_off;
 
             display->configure(*conf.get());
-            compositor->start();
+            if (!display_off)
+                compositor->start();
             return true;
         }
     }

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2013-11-21 03:16:21 +0000
+++ examples/eglapp.c	2013-12-18 14:40:47 +0000
@@ -93,8 +93,12 @@
         lastcount = count;
     }
 
-    /* This is one way to handle window resizing. But in future it would be
-       better to have resize events coming from the server */
+    /*
+     * Querying the surface (actually the current buffer) dimensions here is
+     * the only truly safe way to be sure that the dimensions we think we
+     * have are those of the buffer being rendered to. But this should be
+     * improved in future; https://bugs.launchpad.net/mir/+bug/1194384
+     */
     if (eglQuerySurface(egldisplay, eglsurface, EGL_WIDTH, &width) &&
         eglQuerySurface(egldisplay, eglsurface, EGL_HEIGHT, &height))
     {
@@ -102,7 +106,7 @@
     }
 }
 
-static void mir_eglapp_handle_input(MirSurface* surface, MirEvent const* ev, void* context)
+static void mir_eglapp_handle_event(MirSurface* surface, MirEvent const* ev, void* context)
 {
     (void) surface;
     (void) context;
@@ -112,22 +116,16 @@
     {
         running = 0;
     }
-}
-
-static unsigned int get_bpp(MirPixelFormat pf)
-{
-    switch (pf)
+    else if (ev->type == mir_event_type_resize)
     {
-        case mir_pixel_format_abgr_8888:
-        case mir_pixel_format_xbgr_8888:
-        case mir_pixel_format_argb_8888:
-        case mir_pixel_format_xrgb_8888:
-            return 32;
-        case mir_pixel_format_bgr_888:
-            return 24;
-        case mir_pixel_format_invalid:
-        default:
-            return 0;
+        /*
+         * FIXME: https://bugs.launchpad.net/mir/+bug/1194384
+         * It is unsafe to set the width and height here because we're in a
+         * different thread to that doing the rendering. So we either need
+         * support for event queuing (directing them to another thread) or
+         * full single-threaded callbacks. (LP: #1194384).
+         */
+        printf("Resized to %dx%d\n", ev->resize.width, ev->resize.height);
     }
 }
 
@@ -172,7 +170,7 @@
     };
     MirEventDelegate delegate = 
     {
-        mir_eglapp_handle_input,
+        mir_eglapp_handle_event,
         NULL
     };
     EGLConfig eglconfig;
@@ -342,7 +340,7 @@
 
     printf("Server supports %d of %d surface pixel formats. Using format: %d\n",
         nformats, mir_pixel_formats, surfaceparm.pixel_format);
-    unsigned int bpp = get_bpp(surfaceparm.pixel_format);
+    unsigned int bpp = 8 * MIR_BYTES_PER_PIXEL(surfaceparm.pixel_format);
     EGLint attribs[] =
     {
         EGL_SURFACE_TYPE, EGL_WINDOW_BIT,

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2013-09-19 13:24:22 +0000
+++ examples/fingerpaint.c	2013-12-18 14:40:47 +0000
@@ -247,6 +247,18 @@
             redraw(surface, canvas);
         }
     }
+    else if (event->type == mir_event_type_resize)
+    {
+        /* FIXME: https://bugs.launchpad.net/mir/+bug/1194384
+         * mir_event_type_resize will arrive in a different thread to that of
+         * mir_event_type_motion, so we cannot safely redraw from this thread.
+         * Either the callbacks will need to become thread-safe, or we'd have
+         * to employ some non-trivial event queuing and inter-thread signals,
+         * which I think is beyond the scope of this example code.
+         *
+         *    redraw(surface, canvas);
+         */
+    }
 }
 
 static const MirDisplayOutput *find_active_output(

=== modified file 'examples/render_surfaces.cpp'
--- examples/render_surfaces.cpp	2013-11-21 12:34:49 +0000
+++ examples/render_surfaces.cpp	2013-12-18 14:40:47 +0000
@@ -414,12 +414,15 @@
                     mf::SurfaceId(), {});
 
             /*
-             * We call advance_client_buffer() twice so that the surface is
+             * We call swap_buffers() twice so that the surface is
              * considers the first buffer to be posted.
              * (TODO There must be a better way!)
              */
-            s->advance_client_buffer();
-            s->advance_client_buffer();
+            {
+                mg::Buffer* buffer{nullptr};
+                s->swap_buffers(buffer);
+                s->swap_buffers(buffer);
+            }
 
             /*
              * Place each surface at a different starting location and give it a

=== modified file 'include/client/mir_toolkit/mir_client_library.h'
--- include/client/mir_toolkit/mir_client_library.h	2013-11-21 12:34:49 +0000
+++ include/client/mir_toolkit/mir_client_library.h	2013-12-18 14:40:47 +0000
@@ -66,10 +66,10 @@
 /**
  * Test for a valid connection
  * \param [in] connection  The connection
- * \return                 A non-zero value if the supplied connection is
- *                         valid, 0 otherwise
+ * \return                 True if the supplied connection is valid, or
+ *                         false otherwise.
  */
-int mir_connection_is_valid(MirConnection *connection);
+MirBool mir_connection_is_valid(MirConnection *connection);
 
 /**
  * Retrieve a text description of the last error. The returned string is owned
@@ -104,7 +104,7 @@
 void mir_connection_set_lifecycle_event_callback(MirConnection* connection,
     mir_lifecycle_event_callback callback, void* context);
 
-/** 
+/**
  * \deprecated Use mir_connection_create_display_config
  */
 __attribute__((__deprecated__("Use mir_connection_create_display_config()")))
@@ -112,8 +112,8 @@
 
 /**
  * Query the display
- *   \warning return value must be destroyed via mir_display_config_destroy() 
- *   \warning may return null if connection is invalid 
+ *   \warning return value must be destroyed via mir_display_config_destroy()
+ *   \warning may return null if connection is invalid
  *   \param [in]  connection        The connection
  *   \return                        structure that describes the display configuration
  */
@@ -135,7 +135,7 @@
 
 /**
  * Destroy the DisplayConfiguration resource acquired from mir_connection_create_display_config
- *   \param [in] display_configuration  The display_configuration information resource to be destroyed 
+ *   \param [in] display_configuration  The display_configuration information resource to be destroyed
  */
 void mir_display_config_destroy(MirDisplayConfiguration* display_configuration);
 
@@ -149,7 +149,7 @@
  *
  *   \warning This request may be denied. Check that the request succeeded with mir_connection_get_error_message.
  *   \param [in] connection             The connection
- *   \param [in] display_configuration  The display_configuration to apply 
+ *   \param [in] display_configuration  The display_configuration to apply
  *   \return                            A handle that can be passed to mir_wait_for
  */
 MirWaitHandle* mir_connection_apply_display_config(MirConnection *connection, MirDisplayConfiguration* display_configuration);
@@ -164,10 +164,10 @@
 /**
  * Get the list of possible formats that a surface can be created with.
  *   \param [in] connection         The connection
- *   \param [out] formats           List of valid formats to create surfaces with 
+ *   \param [out] formats           List of valid formats to create surfaces with
  *   \param [in]  formats_size      size of formats list
  *   \param [out] num_valid_formats number of valid formats returned in formats
- */ 
+ */
 void mir_connection_get_available_surface_formats(
     MirConnection* connection, MirPixelFormat* formats,
     unsigned const int format_size, unsigned int *num_valid_formats);
@@ -227,10 +227,10 @@
 /**
  * Test for a valid surface
  *   \param [in] surface  The surface
- *   \return              A non-zero value if the supplied surface is valid,
- *                        0 otherwise
+ *   \return              True if the supplied surface is valid, or
+ *                        false otherwise.
  */
-int mir_surface_is_valid(MirSurface *surface);
+MirBool mir_surface_is_valid(MirSurface *surface);
 
 /**
  * Retrieve a text description of the error. The returned string is owned by
@@ -253,7 +253,7 @@
 
 /**
  * Get the underlying platform type so the buffer obtained in "raw" representation
- * in mir_surface_get_current_buffer() can be understood 
+ * 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
@@ -386,12 +386,12 @@
 /**
  * Set the swapinterval for mir_surface_swap_buffers. EGL users should use
  * eglSwapInterval directly.
- * At the time being, only swapinterval of 0 or 1 is supported. 
+ * At the time being, only swapinterval of 0 or 1 is supported.
  *   \param [in] surface  The surface to operate on
  *   \param [in] interval The number of vblank signals that
- *                        mir_surface_swap_buffers will wait for 
+ *                        mir_surface_swap_buffers will wait for
  *   \return              A wait handle that can be passed to mir_wait_for,
- *                        or NULL if the interval could not be supported 
+ *                        or NULL if the interval could not be supported
  */
 MirWaitHandle* mir_surface_set_swapinterval(MirSurface* surface, int interval);
 

=== modified file 'include/client/mir_toolkit/mir_client_library_debug.h'
--- include/client/mir_toolkit/mir_client_library_debug.h	2013-09-11 20:57:29 +0000
+++ include/client/mir_toolkit/mir_client_library_debug.h	2013-12-18 14:40:47 +0000
@@ -38,6 +38,6 @@
  *                                This is the buffer that is currently being drawn to,
  *                                and would be returned by mir_surface_get_current_buffer.
  */
-uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface); 
+uint32_t mir_debug_surface_current_buffer_id(MirSurface *surface);
 
 #endif /* MIR_CLIENT_LIBRARY_DEBUG_H */

=== modified file 'include/platform/mir/graphics/buffer.h'
--- include/platform/mir/graphics/buffer.h	2013-10-15 08:53:10 +0000
+++ include/platform/mir/graphics/buffer.h	2013-12-18 14:40:47 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/native_buffer.h"
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <memory>
 
@@ -40,7 +40,7 @@
     virtual BufferID id() const = 0;
     virtual geometry::Size size() const = 0;
     virtual geometry::Stride stride() const = 0;
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
     virtual void bind_to_texture() = 0;
     virtual bool can_bypass() const = 0;
 

=== modified file 'include/platform/mir/graphics/buffer_properties.h'
--- include/platform/mir/graphics/buffer_properties.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/buffer_properties.h	2013-12-18 14:40:47 +0000
@@ -20,7 +20,7 @@
 #define MIR_GRAPHICS_BUFFER_PROPERTIES_H_
 
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 namespace mir
 {
@@ -49,13 +49,13 @@
 {
     BufferProperties() :
         size(),
-        format(geometry::PixelFormat::invalid),
+        format(mir_pixel_format_invalid),
         usage(BufferUsage::undefined)
     {
     }
 
     BufferProperties(const geometry::Size& size,
-                     const geometry::PixelFormat& format,
+                     const MirPixelFormat& format,
                      BufferUsage usage) :
         size{size},
         format{format},
@@ -64,7 +64,7 @@
     }
 
     geometry::Size size;
-    geometry::PixelFormat format;
+    MirPixelFormat format;
     BufferUsage usage;
 };
 

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2013-09-12 21:36:55 +0000
+++ include/platform/mir/graphics/display_configuration.h	2013-12-18 14:40:47 +0000
@@ -22,7 +22,6 @@
 #include "mir/int_wrapper.h"
 #include "mir/geometry/size.h"
 #include "mir/geometry/point.h"
-#include "mir/geometry/pixel_format.h"
 #include "mir_toolkit/common.h"
 
 #include <functional>
@@ -89,7 +88,7 @@
     /** The type of the output. */
     DisplayConfigurationOutputType type;
     /** The pixel formats supported by the output */
-    std::vector<geometry::PixelFormat> pixel_formats;
+    std::vector<MirPixelFormat> pixel_formats;
     /** The modes supported by the output. */
     std::vector<DisplayConfigurationMode> modes;
     /** The index in the 'modes' vector of the preferred output mode. */

=== modified file 'include/platform/mir/graphics/graphic_buffer_allocator.h'
--- include/platform/mir/graphics/graphic_buffer_allocator.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/graphic_buffer_allocator.h	2013-12-18 14:40:47 +0000
@@ -50,7 +50,7 @@
     /**
      * The supported buffer pixel formats.
      */
-    virtual std::vector<geometry::PixelFormat> supported_pixel_formats() = 0;
+    virtual std::vector<MirPixelFormat> supported_pixel_formats() = 0;
 
 protected:
     GraphicBufferAllocator() = default;

=== modified file 'include/platform/mir/graphics/internal_surface.h'
--- include/platform/mir/graphics/internal_surface.h	2013-08-28 03:41:48 +0000
+++ include/platform/mir/graphics/internal_surface.h	2013-12-18 14:40:47 +0000
@@ -35,7 +35,7 @@
 public:
     virtual ~InternalSurface() = default;
 
-    virtual std::shared_ptr<Buffer> advance_client_buffer() = 0;
+    virtual void swap_buffers(graphics::Buffer*&) = 0;
     virtual geometry::Size size() const = 0;
     virtual MirPixelFormat pixel_format() const = 0;
 

=== modified file 'include/server/mir/compositor/buffer_stream.h'
--- include/server/mir/compositor/buffer_stream.h	2013-11-21 03:16:21 +0000
+++ include/server/mir/compositor/buffer_stream.h	2013-12-18 14:40:47 +0000
@@ -21,7 +21,7 @@
 #define MIR_COMPOSITOR_BUFFER_STREAM_H_
 
 #include "mir/geometry/size.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/graphics/buffer_id.h"
 
 #include <memory>
@@ -41,11 +41,11 @@
 public:
     virtual ~BufferStream() = default;
 
-    virtual std::shared_ptr<graphics::Buffer> secure_client_buffer() = 0;
+    virtual void swap_client_buffers(graphics::Buffer*& buffer) = 0;
     virtual std::shared_ptr<graphics::Buffer>
         lock_compositor_buffer(unsigned long frameno) = 0;
     virtual std::shared_ptr<graphics::Buffer> lock_snapshot_buffer() = 0;
-    virtual geometry::PixelFormat get_stream_pixel_format() = 0;
+    virtual MirPixelFormat get_stream_pixel_format() = 0;
     virtual geometry::Size stream_size() = 0;
     virtual void resize(geometry::Size const& size) = 0;
     virtual void allow_framedropping(bool) = 0;

=== modified file 'include/server/mir/compositor/compositing_criteria.h'
--- include/server/mir/compositor/compositing_criteria.h	2013-10-07 07:56:05 +0000
+++ include/server/mir/compositor/compositing_criteria.h	2013-12-18 14:40:47 +0000
@@ -30,7 +30,7 @@
 namespace compositor
 {
 
-class CompositingCriteria 
+class CompositingCriteria
 {
 public:
     virtual float alpha() const = 0;

=== modified file 'include/server/mir/default_server_configuration.h'
--- include/server/mir/default_server_configuration.h	2013-11-21 12:34:49 +0000
+++ include/server/mir/default_server_configuration.h	2013-12-18 14:40:47 +0000
@@ -35,7 +35,6 @@
 class Drawer;
 class DisplayBufferCompositorFactory;
 class Compositor;
-class OverlayRenderer;
 class RendererFactory;
 }
 namespace frontend
@@ -55,7 +54,6 @@
 namespace shell
 {
 class SurfaceFactory;
-class SurfaceController;
 class InputTargeter;
 class FocusSetter;
 class PlacementStrategy;
@@ -82,6 +80,7 @@
 class SurfaceBuilder;
 class SurfaceStackModel;
 class SurfaceStack;
+class SurfaceRanker;
 class SurfaceController;
 class InputRegistrar;
 class SceneReport;
@@ -152,7 +151,6 @@
      * configurable interfaces for modifying compositor
      *  @{ */
     virtual std::shared_ptr<compositor::DisplayBufferCompositorFactory> the_display_buffer_compositor_factory();
-    virtual std::shared_ptr<compositor::OverlayRenderer>          the_overlay_renderer();
     /** @} */
 
     /** @name compositor configuration - dependencies
@@ -191,7 +189,6 @@
     virtual std::shared_ptr<shell::SessionListener>     the_shell_session_listener();
     virtual std::shared_ptr<shell::DisplayLayout>       the_shell_display_layout();
     virtual std::shared_ptr<shell::SurfaceConfigurator> the_shell_surface_configurator();
-    virtual std::shared_ptr<shell::SurfaceController>   the_shell_surface_controller();
     /** @} */
 
     /** @name internal scene configuration
@@ -204,6 +201,7 @@
     virtual std::shared_ptr<scene::SessionEventSink>  the_session_event_sink();
     virtual std::shared_ptr<scene::SessionEventHandlerRegister> the_session_event_handler_register();
     virtual std::shared_ptr<scene::SurfaceStackModel> the_surface_stack_model();
+    virtual std::shared_ptr<scene::SurfaceRanker>   the_surface_ranker();
     /** @} */
 
     /** @name scene configuration - dependencies
@@ -279,7 +277,6 @@
     CachedPtr<shell::DisplayLayout>     shell_display_layout;
     CachedPtr<shell::SurfaceConfigurator> shell_surface_configurator;
     CachedPtr<compositor::DisplayBufferCompositorFactory> display_buffer_compositor_factory;
-    CachedPtr<compositor::OverlayRenderer> overlay_renderer;
     CachedPtr<compositor::Compositor> compositor;
     CachedPtr<logging::Logger> logger;
     CachedPtr<graphics::DisplayReport> display_report;

=== modified file 'include/server/mir/frontend/message_processor_report.h'
--- include/server/mir/frontend/message_processor_report.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/frontend/message_processor_report.h	2013-12-18 14:40:47 +0000
@@ -44,7 +44,7 @@
     virtual void exception_handled(void const* mediator, int id, std::exception const& error) = 0;
 
     virtual void exception_handled(void const* mediator, std::exception const& error) = 0;
-    
+
     virtual void sent_event(void const* mediator, MirSurfaceEvent const& ev) = 0;
 
 private:

=== modified file 'include/server/mir/frontend/null_message_processor_report.h'
--- include/server/mir/frontend/null_message_processor_report.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/frontend/null_message_processor_report.h	2013-12-18 14:40:47 +0000
@@ -36,7 +36,7 @@
     void exception_handled(void const*, int, std::exception const&);
 
     void exception_handled(void const*, std::exception const&);
-    
+
     void sent_event(void const*, MirSurfaceEvent const& e);
 };
 }

=== modified file 'include/server/mir/frontend/session_authorizer.h'
--- include/server/mir/frontend/session_authorizer.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/frontend/session_authorizer.h	2013-12-18 14:40:47 +0000
@@ -30,7 +30,7 @@
 {
 public:
     virtual ~SessionAuthorizer() {}
-    
+
     virtual bool connection_is_allowed(pid_t pid) = 0;
     virtual bool configure_display_is_allowed(pid_t pid) = 0;
 protected:

=== modified file 'include/server/mir/frontend/surface.h'
--- include/server/mir/frontend/surface.h	2013-11-21 03:16:21 +0000
+++ include/server/mir/frontend/surface.h	2013-12-18 14:40:47 +0000
@@ -20,7 +20,6 @@
 #ifndef MIR_FRONTEND_SURFACE_H_
 #define MIR_FRONTEND_SURFACE_H_
 
-#include "mir/geometry/pixel_format.h"
 #include "mir/geometry/point.h"
 #include "mir/geometry/size.h"
 #include "mir_toolkit/common.h"
@@ -55,9 +54,9 @@
     virtual void force_requests_to_complete() = 0;
 
     virtual geometry::Size size() const = 0;
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
 
-    virtual std::shared_ptr<graphics::Buffer> advance_client_buffer() = 0;
+    virtual void swap_buffers(graphics::Buffer*&) = 0;
 
     virtual bool supports_input() const = 0;
     virtual int client_input_fd() const = 0;

=== modified file 'include/server/mir/input/input_configuration.h'
--- include/server/mir/input/input_configuration.h	2013-11-20 15:56:58 +0000
+++ include/server/mir/input/input_configuration.h	2013-12-18 14:40:47 +0000
@@ -44,7 +44,7 @@
     virtual std::shared_ptr<scene::InputRegistrar> the_input_registrar() = 0;
     virtual std::shared_ptr<shell::InputTargeter> the_input_targeter() = 0;
     virtual std::shared_ptr<input::InputManager> the_input_manager() = 0;
-    
+
     virtual void set_input_targets(std::shared_ptr<input::InputTargets> const& targets) = 0;
 
 protected:

=== modified file 'include/server/mir/input/input_report.h'
--- include/server/mir/input/input_report.h	2013-05-29 14:11:56 +0000
+++ include/server/mir/input/input_report.h	2013-12-18 14:40:47 +0000
@@ -31,7 +31,7 @@
 {
 public:
     virtual ~InputReport() = default;
-    
+
     virtual void received_event_from_kernel(int64_t when, int type, int code, int value) = 0;
 
     virtual void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time) = 0;
@@ -39,7 +39,7 @@
     virtual void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time) = 0;
 
     virtual void received_event_finished_signal(int src_fd, uint32_t seq_id) = 0;
-    
+
 protected:
     InputReport() = default;
     InputReport(InputReport const&) = delete;

=== modified file 'include/server/mir/input/null_input_report.h'
--- include/server/mir/input/null_input_report.h	2013-05-29 14:11:56 +0000
+++ include/server/mir/input/null_input_report.h	2013-12-18 14:40:47 +0000
@@ -32,7 +32,7 @@
 public:
     NullInputReport() = default;
     virtual ~NullInputReport() noexcept(true) = default;
-    
+
     void received_event_from_kernel(int64_t when, int type, int code, int value);
 
     void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);

=== modified file 'include/server/mir/input/surface.h'
--- include/server/mir/input/surface.h	2013-07-16 15:49:19 +0000
+++ include/server/mir/input/surface.h	2013-12-18 14:40:47 +0000
@@ -27,7 +27,7 @@
 {
 namespace input
 {
-class Surface 
+class Surface
 {
 public:
     virtual std::string const& name() const = 0;
@@ -36,7 +36,7 @@
     virtual bool contains(geometry::Point const& point) const = 0;
 
 protected:
-    Surface() = default; 
+    Surface() = default;
     virtual ~Surface() = default;
     Surface(const Surface&) = delete;
     Surface& operator=(const Surface& ) = delete;

=== modified file 'include/server/mir/logging/glog_logger.h'
--- include/server/mir/logging/glog_logger.h	2013-03-26 17:53:30 +0000
+++ include/server/mir/logging/glog_logger.h	2013-12-18 14:40:47 +0000
@@ -35,7 +35,7 @@
     virtual void log(
         Severity severity,
         const std::string& message,
-        const std::string& component);
+        const std::string& component) override;
 };
 }
 }

=== modified file 'include/server/mir/logging/input_report.h'
--- include/server/mir/logging/input_report.h	2013-05-29 14:11:56 +0000
+++ include/server/mir/logging/input_report.h	2013-12-18 14:40:47 +0000
@@ -39,14 +39,14 @@
 public:
     InputReport(std::shared_ptr<Logger> const& logger);
     virtual ~InputReport() noexcept(true) = default;
-    
+
     void received_event_from_kernel(int64_t when, int type, int code, int value);
 
     void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
     void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
 
     void received_event_finished_signal(int src_fd, uint32_t seq_id);
-    
+
 private:
     char const* component();
     std::shared_ptr<Logger> const logger;

=== modified file 'include/server/mir/lttng/input_report.h'
--- include/server/mir/lttng/input_report.h	2013-06-03 12:15:44 +0000
+++ include/server/mir/lttng/input_report.h	2013-12-18 14:40:47 +0000
@@ -32,14 +32,14 @@
 public:
     InputReport() = default;
     virtual ~InputReport() noexcept(true) = default;
-    
+
     void received_event_from_kernel(int64_t when, int type, int code, int value);
 
     void published_key_event(int dest_fd, uint32_t seq_id, int64_t event_time);
     void published_motion_event(int dest_fd, uint32_t seq_id, int64_t event_time);
 
     void received_event_finished_signal(int src_fd, uint32_t seq_id);
-    
+
 private:
     ServerTracepointProvider tp_provider;
 };

=== modified file 'include/server/mir/scene/input_registrar.h'
--- include/server/mir/scene/input_registrar.h	2013-11-20 16:22:32 +0000
+++ include/server/mir/scene/input_registrar.h	2013-12-18 14:40:47 +0000
@@ -41,7 +41,7 @@
 {
 public:
     virtual ~InputRegistrar() = default;
-    
+
     virtual void input_channel_opened(std::shared_ptr<input::InputChannel> const& opened_channel,
                                       std::shared_ptr<input::Surface> const& info,
                                       input::InputReceptionMode input_mode) = 0;

=== modified file 'include/server/mir/shell/input_targeter.h'
--- include/server/mir/shell/input_targeter.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/shell/input_targeter.h	2013-12-18 14:40:47 +0000
@@ -36,7 +36,7 @@
 {
 public:
     virtual ~InputTargeter() = default;
-    
+
     virtual void focus_changed(std::shared_ptr<input::InputChannel const> const& focus_channel) = 0;
     virtual void focus_cleared() = 0;
 

=== modified file 'include/server/mir/shell/session_listener.h'
--- include/server/mir/shell/session_listener.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/shell/session_listener.h	2013-12-18 14:40:47 +0000
@@ -35,7 +35,7 @@
     virtual void stopping(std::shared_ptr<Session> const& session) = 0;
     virtual void focused(std::shared_ptr<Session> const& session) = 0;
     virtual void unfocused() = 0;
-    
+
     virtual void surface_created(Session& session, std::shared_ptr<Surface> const& surface) = 0;
     virtual void destroying_surface(Session& session, std::shared_ptr<Surface> const& surface) = 0;
 

=== modified file 'include/server/mir/shell/surface.h'
--- include/server/mir/shell/surface.h	2013-11-21 03:16:21 +0000
+++ include/server/mir/shell/surface.h	2013-12-18 14:40:47 +0000
@@ -29,10 +29,10 @@
 
 namespace mir
 {
+namespace scene { class SurfaceRanker; }
 namespace shell
 {
 class InputTargeter;
-class SurfaceController;
 
 class Surface : public frontend::Surface, public shell::SurfaceBufferAccess
 {
@@ -50,7 +50,7 @@
 
     virtual void allow_framedropping(bool) = 0;
 
-    virtual void raise(std::shared_ptr<SurfaceController> const& controller) = 0;
+    virtual void raise(std::shared_ptr<scene::SurfaceRanker> const& controller) = 0;
 
     virtual void resize(geometry::Size const& size) = 0;
     virtual void set_rotation(float degrees, glm::vec3 const& axis) = 0;

=== modified file 'include/server/mir/shell/surface_configurator.h'
--- include/server/mir/shell/surface_configurator.h	2013-07-29 22:55:20 +0000
+++ include/server/mir/shell/surface_configurator.h	2013-12-18 14:40:47 +0000
@@ -34,7 +34,7 @@
 {
 public:
     virtual ~SurfaceConfigurator() = default;
-    
+
     /// Returns the selected value.
     virtual int select_attribute_value(Surface const& surface, MirSurfaceAttrib attrib,
                                        int requested_value) = 0;

=== modified file 'include/server/mir/shell/surface_creation_parameters.h'
--- include/server/mir/shell/surface_creation_parameters.h	2013-11-20 15:56:58 +0000
+++ include/server/mir/shell/surface_creation_parameters.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_
 #define MIR_SHELL_SURFACE_CREATION_PARAMETERS_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/point.h"
 #include "mir/geometry/size.h"
 #include "mir/graphics/buffer_properties.h"
@@ -44,15 +44,15 @@
     SurfaceCreationParameters& of_size(geometry::Size new_size);
 
     SurfaceCreationParameters& of_size(geometry::Width::ValueType width, geometry::Height::ValueType height);
-    
+
     SurfaceCreationParameters& of_position(geometry::Point const& top_left);
 
     SurfaceCreationParameters& of_buffer_usage(graphics::BufferUsage new_buffer_usage);
 
-    SurfaceCreationParameters& of_pixel_format(geometry::PixelFormat new_pixel_format);
-    
+    SurfaceCreationParameters& of_pixel_format(MirPixelFormat new_pixel_format);
+
     SurfaceCreationParameters& of_depth(scene::DepthId const& new_depth);
-    
+
     SurfaceCreationParameters& with_input_mode(input::InputReceptionMode const& new_mode);
 
     SurfaceCreationParameters& with_output_id(graphics::DisplayConfigurationOutputId const& output_id);
@@ -61,7 +61,7 @@
     geometry::Size size;
     geometry::Point top_left;
     graphics::BufferUsage buffer_usage;
-    geometry::PixelFormat pixel_format;
+    MirPixelFormat pixel_format;
     scene::DepthId depth;
     input::InputReceptionMode input_mode;
     graphics::DisplayConfigurationOutputId output_id;

=== removed file 'include/shared/mir/geometry/pixel_format.h'
--- include/shared/mir/geometry/pixel_format.h	2013-10-07 08:25:04 +0000
+++ include/shared/mir/geometry/pixel_format.h	1970-01-01 00:00:00 +0000
@@ -1,54 +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: Alan Griffiths <[e-mail]>
- */
-
-
-#ifndef MIR_COMPOSITOR_PIXEL_FORMAT_H_
-#define MIR_COMPOSITOR_PIXEL_FORMAT_H_
-
-#include <cstdint>
-#include <cstddef>
-
-namespace mir
-{
-namespace geometry
-{
-enum class PixelFormat : uint32_t
-{
-    invalid,
-    abgr_8888,
-    xbgr_8888,
-    argb_8888,
-    xrgb_8888,
-    bgr_888
-};
-
-static inline size_t bytes_per_pixel(PixelFormat fmt)
-{
-    return (fmt == PixelFormat::bgr_888) ? 3 : 4;
-}
-
-static inline bool has_alpha(PixelFormat fmt)
-{
-    return (fmt == PixelFormat::abgr_8888) ||
-           (fmt == PixelFormat::argb_8888);
-}
-
-}
-}
-
-#endif /* MIR_COMPOSITOR_PIXEL_FORMAT_H_ */

=== modified file 'include/shared/mir/geometry/rectangle.h'
--- include/shared/mir/geometry/rectangle.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir/geometry/rectangle.h	2013-12-18 14:40:47 +0000
@@ -35,7 +35,7 @@
     Point top_left;
     Size size;
 
-    /** 
+    /**
      * The bottom right boundary point of the rectangle.
      *
      * Note that the returned point is *not* included in the rectangle

=== modified file 'include/shared/mir/graphics/android/android_driver_interpreter.h'
--- include/shared/mir/graphics/android/android_driver_interpreter.h	2013-10-15 08:53:10 +0000
+++ include/shared/mir/graphics/android/android_driver_interpreter.h	2013-12-18 14:40:47 +0000
@@ -36,7 +36,7 @@
     virtual void driver_returns_buffer(ANativeWindowBuffer*, int fence) = 0;
     virtual void dispatch_driver_request_format(int format) = 0;
     virtual int driver_requests_info(int key) const = 0;
-    virtual void sync_to_display(bool sync) = 0; 
+    virtual void sync_to_display(bool sync) = 0;
 protected:
     AndroidDriverInterpreter() {};
     virtual ~AndroidDriverInterpreter() {};

=== modified file 'include/shared/mir/graphics/android/mir_native_window.h'
--- include/shared/mir/graphics/android/mir_native_window.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir/graphics/android/mir_native_window.h	2013-12-18 14:40:47 +0000
@@ -25,7 +25,7 @@
 
 namespace mir
 {
-namespace graphics 
+namespace graphics
 {
 namespace android
 {

=== modified file 'include/shared/mir/graphics/android/native_buffer.h'
--- include/shared/mir/graphics/android/native_buffer.h	2013-10-15 08:53:10 +0000
+++ include/shared/mir/graphics/android/native_buffer.h	2013-12-18 14:40:47 +0000
@@ -27,7 +27,7 @@
 namespace graphics
 {
 
-class NativeBuffer 
+class NativeBuffer
 {
 public:
     virtual ~NativeBuffer() = default;
@@ -37,7 +37,7 @@
     virtual android::NativeFence copy_fence() const = 0;
 
     virtual void wait_for_content() = 0;
-    virtual void update_fence(android::NativeFence& fence) = 0; 
+    virtual void update_fence(android::NativeFence& fence) = 0;
 
 protected:
     NativeBuffer() = default;

=== modified file 'include/shared/mir/input/android/android_input_lexicon.h'
--- include/shared/mir/input/android/android_input_lexicon.h	2013-04-24 05:22:20 +0000
+++ include/shared/mir/input/android/android_input_lexicon.h	2013-12-18 14:40:47 +0000
@@ -36,7 +36,7 @@
 namespace android
 {
 
-/// The Lexicon translates droidinput event types to MirEvent types prior to 
+/// The Lexicon translates droidinput event types to MirEvent types prior to
 /// shell or client handling.
 class Lexicon
 {

=== modified file 'include/shared/mir/input/input_platform.h'
--- include/shared/mir/input/input_platform.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir/input/input_platform.h	2013-12-18 14:40:47 +0000
@@ -37,7 +37,7 @@
 class InputPlatform
 {
 public:
-    virtual ~InputPlatform() {};  
+    virtual ~InputPlatform() {};
 
     virtual std::shared_ptr<InputReceiverThread> create_input_thread(int fd, std::function<void(MirEvent *)> const& callback) = 0;
 

=== modified file 'include/shared/mir/input/xkb_mapper.h'
--- include/shared/mir/input/xkb_mapper.h	2013-05-17 19:42:09 +0000
+++ include/shared/mir/input/xkb_mapper.h	2013-12-18 14:40:47 +0000
@@ -37,7 +37,7 @@
 public:
     XKBMapper();
     virtual ~XKBMapper() = default;
-    
+
     void update_state_and_map_event(MirKeyEvent& key_ev);
 
 protected:

=== modified file 'include/shared/mir/logging/dumb_console_logger.h'
--- include/shared/mir/logging/dumb_console_logger.h	2013-06-03 08:14:01 +0000
+++ include/shared/mir/logging/dumb_console_logger.h	2013-12-18 14:40:47 +0000
@@ -30,7 +30,7 @@
 public:
 
 protected:
-    void log(Severity severity, const std::string& message, const std::string& component);
+    void log(Severity severity, const std::string& message, const std::string& component) override;
 };
 }
 }

=== modified file 'include/shared/mir/logging/logger.h'
--- include/shared/mir/logging/logger.h	2013-06-03 08:14:01 +0000
+++ include/shared/mir/logging/logger.h	2013-12-18 14:40:47 +0000
@@ -39,28 +39,16 @@
         debug = 4
     };
 
-    template<Severity severity>
-    void log(const std::string& message)
-    {
-        static const std::string unknown_component("UnknownComponent");
-        log(severity, message, unknown_component);
-    }
 
-    template<Severity severity>
-    void log(const std::string& message, const std::string& component)
-    {
-        log(severity, message, component);
-    }
+    virtual void log(Severity severity,
+                     const std::string& message,
+                     const std::string& component = "UnknownComponent") = 0;
 
 protected:
     Logger() {}
     virtual ~Logger() = default;
     Logger(const Logger&) = delete;
     Logger& operator=(const Logger&) = delete;
-
-    virtual void log(Severity severity,
-                     const std::string& message,
-                     const std::string& component) = 0;
 };
 }
 }

=== modified file 'include/shared/mir_toolkit/client_types.h'
--- include/shared/mir_toolkit/client_types.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir_toolkit/client_types.h	2013-12-18 14:40:47 +0000
@@ -34,6 +34,12 @@
 extern "C" {
 #endif
 
+typedef enum MirBool
+{
+    mir_false = 0,
+    mir_true = 1
+} MirBool;
+
 /* Display server connection API */
 typedef void* MirEGLNativeWindowType;
 typedef void* MirEGLNativeDisplayType;
@@ -97,26 +103,6 @@
     MirConnection* connection, void* context);
 
 /**
- * The order of components in a format enum matches the
- * order of the components as they would be written in an
- *  integer representing a pixel value of that format.
- *
- * For example, abgr_8888 corresponds to 0xAABBGGRR, which will
- * end up as R,G,B,A in memory in a little endian system, and
- * as A,B,G,R in memory in a big endian system.
- */
-typedef enum MirPixelFormat
-{
-    mir_pixel_format_invalid,
-    mir_pixel_format_abgr_8888,
-    mir_pixel_format_xbgr_8888,
-    mir_pixel_format_argb_8888,
-    mir_pixel_format_xrgb_8888,
-    mir_pixel_format_bgr_888,
-    mir_pixel_formats
-} MirPixelFormat;
-
-/**
  * MirBufferUsage specifies how a surface can and will be used. A "hardware"
  * surface can be used for OpenGL accelerated rendering. A "software" surface
  * is one that can be addressed in main memory and blitted to directly.
@@ -157,7 +143,7 @@
 typedef enum MirPlatformType
 {
     mir_platform_type_gbm,
-    mir_platform_type_android    
+    mir_platform_type_android
 } MirPlatformType;
 
 typedef struct MirPlatformPackage
@@ -184,7 +170,7 @@
 
 } MirGraphicsRegion;
 
-/** 
+/**
  * DEPRECATED. use MirDisplayConfiguration
  */
 enum { mir_supported_pixel_format_max = 32 };
@@ -192,7 +178,7 @@
 {
     uint32_t width;
     uint32_t height;
-    
+
     int supported_pixel_format_items;
     MirPixelFormat supported_pixel_format[mir_supported_pixel_format_max];
 } MirDisplayInfo;
@@ -240,7 +226,7 @@
     uint32_t num_modes;
     MirDisplayMode* modes;
     uint32_t preferred_mode;
-    uint32_t current_mode; 
+    uint32_t current_mode;
 
     uint32_t num_output_formats;
     MirPixelFormat* output_formats;
@@ -257,7 +243,7 @@
 
     uint32_t physical_width_mm;
     uint32_t physical_height_mm;
-    
+
     MirPowerMode power_mode;
 } MirDisplayOutput;
 

=== modified file 'include/shared/mir_toolkit/common.h'
--- include/shared/mir_toolkit/common.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir_toolkit/common.h	2013-12-18 14:40:47 +0000
@@ -86,6 +86,30 @@
     mir_power_mode_suspend, /* Blanked, lowest power. */
     mir_power_mode_off /* Powered down. */
 } MirPowerMode;
+
+/**
+ * The order of components in a format enum matches the
+ * order of the components as they would be written in an
+ *  integer representing a pixel value of that format.
+ *
+ * For example, abgr_8888 corresponds to 0xAABBGGRR, which will
+ * end up as R,G,B,A in memory in a little endian system, and
+ * as A,B,G,R in memory in a big endian system.
+ */
+typedef enum MirPixelFormat
+{
+    mir_pixel_format_invalid,
+    mir_pixel_format_abgr_8888,
+    mir_pixel_format_xbgr_8888,
+    mir_pixel_format_argb_8888,
+    mir_pixel_format_xrgb_8888,
+    mir_pixel_format_bgr_888,
+    mir_pixel_formats
+} MirPixelFormat;
+
+/* This could be improved... https://bugs.launchpad.net/mir/+bug/1236254 */
+#define MIR_BYTES_PER_PIXEL(f) (((f) == mir_pixel_format_bgr_888) ? 3 : 4)
+
 /**@}*/
 
 #endif

=== modified file 'include/shared/mir_toolkit/event.h'
--- include/shared/mir_toolkit/event.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir_toolkit/event.h	2013-12-18 14:40:47 +0000
@@ -39,7 +39,8 @@
 {
     mir_event_type_key,
     mir_event_type_motion,
-    mir_event_type_surface
+    mir_event_type_surface,
+    mir_event_type_resize
 } MirEventType;
 
 typedef enum {
@@ -141,7 +142,7 @@
 
     int32_t device_id;
     int32_t source_id;
-    /* 
+    /*
      * TODO(racarr): We would like to store this as a MirMotionAction but the android input stack
      * encodes some non enumerable values in it. It's convenient to keep things
      * this way for now until we can drop SF/Hybris support in QtUbuntu.
@@ -194,12 +195,22 @@
     int value;
 } MirSurfaceEvent;
 
+typedef struct
+{
+    MirEventType type;
+
+    int surface_id;
+    int width;
+    int height;
+} MirResizeEvent;
+
 typedef union
 {
     MirEventType    type;
     MirKeyEvent     key;
     MirMotionEvent  motion;
     MirSurfaceEvent surface;
+    MirResizeEvent  resize;
 } MirEvent;
 
 #ifdef __cplusplus

=== modified file 'include/shared/mir_toolkit/mir_native_buffer.h'
--- include/shared/mir_toolkit/mir_native_buffer.h	2013-11-21 03:16:21 +0000
+++ include/shared/mir_toolkit/mir_native_buffer.h	2013-12-18 14:40:47 +0000
@@ -52,6 +52,6 @@
 struct ANativeWindowBuffer;
 typedef struct ANativeWindowBuffer MirNativeBuffer;
 #else
-typedef struct MirBufferPackage MirNativeBuffer; 
+typedef struct MirBufferPackage MirNativeBuffer;
 #endif
 #endif /* MIR_CLIENT_MIR_NATIVE_BUFFER_H_ */

=== added file 'include/test/gmock_set_arg.h'
--- include/test/gmock_set_arg.h	1970-01-01 00:00:00 +0000
+++ include/test/gmock_set_arg.h	2013-12-18 14:40:47 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 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: Alan Griffiths <[e-mail]>
+ */
+
+#ifndef GMOCK_SET_ARG_H_
+#define GMOCK_SET_ARG_H_
+
+#include <gmock/gmock.h>
+
+namespace testing
+{
+namespace internal
+{
+template <size_t N, typename A, bool kIsProto>
+class SetArgumentAction {
+ public:
+  // Constructs an action that sets the variable pointed to by the
+  // N-th function argument to 'value'.
+  explicit SetArgumentAction(const A& value) : value_(value) {}
+
+  template <typename Result, typename ArgumentTuple>
+  void Perform(const ArgumentTuple& args) const {
+    CompileAssertTypesEqual<void, Result>();
+    ::std::tr1::get<N>(args) = value_;
+  }
+
+ private:
+  const A value_;
+
+  GTEST_DISALLOW_ASSIGN_(SetArgumentAction);
+};
+}
+template <size_t N, typename T>
+PolymorphicAction<
+  internal::SetArgumentAction<
+    N, T, internal::IsAProtocolMessage<T>::value> >
+SetArg(const T& x) {
+  return MakePolymorphicAction(internal::SetArgumentAction<
+      N, T, internal::IsAProtocolMessage<T>::value>(x));
+}
+}
+
+#endif /* GMOCK_SET_ARG_H_ */

=== modified file 'include/test/mir_test/draw/draw_pattern_checkered-inl.h'
--- include/test/mir_test/draw/draw_pattern_checkered-inl.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test/draw/draw_pattern_checkered-inl.h	2013-12-18 14:40:47 +0000
@@ -16,8 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "mir/geometry/pixel_format.h"
-namespace geom = mir::geometry;
+#include "mir_toolkit/common.h"
 
 template<size_t Rows, size_t Cols>
 DrawPatternCheckered<Rows,Cols>::DrawPatternCheckered(uint32_t (&pattern) [Rows][Cols])
@@ -32,14 +31,14 @@
     if (region.pixel_format != mir_pixel_format_abgr_8888)
         throw(std::runtime_error("cannot draw region, incorrect format"));
 
-    auto bpp = geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+    auto bpp = MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     for(int i=0; i < region.width; i++)
     {
         for(int j=0; j<region.height; j++)
         {
             int key_row = i % Rows;
             int key_col = j % Cols;
-            uint32_t *pixel = reinterpret_cast<uint32_t*>(&region.vaddr[j*region.stride + (i * bpp)]); 
+            uint32_t *pixel = reinterpret_cast<uint32_t*>(&region.vaddr[j*region.stride + (i * bpp)]);
             *pixel = color_pattern[key_row][key_col];
         }
     }
@@ -51,14 +50,14 @@
     if (region.pixel_format != mir_pixel_format_abgr_8888)
         throw(std::runtime_error("cannot check region, incorrect format"));
 
-    auto bpp = geom::bytes_per_pixel(geom::PixelFormat::abgr_8888);
+    auto bpp = MIR_BYTES_PER_PIXEL(mir_pixel_format_abgr_8888);
     for(int i=0; i< region.width; i++)
     {
         for(int j=0; j<region.height; j++)
         {
             int key_row = i % Rows;
             int key_col = j % Cols;
-            uint32_t *pixel = reinterpret_cast<uint32_t*>(&region.vaddr[j*region.stride + (i * bpp)]); 
+            uint32_t *pixel = reinterpret_cast<uint32_t*>(&region.vaddr[j*region.stride + (i * bpp)]);
             if ( *pixel != color_pattern[key_row][key_col] )
             {
                 return false;

=== modified file 'include/test/mir_test/fake_event_hub_input_configuration.h'
--- include/test/mir_test/fake_event_hub_input_configuration.h	2013-08-30 07:47:16 +0000
+++ include/test/mir_test/fake_event_hub_input_configuration.h	2013-12-18 14:40:47 +0000
@@ -59,7 +59,7 @@
 
     droidinput::sp<droidinput::EventHubInterface> the_event_hub();
     input::android::FakeEventHub* the_fake_event_hub();
-    
+
     bool is_key_repeat_enabled() override { return false; }
 
 

=== modified file 'include/test/mir_test_doubles/mock_alloc_adaptor.h'
--- include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-10-15 08:53:10 +0000
+++ include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_ALLOC_ADAPTOR_H_
 #define MIR_TEST_DOUBLES_MOCK_ALLOC_ADAPTOR_H_
 
-#include "src/server/graphics/android/graphic_alloc_adaptor.h"
+#include "src/platform/graphics/android/graphic_alloc_adaptor.h"
 
 #include <system/window.h>
 #include <gmock/gmock.h>
@@ -34,8 +34,8 @@
 class MockAllocAdaptor : public graphics::android::GraphicAllocAdaptor
 {
 public:
-    MOCK_METHOD3(alloc_buffer, 
-        std::shared_ptr<graphics::NativeBuffer>(geometry::Size, geometry::PixelFormat, graphics::android::BufferUsage));
+    MOCK_METHOD3(alloc_buffer,
+        std::shared_ptr<graphics::NativeBuffer>(geometry::Size, MirPixelFormat, graphics::android::BufferUsage));
 };
 
 }

=== modified file 'include/test/mir_test_doubles/mock_android_native_buffer.h'
--- include/test/mir_test_doubles/mock_android_native_buffer.h	2013-10-11 21:30:50 +0000
+++ include/test/mir_test_doubles/mock_android_native_buffer.h	2013-12-18 14:40:47 +0000
@@ -20,7 +20,7 @@
 #define MIR_TEST_DOUBLES_MOCK_ANDROID_NATIVE_BUFFER_H_
 
 #include "mir/graphics/android/native_buffer.h"
-#include <gmock/gmock.h> 
+#include <gmock/gmock.h>
 
 namespace mir
 {

=== modified file 'include/test/mir_test_doubles/mock_android_registrar.h'
--- include/test/mir_test_doubles/mock_android_registrar.h	2013-06-21 22:14:10 +0000
+++ include/test/mir_test_doubles/mock_android_registrar.h	2013-12-18 14:40:47 +0000
@@ -36,7 +36,7 @@
 struct MockAndroidRegistrar : public client::android::AndroidRegistrar
 {
     ~MockAndroidRegistrar() noexcept {}
-    MOCK_CONST_METHOD1(register_buffer, 
+    MOCK_CONST_METHOD1(register_buffer,
         std::shared_ptr<const native_handle_t>(std::shared_ptr<MirBufferPackage> const&));
     MOCK_METHOD2(secure_for_cpu, std::shared_ptr<char>(std::shared_ptr<const native_handle_t>, geometry::Rectangle));
 };

=== modified file 'include/test/mir_test_doubles/mock_buffer.h'
--- include/test/mir_test_doubles/mock_buffer.h	2013-10-15 08:53:10 +0000
+++ include/test/mir_test_doubles/mock_buffer.h	2013-12-18 14:40:47 +0000
@@ -42,7 +42,7 @@
 
     MockBuffer(geometry::Size size,
                geometry::Stride s,
-               geometry::PixelFormat pf)
+               MirPixelFormat pf)
     {
         using namespace testing;
         ON_CALL(*this, size())
@@ -60,7 +60,7 @@
 
     MOCK_CONST_METHOD0(size, geometry::Size());
     MOCK_CONST_METHOD0(stride, geometry::Stride());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
     MOCK_CONST_METHOD0(native_buffer_handle, std::shared_ptr<graphics::NativeBuffer>());
 
     MOCK_METHOD0(bind_to_texture, void());

=== modified file 'include/test/mir_test_doubles/mock_buffer_bundle.h'
--- include/test/mir_test_doubles/mock_buffer_bundle.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_buffer_bundle.h	2013-12-18 14:40:47 +0000
@@ -37,8 +37,8 @@
     ~MockBufferBundle() noexcept
     {}
 
-    MOCK_METHOD0(client_acquire,     std::shared_ptr<graphics::Buffer>());
-    MOCK_METHOD1(client_release,     void(std::shared_ptr<graphics::Buffer> const&));
+    MOCK_METHOD0(client_acquire,     graphics::Buffer*());
+    MOCK_METHOD1(client_release,     void(graphics::Buffer*));
     MOCK_METHOD1(compositor_acquire, std::shared_ptr<graphics::Buffer>(unsigned long));
     MOCK_METHOD1(compositor_release, void(std::shared_ptr<graphics::Buffer> const&));
     MOCK_METHOD0(snapshot_acquire, std::shared_ptr<graphics::Buffer>());

=== modified file 'include/test/mir_test_doubles/mock_buffer_stream.h'
--- include/test/mir_test_doubles/mock_buffer_stream.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_buffer_stream.h	2013-12-18 14:40:47 +0000
@@ -31,12 +31,12 @@
 {
 struct MockBufferStream : public compositor::BufferStream
 {
-    MOCK_METHOD0(secure_client_buffer, std::shared_ptr<graphics::Buffer>());
+    MOCK_METHOD1(swap_client_buffers, void(graphics::Buffer*&));
     MOCK_METHOD1(lock_compositor_buffer,
                  std::shared_ptr<graphics::Buffer>(unsigned long));
     MOCK_METHOD0(lock_snapshot_buffer, std::shared_ptr<graphics::Buffer>());
 
-    MOCK_METHOD0(get_stream_pixel_format, geometry::PixelFormat());
+    MOCK_METHOD0(get_stream_pixel_format, MirPixelFormat());
     MOCK_METHOD0(stream_size, geometry::Size());
     MOCK_METHOD1(resize, void(geometry::Size const&));
     MOCK_METHOD0(force_client_completion, void());

=== modified file 'include/test/mir_test_doubles/mock_display_device.h'
--- include/test/mir_test_doubles/mock_display_device.h	2013-11-21 17:20:14 +0000
+++ include/test/mir_test_doubles/mock_display_device.h	2013-12-18 14:40:47 +0000
@@ -20,9 +20,9 @@
 #define MIR_TEST_DOUBLES_MOCK_DISPLAY_DEVICE_H_
 
 #include "mir/graphics/buffer.h"
-#include "src/server/graphics/android/display_device.h"
+#include "src/platform/graphics/android/display_device.h"
 #include <gmock/gmock.h>
- 
+
 namespace mir
 {
 namespace test

=== modified file 'include/test/mir_test_doubles/mock_egl.h'
--- include/test/mir_test_doubles/mock_egl.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_egl.h	2013-12-18 14:40:47 +0000
@@ -58,7 +58,6 @@
 public:
     MockEGL();
     ~MockEGL();
-    void silence_uninteresting();
 
     typedef void (*generic_function_pointer_t)(void);
 

=== modified file 'include/test/mir_test_doubles/mock_fb_hal_device.h'
--- include/test/mir_test_doubles/mock_fb_hal_device.h	2013-11-19 22:02:08 +0000
+++ include/test/mir_test_doubles/mock_fb_hal_device.h	2013-12-18 14:40:47 +0000
@@ -52,10 +52,11 @@
             {0,0,0,0,0,0,0},
             nullptr, nullptr,nullptr,nullptr, nullptr,nullptr,
             {0,0,0,0,0,0}
-          }) 
+          })
     {
         post = hook_post;
-        setSwapInterval = hook_setSwapInterval; 
+        setSwapInterval = hook_setSwapInterval;
+        enableScreen = hook_enableScreen;
     }
 
     MockFBHalDevice()
@@ -72,12 +73,20 @@
     static int hook_setSwapInterval(struct framebuffer_device_t* mock_fb, int interval)
     {
         MockFBHalDevice* mocker = static_cast<MockFBHalDevice*>(mock_fb);
-        return mocker->setSwapInterval_interface(mock_fb, interval); 
-    }
-
+        return mocker->setSwapInterval_interface(mock_fb, interval);
+    }
+
+    static int hook_enableScreen(struct framebuffer_device_t* mock_fb, int enable)
+    {
+        MockFBHalDevice* mocker = static_cast<MockFBHalDevice*>(mock_fb);
+        return mocker->enableScreen_interface(mock_fb, enable);
+    }
+
+
+    MOCK_METHOD2(enableScreen_interface, int(struct framebuffer_device_t*, int));
     MOCK_METHOD2(post_interface, int(struct framebuffer_device_t*, buffer_handle_t));
     MOCK_METHOD2(setSwapInterval_interface, int(struct framebuffer_device_t*, int));
-    
+
     hw_device_t empty_module;
 };
 

=== modified file 'include/test/mir_test_doubles/mock_framebuffer_bundle.h'
--- include/test/mir_test_doubles/mock_framebuffer_bundle.h	2013-11-19 22:41:51 +0000
+++ include/test/mir_test_doubles/mock_framebuffer_bundle.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_FRAMEBUFFER_BUNDLE_H_
 #define MIR_TEST_DOUBLES_MOCK_FRAMEBUFFER_BUNDLE_H_
 
-#include "src/server/graphics/android/framebuffer_bundle.h"
+#include "src/platform/graphics/android/framebuffer_bundle.h"
 #include "stub_buffer.h"
 #include <gmock/gmock.h>
 
@@ -38,7 +38,7 @@
         ON_CALL(*this, last_rendered_buffer())
             .WillByDefault(Return(std::make_shared<StubBuffer>()));
     }
-    MOCK_METHOD0(fb_format, geometry::PixelFormat());
+    MOCK_METHOD0(fb_format, MirPixelFormat());
     MOCK_METHOD0(fb_size, geometry::Size());
     MOCK_METHOD0(buffer_for_render, std::shared_ptr<graphics::Buffer>());
     MOCK_METHOD0(last_rendered_buffer, std::shared_ptr<graphics::Buffer>());

=== modified file 'include/test/mir_test_doubles/mock_frontend_surface.h'
--- include/test/mir_test_doubles/mock_frontend_surface.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_frontend_surface.h	2013-12-18 14:40:47 +0000
@@ -39,10 +39,10 @@
 
     MOCK_METHOD0(destroy, void());
     MOCK_METHOD0(force_requests_to_complete, void());
-    MOCK_METHOD0(advance_client_buffer, std::shared_ptr<graphics::Buffer>());
+    MOCK_METHOD1(swap_buffers, void(graphics::Buffer*&));
 
     MOCK_CONST_METHOD0(size, geometry::Size());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
 
     MOCK_CONST_METHOD0(supports_input, bool());
     MOCK_CONST_METHOD0(client_input_fd, int());

=== modified file 'include/test/mir_test_doubles/mock_hwc_composer_device_1.h'
--- include/test/mir_test_doubles/mock_hwc_composer_device_1.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_hwc_composer_device_1.h	2013-12-18 14:40:47 +0000
@@ -66,7 +66,7 @@
 
     void hwc_set_return_fence(int fence)
     {
-        fb_fence = fence; 
+        fb_fence = fence;
     }
 
     int save_last_prepare_arguments(struct hwc_composer_device_1 *, size_t, hwc_display_contents_1_t** displays)
@@ -87,7 +87,7 @@
             set_layerlist.back().visibleRegionScreen = {0, nullptr};
         }
 
-        if (primary_display->hwLayers)
+        if (primary_display->numHwLayers >= 2)
         {
             primary_display->hwLayers[1].releaseFenceFd = fb_fence;
         }

=== modified file 'include/test/mir_test_doubles/mock_hwc_layerlist.h'
--- include/test/mir_test_doubles/mock_hwc_layerlist.h	2013-09-25 15:46:05 +0000
+++ include/test/mir_test_doubles/mock_hwc_layerlist.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_HWC_LAYERLIST_H_
 #define MIR_TEST_DOUBLES_MOCK_HWC_LAYERLIST_H_
 
-#include "src/server/graphics/android/hwc_layerlist.h"
+#include "src/platform/graphics/android/hwc_layerlist.h"
 
 #include <gmock/gmock.h>
 

=== modified file 'include/test/mir_test_doubles/mock_hwc_vsync_coordinator.h'
--- include/test/mir_test_doubles/mock_hwc_vsync_coordinator.h	2013-05-20 15:29:28 +0000
+++ include/test/mir_test_doubles/mock_hwc_vsync_coordinator.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_HWC_VSYNC_COORDINATOR_H_
 #define MIR_TEST_DOUBLES_MOCK_HWC_VSYNC_COORDINATOR_H_
 
-#include "src/server/graphics/android/hwc_vsync_coordinator.h"
+#include "src/platform/graphics/android/hwc_vsync_coordinator.h"
 
 #include <gmock/gmock.h>
 

=== modified file 'include/test/mir_test_doubles/mock_input_dispatcher.h'
--- include/test/mir_test_doubles/mock_input_dispatcher.h	2013-05-24 18:23:48 +0000
+++ include/test/mir_test_doubles/mock_input_dispatcher.h	2013-12-18 14:40:47 +0000
@@ -45,7 +45,7 @@
     MOCK_METHOD2(transferTouchFocus, bool(droidinput::sp<droidinput::InputChannel> const&, droidinput::sp<droidinput::InputChannel> const&));
     MOCK_METHOD3(registerInputChannel, droidinput::status_t(droidinput::sp<droidinput::InputChannel> const&, droidinput::sp<droidinput::InputWindowHandle> const&, bool));
     MOCK_METHOD1(unregisterInputChannel, droidinput::status_t(droidinput::sp<droidinput::InputChannel> const&));
-    
+
     MOCK_METHOD1(setKeyboardFocus, void(droidinput::sp<droidinput::InputWindowHandle> const&));
     MOCK_METHOD1(notifyWindowRemoved, void(droidinput::sp<droidinput::InputWindowHandle> const&));
 

=== modified file 'include/test/mir_test_doubles/mock_input_surface.h'
--- include/test/mir_test_doubles/mock_input_surface.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/mock_input_surface.h	2013-12-18 14:40:47 +0000
@@ -29,7 +29,7 @@
 namespace doubles
 {
 
-class MockInputSurface : public input::Surface 
+class MockInputSurface : public input::Surface
 {
 public:
     MockInputSurface()

=== modified file 'include/test/mir_test_doubles/mock_interpreter_resource_cache.h'
--- include/test/mir_test_doubles/mock_interpreter_resource_cache.h	2013-10-15 08:53:10 +0000
+++ include/test/mir_test_doubles/mock_interpreter_resource_cache.h	2013-12-18 14:40:47 +0000
@@ -18,7 +18,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_INTERPRETER_RESOURCE_CACHE_H_
 #define MIR_TEST_DOUBLES_MOCK_INTERPRETER_RESOURCE_CACHE_H_
 
-#include "src/server/graphics/android/interpreter_resource_cache.h"
+#include "src/platform/graphics/android/interpreter_resource_cache.h"
 
 namespace mir
 {

=== modified file 'include/test/mir_test_doubles/mock_session_listener.h'
--- include/test/mir_test_doubles/mock_session_listener.h	2013-07-18 22:51:42 +0000
+++ include/test/mir_test_doubles/mock_session_listener.h	2013-12-18 14:40:47 +0000
@@ -38,7 +38,7 @@
     MOCK_METHOD1(stopping, void(std::shared_ptr<shell::Session> const&));
     MOCK_METHOD1(focused, void(std::shared_ptr<shell::Session> const&));
     MOCK_METHOD0(unfocused, void());
-    
+
     MOCK_METHOD2(surface_created, void(shell::Session&, std::shared_ptr<shell::Surface> const&));
     MOCK_METHOD2(destroying_surface, void(shell::Session&, std::shared_ptr<shell::Surface> const&));
 };

=== modified file 'include/test/mir_test_doubles/mock_shell_session.h'
--- include/test/mir_test_doubles/mock_shell_session.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_shell_session.h	2013-12-18 14:40:47 +0000
@@ -46,7 +46,7 @@
 
     MOCK_METHOD0(hide, void());
     MOCK_METHOD0(show, void());
-    
+
     MOCK_METHOD1(send_display_config, void(graphics::DisplayConfiguration const&));
     MOCK_METHOD3(configure_surface, int(frontend::SurfaceId, MirSurfaceAttrib, int));
 

=== modified file 'include/test/mir_test_doubles/mock_surface.h'
--- include/test/mir_test_doubles/mock_surface.h	2013-11-21 12:34:49 +0000
+++ include/test/mir_test_doubles/mock_surface.h	2013-12-18 14:40:47 +0000
@@ -38,9 +38,8 @@
 
 struct MockSurface : public scene::SurfaceImpl
 {
-    MockSurface(shell::Session* session, std::shared_ptr<scene::SurfaceBuilder> const& builder) :
-        scene::SurfaceImpl(session, builder, std::make_shared<NullSurfaceConfigurator>(), shell::a_surface(),
-            frontend::SurfaceId{}, std::make_shared<NullEventSink>())
+    MockSurface(std::shared_ptr<scene::SurfaceBuilder> const& builder) :
+        scene::SurfaceImpl(builder, std::make_shared<NullSurfaceConfigurator>(), shell::a_surface(), frontend::SurfaceId{}, std::make_shared<NullEventSink>())
     {
     }
 
@@ -49,14 +48,14 @@
     MOCK_METHOD0(hide, void());
     MOCK_METHOD0(show, void());
     MOCK_METHOD0(visible, bool());
-    MOCK_METHOD1(raise, void(std::shared_ptr<shell::SurfaceController> const&));
+    MOCK_METHOD1(raise, void(std::shared_ptr<scene::SurfaceRanker> const&));
 
     MOCK_METHOD0(force_requests_to_complete, void());
     MOCK_METHOD0(advance_client_buffer, std::shared_ptr<graphics::Buffer>());
 
     MOCK_CONST_METHOD0(name, std::string());
     MOCK_CONST_METHOD0(size, geometry::Size());
-    MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
+    MOCK_CONST_METHOD0(pixel_format, MirPixelFormat());
 
     MOCK_CONST_METHOD0(supports_input, bool());
     MOCK_CONST_METHOD0(client_input_fd, int());

=== renamed file 'include/test/mir_test_doubles/mock_surface_controller.h' => 'include/test/mir_test_doubles/mock_surface_ranker.h'
--- include/test/mir_test_doubles/mock_surface_controller.h	2013-11-21 12:34:49 +0000
+++ include/test/mir_test_doubles/mock_surface_ranker.h	2013-12-18 14:40:47 +0000
@@ -17,10 +17,10 @@
  */
 
 
-#ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_CONTROLLER_H_
-#define MIR_TEST_DOUBLES_MOCK_SURFACE_CONTROLLER_H_
+#ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_RANKER_H_
+#define MIR_TEST_DOUBLES_MOCK_SURFACE_RANKER_H_
 
-#include "mir/shell/surface_controller.h"
+#include "src/server/scene/surface_ranker.h"
 
 #include <gmock/gmock.h>
 
@@ -31,7 +31,7 @@
 namespace doubles
 {
 
-struct MockSurfaceController : public shell::SurfaceController
+struct MockSurfaceRanker : public scene::SurfaceRanker
 {
     MOCK_METHOD1(raise, void(std::weak_ptr<scene::BasicSurface> const&));
 };
@@ -41,4 +41,4 @@
 }
 
 
-#endif /* MIR_TEST_DOUBLES_MOCK_SURFACE_CONTROLLER_H_ */
+#endif /* MIR_TEST_DOUBLES_MOCK_SURFACE_RANKER_H_ */

=== modified file 'include/test/mir_test_doubles/mock_surface_renderer.h'
--- include/test/mir_test_doubles/mock_surface_renderer.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/mock_surface_renderer.h	2013-12-18 14:40:47 +0000
@@ -18,7 +18,6 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_RENDERER_H_
 #define MIR_TEST_DOUBLES_MOCK_SURFACE_RENDERER_H_
 
-#include "mir/compositor/buffer_stream.h"
 #include "src/server/compositor/renderer.h"
 
 #include <gmock/gmock.h>
@@ -32,9 +31,8 @@
 
 struct MockSurfaceRenderer : public compositor::Renderer
 {
-    MOCK_METHOD3(render, void(
-        std::function<void(std::shared_ptr<void> const&)>, compositor::CompositingCriteria const&, compositor::BufferStream&));
-    MOCK_METHOD1(clear, void(unsigned long));
+    MOCK_CONST_METHOD2(render, void(compositor::CompositingCriteria const&, graphics::Buffer&));
+    MOCK_CONST_METHOD0(clear, void());
 
     ~MockSurfaceRenderer() noexcept {}
 };

=== removed file 'include/test/mir_test_doubles/mock_surface_state.h'
--- include/test/mir_test_doubles/mock_surface_state.h	2013-11-21 12:34:49 +0000
+++ include/test/mir_test_doubles/mock_surface_state.h	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright © 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_TEST_DOUBLES_MOCK_SURFACE_STATE_H_
-#define MIR_TEST_DOUBLES_MOCK_SURFACE_STATE_H_
-
-#include "src/server/scene/surface_state.h"
-#include <gmock/gmock.h>
-
-namespace mir
-{
-namespace test
-{
-namespace doubles
-{
-
-class MockSurfaceState : public scene::SurfaceState
-{
-public:
-    MockSurfaceState()
-    {
-        using namespace testing;
-        ON_CALL(*this, position())
-            .WillByDefault(
-                Return(geometry::Point{}));
-        ON_CALL(*this, size())
-            .WillByDefault(
-                Return(geometry::Size{}));
-        static std::string n;
-        ON_CALL(*this, name())
-            .WillByDefault(testing::ReturnRef(n));
-    }
-
-    ~MockSurfaceState() noexcept {}
-    MOCK_CONST_METHOD0(position, geometry::Point());
-    MOCK_CONST_METHOD0(size, geometry::Size());
-    MOCK_CONST_METHOD0(name, std::string const&());
-    MOCK_METHOD2(apply_rotation, void(float, glm::vec3 const&));
-    MOCK_METHOD1(move_to, void(geometry::Point));
-    MOCK_METHOD1(resize, void(geometry::Size const&));
-    MOCK_CONST_METHOD1(contains, bool(geometry::Point const&));
-    MOCK_METHOD1(set_input_region, void(std::vector<geometry::Rectangle> const&));
-    MOCK_CONST_METHOD0(alpha, float());
-    MOCK_METHOD1(apply_alpha, void(float));
-    MOCK_CONST_METHOD0(transformation, glm::mat4 const&());
-    MOCK_METHOD0(frame_posted, void());
-    MOCK_METHOD1(set_hidden, void(bool));
-    MOCK_CONST_METHOD1(should_be_rendered_in, bool(geometry::Rectangle const&));
-    MOCK_CONST_METHOD0(shaped, bool());
-};
-
-typedef ::testing::NiceMock<MockSurfaceState> StubSurfaceState;
-}
-}
-}
-#endif /* MIR_TEST_DOUBLES_MOCK_SURFACE_STATE_H_ */

=== modified file 'include/test/mir_test_doubles/null_video_devices.h'
--- include/test/mir_test_doubles/null_video_devices.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/null_video_devices.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_NULL_VIDEO_DEVICES_H_
 #define MIR_TEST_DOUBLES_NULL_VIDEO_DEVICES_H_
 
-#include "src/server/graphics/gbm/video_devices.h"
+#include "src/platform/graphics/mesa/video_devices.h"
 
 namespace mir
 {
@@ -28,7 +28,7 @@
 namespace doubles
 {
 
-class NullVideoDevices : public graphics::gbm::VideoDevices
+class NullVideoDevices : public graphics::mesa::VideoDevices
 {
 public:
     void register_change_handler(

=== modified file 'include/test/mir_test_doubles/null_virtual_terminal.h'
--- include/test/mir_test_doubles/null_virtual_terminal.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/null_virtual_terminal.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_NULL_VIRTUAL_TERMINAL_H_
 #define MIR_TEST_DOUBLES_NULL_VIRTUAL_TERMINAL_H_
 
-#include "src/server/graphics/gbm/virtual_terminal.h"
+#include "src/platform/graphics/mesa/virtual_terminal.h"
 
 namespace mir
 {
@@ -28,7 +28,7 @@
 namespace doubles
 {
 
-class NullVirtualTerminal : public graphics::gbm::VirtualTerminal
+class NullVirtualTerminal : public graphics::mesa::VirtualTerminal
 {
 public:
     void set_graphics_mode() {}

=== modified file 'include/test/mir_test_doubles/stub_buffer.h'
--- include/test/mir_test_doubles/stub_buffer.h	2013-10-15 08:53:10 +0000
+++ include/test/mir_test_doubles/stub_buffer.h	2013-12-18 14:40:47 +0000
@@ -40,7 +40,7 @@
 public:
     StubBuffer()
         : buf_size{0, 0},
-          buf_pixel_format{geometry::PixelFormat::abgr_8888}
+          buf_pixel_format{mir_pixel_format_abgr_8888}
     {
     }
 
@@ -54,7 +54,7 @@
 
     virtual geometry::Stride stride() const { return geometry::Stride(); }
 
-    virtual geometry::PixelFormat pixel_format() const { return buf_pixel_format; }
+    virtual MirPixelFormat pixel_format() const { return buf_pixel_format; }
 
     virtual std::shared_ptr<graphics::NativeBuffer> native_buffer_handle() const
     {
@@ -69,7 +69,7 @@
     virtual bool can_bypass() const override { return false; }
 
     geometry::Size const buf_size;
-    geometry::PixelFormat const buf_pixel_format;
+    MirPixelFormat const buf_pixel_format;
 };
 }
 }

=== modified file 'include/test/mir_test_doubles/stub_buffer_allocator.h'
--- include/test/mir_test_doubles/stub_buffer_allocator.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/stub_buffer_allocator.h	2013-12-18 14:40:47 +0000
@@ -43,7 +43,7 @@
         return std::make_shared<StubBuffer>(properties);
     }
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats()
+    std::vector<MirPixelFormat> supported_pixel_formats()
     {
         return {};
     }

=== modified file 'include/test/mir_test_doubles/stub_buffer_stream.h'
--- include/test/mir_test_doubles/stub_buffer_stream.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/stub_buffer_stream.h	2013-12-18 14:40:47 +0000
@@ -34,30 +34,28 @@
 public:
     StubBufferStream()
     {
-        stub_client_buffer = std::make_shared<StubBuffer>();
         stub_compositor_buffer = std::make_shared<StubBuffer>();
     }
-    std::shared_ptr<graphics::Buffer> secure_client_buffer()
-    {
-        return stub_client_buffer;
-    }
-
-    std::shared_ptr<graphics::Buffer> lock_compositor_buffer(unsigned long)
-    {
-        return stub_compositor_buffer;
-    }
-
-    std::shared_ptr<graphics::Buffer> lock_snapshot_buffer()
-    {
-        return stub_compositor_buffer;
-    }
-
-    geometry::PixelFormat get_stream_pixel_format()
-    {
-        return geometry::PixelFormat();
-    }
-
-    geometry::Size stream_size()
+    void swap_client_buffers(graphics::Buffer*& buffer) override
+    {
+        buffer = &stub_client_buffer;
+    }
+    std::shared_ptr<graphics::Buffer> lock_compositor_buffer(unsigned long) override
+    {
+        return stub_compositor_buffer;
+    }
+
+    std::shared_ptr<graphics::Buffer> lock_snapshot_buffer() override
+    {
+        return stub_compositor_buffer;
+    }
+
+    MirPixelFormat get_stream_pixel_format() override
+    {
+        return MirPixelFormat();
+    }
+
+    geometry::Size stream_size() override
     {
         return geometry::Size();
     }
@@ -66,15 +64,15 @@
     {
     }
 
-    void force_requests_to_complete()
-    {
-    }
-
-    void allow_framedropping(bool)
-    {
-    }
-
-    std::shared_ptr<graphics::Buffer> stub_client_buffer;
+    void force_requests_to_complete() override
+    {
+    }
+
+    void allow_framedropping(bool) override
+    {
+    }
+
+    StubBuffer stub_client_buffer;
     std::shared_ptr<graphics::Buffer> stub_compositor_buffer;
 };
 

=== modified file 'include/test/mir_test_doubles/stub_display_builder.h'
--- include/test/mir_test_doubles/stub_display_builder.h	2013-11-19 19:11:49 +0000
+++ include/test/mir_test_doubles/stub_display_builder.h	2013-12-18 14:40:47 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_STUB_DISPLAY_BUILDER_H_
 #define MIR_TEST_DOUBLES_STUB_DISPLAY_BUILDER_H_
 
-#include "src/server/graphics/android/display_builder.h"
+#include "src/platform/graphics/android/display_builder.h"
 #include "stub_display_buffer.h"
 #include "stub_display_device.h"
 #include <gmock/gmock.h>
@@ -52,9 +52,9 @@
     {
     }
 
-    geometry::PixelFormat display_format()
+    MirPixelFormat display_format()
     {
-        return geometry::PixelFormat::abgr_8888;
+        return mir_pixel_format_abgr_8888;
     }
 
     std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(
@@ -64,7 +64,7 @@
         return std::unique_ptr<graphics::DisplayBuffer>(
                 new StubDisplayBuffer(geometry::Rectangle{{0,0},sz}));
     }
-    
+
     std::shared_ptr<graphics::android::DisplayDevice> create_display_device()
     {
         return stub_dev;

=== modified file 'include/test/mir_test_doubles/stub_display_configuration.h'
--- include/test/mir_test_doubles/stub_display_configuration.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/stub_display_configuration.h	2013-12-18 14:40:47 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/display_configuration.h"
 #include "mir/geometry/rectangle.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 
 #include <vector>
 
@@ -43,15 +43,15 @@
     StubDisplayConfig(unsigned int num_displays)
         : StubDisplayConfig(num_displays,
                             {
-                                geometry::PixelFormat::bgr_888,
-                                geometry::PixelFormat::abgr_8888,
-                                geometry::PixelFormat::xbgr_8888
+                                mir_pixel_format_bgr_888,
+                                mir_pixel_format_abgr_8888,
+                                mir_pixel_format_xbgr_8888
                             })
     {
     }
 
     StubDisplayConfig(unsigned int num_displays,
-                      std::vector<geometry::PixelFormat> const& pfs)
+                      std::vector<MirPixelFormat> const& pfs)
     {
         /* construct a non-trivial dummy display config to send */
         int mode_index = 0;
@@ -67,7 +67,7 @@
                 modes.push_back(mode);
             }
 
-            size_t mode_index = modes.size() - 1; 
+            size_t mode_index = modes.size() - 1;
             geometry::Size physical_size{};
             geometry::Point top_left{};
             graphics::DisplayConfigurationOutput output{
@@ -105,7 +105,7 @@
                 graphics::DisplayConfigurationOutputId{id},
                 graphics::DisplayConfigurationCardId{0},
                 graphics::DisplayConfigurationOutputType::vga,
-                std::vector<geometry::PixelFormat>{geometry::PixelFormat::abgr_8888},
+                std::vector<MirPixelFormat>{mir_pixel_format_abgr_8888},
                 {{rect.size, 60.0}},
                 0, geometry::Size{}, true, true, rect.top_left, 0, 0, mir_power_mode_on
             };

=== modified file 'include/test/mir_test_doubles/stub_display_device.h'
--- include/test/mir_test_doubles/stub_display_device.h	2013-11-21 17:20:14 +0000
+++ include/test/mir_test_doubles/stub_display_device.h	2013-12-18 14:40:47 +0000
@@ -18,8 +18,8 @@
 #ifndef MIR_TEST_DOUBLES_STUB_DISPLAY_DEVICE_H_
 #define MIR_TEST_DOUBLES_STUB_DISPLAY_DEVICE_H_
 
-#include "src/server/graphics/android/display_device.h"
- 
+#include "src/platform/graphics/android/display_device.h"
+
 namespace mir
 {
 namespace test
@@ -41,7 +41,7 @@
     void prepare_composition()
     {
     }
-    void gpu_render(EGLDisplay, EGLSurface) 
+    void gpu_render(EGLDisplay, EGLSurface)
     {
     }
     void post(graphics::Buffer const&)

=== modified file 'include/test/mir_test_doubles/stub_driver_interpreter.h'
--- include/test/mir_test_doubles/stub_driver_interpreter.h	2013-10-17 22:15:46 +0000
+++ include/test/mir_test_doubles/stub_driver_interpreter.h	2013-12-18 14:40:47 +0000
@@ -49,7 +49,7 @@
     void driver_returns_buffer(ANativeWindowBuffer*, int)
     {
     }
-    void dispatch_driver_request_format(int) 
+    void dispatch_driver_request_format(int)
     {
     }
     int driver_requests_info(int index) const

=== modified file 'include/test/mir_test_doubles/stub_shell_session.h'
--- include/test/mir_test_doubles/stub_shell_session.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/stub_shell_session.h	2013-12-18 14:40:47 +0000
@@ -66,7 +66,7 @@
     void take_snapshot(shell::SnapshotCallback const&) override
     {
     }
-    
+
     std::shared_ptr<shell::Surface> default_surface() const override
     {
         return std::shared_ptr<shell::Surface>();

=== removed file 'include/test/mir_test_doubles/stub_surface.h'
--- include/test/mir_test_doubles/stub_surface.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_doubles/stub_surface.h	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright © 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: Robert Carr <[e-mail]>
- */
-
-#ifndef MIR_TEST_DOUBLES_STUB_SURFACE_H_
-#define MIR_TEST_DOUBLES_STUB_SURFACE_H_
-
-#include "mir/frontend/surface.h"
-
-namespace mir
-{
-namespace test
-{
-namespace doubles
-{
-
-class StubSurface : public frontend::Surface
-{
-public:
-    virtual ~StubSurface() = default;
-
-    void hide() {}
-    void show() {}
-    void force_requests_to_complete() {}
-
-    geometry::Size size() const
-    {
-        return geometry::Size();
-    }
-    geometry::PixelFormat pixel_format() const
-    {
-        return geometry::PixelFormat();
-    }
-
-    std::shared_ptr<graphics::Buffer> advance_client_buffer()
-    {
-        return std::shared_ptr<graphics::Buffer>();
-    }
-
-    virtual int configure(MirSurfaceAttrib, int)
-    {
-        return 0;
-    }
-
-    virtual bool supports_input() const
-    {
-        return false;
-    }
-
-    virtual int client_input_fd() const
-    {
-        return 0;
-    }
-};
-
-}
-}
-} // namespace mir
-
-#endif // MIR_TEST_DOUBLES_STUB_SURFACE_H_

=== modified file 'include/test/mir_test_doubles/stub_surface_builder.h'
--- include/test/mir_test_doubles/stub_surface_builder.h	2013-11-21 12:34:49 +0000
+++ include/test/mir_test_doubles/stub_surface_builder.h	2013-12-18 14:40:47 +0000
@@ -21,13 +21,13 @@
 #define MIR_TEST_DOUBLES_STUB_SURFACE_BUILDER_H_
 
 #include "src/server/scene/surface_builder.h"
-#include "src/server/scene/surface.h"
+#include "src/server/scene/basic_surface.h"
+#include "src/server/scene/surface_data.h"
 #include "mir/scene/scene_report.h"
 #include "mir/shell/surface_creation_parameters.h"
 
 #include "mir_test_doubles/stub_buffer_stream.h"
-#include "mir_test_doubles/mock_surface_state.h"
-
+#include <memory>
 namespace mir
 {
 namespace test
@@ -39,30 +39,26 @@
 {
 public:
     StubSurfaceBuilder() :
-        buffer_stream(std::make_shared<StubBufferStream>()),
-        dummy_surface()
-    {
-    }
-
-    std::weak_ptr<scene::BasicSurface> create_surface(shell::Session*, shell::SurfaceCreationParameters const&)
-    {
-        auto state = std::make_shared<MockSurfaceState>();
-        dummy_surface = std::make_shared<scene::Surface>(
-            state, buffer_stream,
+        dummy_surface(std::make_shared<scene::BasicSurface>(
+            std::make_shared<scene::SurfaceData>( 
+                std::string("stub"), geometry::Rectangle{{},{}}, [](){}, false),
+            std::make_shared<StubBufferStream>(),
             std::shared_ptr<input::InputChannel>(),
-            report);
+            std::make_shared<scene::NullSceneReport>()))
+    {
+    }
 
+    std::weak_ptr<scene::BasicSurface> create_surface(shell::SurfaceCreationParameters const&)
+    {
         return dummy_surface;
     }
 
     void destroy_surface(std::weak_ptr<scene::BasicSurface> const& )
     {
     }
+
 private:
-    std::shared_ptr<compositor::BufferStream> const buffer_stream;
-    std::shared_ptr<scene::BasicSurface>  dummy_surface;
-    std::shared_ptr<scene::SceneReport> report = std::make_shared<scene::NullSceneReport>();
-
+    std::shared_ptr<scene::BasicSurface> dummy_surface;
 };
 }
 }

=== renamed file 'include/test/mir_test_doubles/stub_surface_controller.h' => 'include/test/mir_test_doubles/stub_surface_ranker.h'
--- include/test/mir_test_doubles/stub_surface_controller.h	2013-11-21 12:34:49 +0000
+++ include/test/mir_test_doubles/stub_surface_ranker.h	2013-12-18 14:40:47 +0000
@@ -17,10 +17,10 @@
  */
 
 
-#ifndef MIR_TEST_DOUBLES_STUB_SURFACE_CONTROLLER_H_
-#define MIR_TEST_DOUBLES_STUB_SURFACE_CONTROLLER_H_
+#ifndef MIR_TEST_DOUBLES_STUB_SURFACE_RANKER_H_
+#define MIR_TEST_DOUBLES_STUB_SURFACE_RANKER_H_
 
-#include "mir/shell/surface_controller.h"
+#include "src/server/scene/surface_ranker.h"
 
 namespace mir
 {
@@ -29,7 +29,7 @@
 namespace doubles
 {
 
-struct StubSurfaceController : public shell::SurfaceController
+struct StubSurfaceRanker : public scene::SurfaceRanker
 {
     void raise(std::weak_ptr<scene::BasicSurface> const&) override
     {
@@ -41,4 +41,4 @@
 }
 
 
-#endif /* MIR_TEST_DOUBLES_STUB_SURFACE_CONTROLLER_H_ */
+#endif /* MIR_TEST_DOUBLES_STUB_SURFACE_RANKER_H_ */

=== modified file 'include/test/mir_test_framework/cross_process_sync.h'
--- include/test/mir_test_framework/cross_process_sync.h	2013-09-20 22:16:11 +0000
+++ include/test/mir_test_framework/cross_process_sync.h	2013-12-18 14:40:47 +0000
@@ -45,7 +45,7 @@
     // Throws std::runtime_error if not successful.
     unsigned int wait_for_signal_ready_for(const std::chrono::milliseconds& duration);
     unsigned int wait_for_signal_ready_for();
-  
+
     void signal_ready();
     unsigned int wait_for_signal_ready();
 

=== modified file 'include/test/mir_test_framework/display_server_test_fixture.h'
--- include/test/mir_test_framework/display_server_test_fixture.h	2013-09-26 15:07:59 +0000
+++ include/test/mir_test_framework/display_server_test_fixture.h	2013-12-18 14:40:47 +0000
@@ -64,6 +64,7 @@
     void launch_client_process(TestingClientConfiguration& config);
 
     bool shutdown_server_process();
+    Result  wait_for_shutdown_server_process();
     void kill_client_processes();
     void terminate_client_processes();
 

=== added file 'include/test/mir_test_framework/input_testing_client_configuration.h'
--- include/test/mir_test_framework/input_testing_client_configuration.h	1970-01-01 00:00:00 +0000
+++ include/test/mir_test_framework/input_testing_client_configuration.h	2013-12-18 14:40:47 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright © 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: Robert Carr <[e-mail]>n
+ */
+
+#ifndef MIR_TEST_FRAMEWORK_INPUT_TESTING_CLIENT_CONFIGURATION
+#define MIR_TEST_FRAMEWORK_INPUT_TESTING_CLIENT_CONFIGURATION
+
+#include "mir_test_framework/testing_client_configuration.h"
+#include "mir_test_framework/cross_process_sync.h"
+#include "mir_test/wait_condition.h"
+
+#include <mir_toolkit/event.h>
+
+#include <gmock/gmock.h>
+
+#include <string>
+
+namespace mir_test_framework
+{
+
+/// A fixture to be used with InputTestingServerConfiguration for input acceptance testing scenarios.
+/// By default, the client will connect and a surface will be created.
+/// The framework ensures the server will not send events before client is ready through CrossProcessSync.
+class InputTestingClientConfiguration : public TestingClientConfiguration
+{
+public:
+    InputTestingClientConfiguration(std::string const& client_name, CrossProcessSync const& input_cb_setup_fence);
+    virtual ~InputTestingClientConfiguration() = default;
+
+    void exec();
+
+    struct MockInputHandler
+    {
+        MOCK_METHOD1(handle_input, void(MirEvent const*));
+    };
+    // This function will be called at an appropriate time for input expectations to be set.
+    // on handler. It is expected that mt::WakeUp(all_events_received) will be triggered by
+    // the last expectation, as this is what triggers the verification of the Mock and 
+    // termination of the testing client.
+    virtual void expect_input(MockInputHandler &handler, mir::test::WaitCondition& all_events_received) = 0;
+
+    // This fixture is intended to be used with InputTestingServer
+    // which allows for setting surface sizes as part of the
+    // input-testing shell.
+    static int const surface_width = 100;
+    static int const surface_height = 100;
+private:
+    std::string const client_name;
+    CrossProcessSync input_cb_setup_fence;
+};
+
+}
+#endif /* MIR_TEST_FRAMEWORK_INPUT_TESTING_CLIENT_CONFIGURATION */

=== modified file 'include/test/mir_test_framework/input_testing_server_configuration.h'
--- include/test/mir_test_framework/input_testing_server_configuration.h	2013-11-21 03:16:21 +0000
+++ include/test/mir_test_framework/input_testing_server_configuration.h	2013-12-18 14:40:47 +0000
@@ -59,7 +59,7 @@
 
     void exec();
     void on_exit();
-    
+
     std::shared_ptr<mir::input::InputConfiguration> the_input_configuration() override;
 
     mir::input::android::FakeEventHub* fake_event_hub;
@@ -71,7 +71,7 @@
 
 private:
     std::thread input_injection_thread;
-    
+
     std::shared_ptr<mir::test::doubles::FakeEventHubInputConfiguration> input_configuration;
 };
 

=== modified file 'include/test/mir_test_framework/testing_client_configuration.h'
--- include/test/mir_test_framework/testing_client_configuration.h	2013-09-25 18:25:11 +0000
+++ include/test/mir_test_framework/testing_client_configuration.h	2013-12-18 14:40:47 +0000
@@ -36,7 +36,7 @@
     virtual bool use_real_graphics(mir::options::Option const& options)
     {
         return options.get("tests-use-real-graphics", false);
-    } 
+    }
 };
 
 }

=== modified file 'include/test/mir_test_framework/testing_process_manager.h'
--- include/test/mir_test_framework/testing_process_manager.h	2013-09-25 18:25:11 +0000
+++ include/test/mir_test_framework/testing_process_manager.h	2013-12-18 14:40:47 +0000
@@ -58,6 +58,7 @@
     void tear_down_server();
     void tear_down_all();
     Result shutdown_server_process();
+    Result wait_for_shutdown_server_process();
     void kill_client_processes();
     void terminate_client_processes();
     void run_in_test_process(std::function<void()> const& run_code);

=== modified file 'include/test/mir_test_framework/testing_server_configuration.h'
--- include/test/mir_test_framework/testing_server_configuration.h	2013-09-24 10:25:41 +0000
+++ include/test/mir_test_framework/testing_server_configuration.h	2013-12-18 14:40:47 +0000
@@ -21,6 +21,7 @@
 #define MIR_TEST_TESTING_SERVER_CONFIGURATION_H_
 
 #include "mir/default_server_configuration.h"
+#include "mir_test_framework/cross_process_sync.h"
 
 namespace mir
 {
@@ -39,6 +40,9 @@
     // Code to run in server process
     virtual void exec();
 
+    // Code to run in server process after server starts
+    virtual void on_start();
+
     // Code to run in server process after server exits
     virtual void on_exit();
 
@@ -50,12 +54,17 @@
     // which do not leverage input.
     std::shared_ptr<input::InputConfiguration> the_input_configuration();
 
+    std::shared_ptr<mir::ServerStatusListener> the_server_status_listener() override;
+
     virtual std::string the_socket_file() const;
     using DefaultServerConfiguration::the_options;
 
+    virtual void wait_for_server_start();
 
 private:
     std::shared_ptr<graphics::Platform> graphics_platform;
+    CrossProcessSync server_started_sync;
+    bool using_server_started_sync;
 };
 
 std::string const& test_socket_file();

=== modified file 'native-compile.sh'
--- native-compile.sh	2012-11-19 19:21:52 +0000
+++ native-compile.sh	2013-12-18 14:40:47 +0000
@@ -12,6 +12,6 @@
 cmake --build ${BUILD_DIR}
 
 GTEST_OUTPUT=xml:./
-${BUILD_DIR}/bin/acceptance-tests
-${BUILD_DIR}/bin/integration-tests
-${BUILD_DIR}/bin/unit-tests
+${BUILD_DIR}/bin/mir_acceptance_tests
+${BUILD_DIR}/bin/mir_integration_tests
+${BUILD_DIR}/bin/mir_unit_tests

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-11-21 03:16:21 +0000
+++ src/client/CMakeLists.txt	2013-12-18 14:40:47 +0000
@@ -50,15 +50,15 @@
 )
 endif()
 
-if( MIR_PLATFORM STREQUAL "gbm")
+if( MIR_PLATFORM STREQUAL "mesa")
 set(
   CLIENT_SOURCES
 
-  gbm/gbm_client_platform.cpp
-  gbm/gbm_client_buffer_factory.cpp
-  gbm/gbm_client_buffer.cpp
-  gbm/mesa_native_display_container.cpp
-  gbm/gbm_native_surface.cpp
+  mesa/client_platform.cpp
+  mesa/client_buffer_factory.cpp
+  mesa/client_buffer.cpp
+  mesa/mesa_native_display_container.cpp
+  mesa/native_surface.cpp
   ${CLIENT_SOURCES}
 )
 endif()
@@ -92,6 +92,7 @@
   mirprotobuf
   mirsharedinput
   mirsharedlogging
+  mirsharedenv
   mirclientrpc
   mirclientlttngstatic
 

=== modified file 'src/client/aging_buffer.h'
--- src/client/aging_buffer.h	2013-06-14 09:00:20 +0000
+++ src/client/aging_buffer.h	2013-12-18 14:40:47 +0000
@@ -30,7 +30,6 @@
 {
 public:
     AgingBuffer();
-    ~AgingBuffer() noexcept {}
 
     virtual uint32_t age() const;
     virtual void increment_age();

=== modified file 'src/client/android/android_client_buffer.cpp'
--- src/client/android/android_client_buffer.cpp	2013-11-21 03:16:21 +0000
+++ src/client/android/android_client_buffer.cpp	2013-12-18 14:40:47 +0000
@@ -29,7 +29,7 @@
 
 mcla::AndroidClientBuffer::AndroidClientBuffer(std::shared_ptr<AndroidRegistrar> const& registrar,
                                                std::shared_ptr<const native_handle_t> const& handle,
-                                               geom::Size size, geom::PixelFormat pf, geometry::Stride stride)
+                                               geom::Size size, MirPixelFormat pf, geometry::Stride stride)
  : buffer_registrar(registrar),
    native_handle(handle),
    buffer_pf(pf), buffer_stride{stride}, buffer_size(size)
@@ -48,7 +48,7 @@
     //note: mir uses stride in bytes, ANativeWindowBuffer needs it in pixel units. some drivers care
     //about byte-stride, they will pass stride via ANativeWindowBuffer::handle (which is opaque to us)
     anwb->stride = stride.as_uint32_t() /
-                                   geom::bytes_per_pixel(buffer_pf);
+                                   MIR_BYTES_PER_PIXEL(buffer_pf);
     anwb->usage = GRALLOC_USAGE_HW_TEXTURE | GRALLOC_USAGE_HW_RENDER;
     anwb->handle = native_handle.get();
 
@@ -82,7 +82,7 @@
     return buffer_stride;
 }
 
-geom::PixelFormat mcla::AndroidClientBuffer::pixel_format() const
+MirPixelFormat mcla::AndroidClientBuffer::pixel_format() const
 {
     return buffer_pf;
 }

=== modified file 'src/client/android/android_client_buffer.h'
--- src/client/android/android_client_buffer.h	2013-11-21 03:16:21 +0000
+++ src/client/android/android_client_buffer.h	2013-12-18 14:40:47 +0000
@@ -39,13 +39,13 @@
 public:
     AndroidClientBuffer(std::shared_ptr<AndroidRegistrar> const&,
                         std::shared_ptr<const native_handle_t> const&,
-                        geometry::Size size, geometry::PixelFormat pf, geometry::Stride stride);
+                        geometry::Size size, MirPixelFormat pf, geometry::Stride stride);
     ~AndroidClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     std::shared_ptr<mir::graphics::NativeBuffer> native_buffer_handle() const;
 
     AndroidClientBuffer(const AndroidClientBuffer&) = delete;
@@ -56,7 +56,7 @@
     std::shared_ptr<AndroidRegistrar> buffer_registrar;
     std::shared_ptr<graphics::android::AndroidNativeBuffer> native_window_buffer;
     std::shared_ptr<const native_handle_t> native_handle;
-    const geometry::PixelFormat buffer_pf;
+    const MirPixelFormat buffer_pf;
     geometry::Stride const buffer_stride;
     geometry::Size const buffer_size;
 };

=== modified file 'src/client/android/android_client_buffer_factory.cpp'
--- src/client/android/android_client_buffer_factory.cpp	2013-11-21 03:16:21 +0000
+++ src/client/android/android_client_buffer_factory.cpp	2013-12-18 14:40:47 +0000
@@ -29,7 +29,7 @@
 {
 }
 
-std::shared_ptr<mcl::ClientBuffer> mcla::AndroidClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geom::Size size, geom::PixelFormat pf)
+std::shared_ptr<mcl::ClientBuffer> mcla::AndroidClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geom::Size size, MirPixelFormat pf)
 {
     (void)size; // TODO: remove this unused parameter
     auto handle = registrar->register_buffer(package);

=== modified file 'src/client/android/android_client_buffer_factory.h'
--- src/client/android/android_client_buffer_factory.h	2013-04-24 05:22:20 +0000
+++ src/client/android/android_client_buffer_factory.h	2013-12-18 14:40:47 +0000
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include "mir_toolkit/mir_client_library.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 #include "../client_buffer_factory.h"
@@ -44,7 +44,7 @@
     explicit AndroidClientBufferFactory(std::shared_ptr<AndroidRegistrar> const&);
 
     virtual std::shared_ptr<ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
-                                                        geometry::Size size, geometry::PixelFormat pf);
+                                                        geometry::Size size, MirPixelFormat pf);
 private:
     std::shared_ptr<AndroidRegistrar> registrar;
 };

=== modified file 'src/client/android/android_client_platform.cpp'
--- src/client/android/android_client_platform.cpp	2013-10-15 08:53:10 +0000
+++ src/client/android/android_client_platform.cpp	2013-12-18 14:40:47 +0000
@@ -105,9 +105,9 @@
 
 MirPlatformType mcla::AndroidClientPlatform::platform_type() const
 {
-    return mir_platform_type_android; 
+    return mir_platform_type_android;
 }
- 
+
 MirNativeBuffer* mcla::AndroidClientPlatform::convert_native_buffer(graphics::NativeBuffer* buf) const
 {
     return buf->anwb();

=== modified file 'src/client/android/android_client_platform.h'
--- src/client/android/android_client_platform.h	2013-10-15 08:53:10 +0000
+++ src/client/android/android_client_platform.h	2013-12-18 14:40:47 +0000
@@ -32,7 +32,7 @@
 class AndroidClientPlatform : public ClientPlatform
 {
 public:
-    MirPlatformType platform_type() const; 
+    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/android_registrar.cpp'
--- src/client/android/android_registrar.cpp	2013-08-28 03:41:48 +0000
+++ src/client/android/android_registrar.cpp	2013-12-18 14:40:47 +0000
@@ -75,7 +75,7 @@
     std::shared_ptr<MirBufferPackage> const& package) const
 {
     int native_handle_header_size = sizeof(native_handle_t);
-    int total_size = sizeof(int) * 
+    int total_size = sizeof(int) *
                      (package->fd_items + package->data_items + native_handle_header_size);
     native_handle_t* handle = static_cast<native_handle_t*>(::operator new(total_size));
     handle->version = native_handle_header_size;

=== modified file 'src/client/android/android_registrar_gralloc.h'
--- src/client/android/android_registrar_gralloc.h	2013-06-21 23:24:37 +0000
+++ src/client/android/android_registrar_gralloc.h	2013-12-18 14:40:47 +0000
@@ -20,7 +20,7 @@
 #ifndef MIR_CLIENT_ANDROID_ANDROID_REGISTRAR_GRALLOC_H_
 #define MIR_CLIENT_ANDROID_ANDROID_REGISTRAR_GRALLOC_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "android_registrar.h"
 #include <hardware/gralloc.h>
 

=== modified file 'src/client/android/client_surface_interpreter.cpp'
--- src/client/android/client_surface_interpreter.cpp	2013-11-21 03:16:21 +0000
+++ src/client/android/client_surface_interpreter.cpp	2013-12-18 14:40:47 +0000
@@ -29,7 +29,7 @@
  :  surface(surface),
     driver_pixel_format(-1),
     sync_ops(std::make_shared<mga::RealSyncFileOps>())
-    
+
 {
 }
 

=== modified file 'src/client/android/client_surface_interpreter.h'
--- src/client/android/client_surface_interpreter.h	2013-10-15 08:53:10 +0000
+++ src/client/android/client_surface_interpreter.h	2013-12-18 14:40:47 +0000
@@ -30,7 +30,7 @@
 {
 class SyncFileOps;
 }
-} 
+}
 namespace client
 {
 namespace android

=== modified file 'src/client/client_buffer.h'
--- src/client/client_buffer.h	2013-10-15 08:53:10 +0000
+++ src/client/client_buffer.h	2013-12-18 14:40:47 +0000
@@ -22,7 +22,6 @@
 
 #include "mir/graphics/native_buffer.h"
 #include "mir_toolkit/common.h"
-#include "mir/geometry/pixel_format.h"
 #include "mir/geometry/size.h"
 
 #include <memory>
@@ -46,7 +45,7 @@
     geometry::Width width;
     geometry::Height height;
     geometry::Stride stride;
-    geometry::PixelFormat format;
+    MirPixelFormat format;
     std::shared_ptr<char> vaddr;
 };
 
@@ -54,14 +53,20 @@
 {
 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;
-    virtual geometry::PixelFormat pixel_format() const = 0;
+    virtual MirPixelFormat pixel_format() const = 0;
     virtual uint32_t age() const = 0;
     virtual void increment_age() = 0;
     virtual void mark_as_submitted() = 0;
     virtual std::shared_ptr<graphics::NativeBuffer> native_buffer_handle() const = 0;
+
+protected:
+    ClientBuffer() = default;
+    ClientBuffer(ClientBuffer const&) = delete;
+    ClientBuffer& operator=(ClientBuffer const&) = delete;
 };
 
 }

=== modified file 'src/client/client_buffer_depository.cpp'
--- src/client/client_buffer_depository.cpp	2013-08-28 03:41:48 +0000
+++ src/client/client_buffer_depository.cpp	2013-12-18 14:40:47 +0000
@@ -33,7 +33,7 @@
 {
 }
 
-void mcl::ClientBufferDepository::deposit_package(std::shared_ptr<MirBufferPackage> const& package, int id, geometry::Size size, geometry::PixelFormat pf)
+void mcl::ClientBufferDepository::deposit_package(std::shared_ptr<MirBufferPackage> const& package, int id, geometry::Size size, MirPixelFormat pf)
 {
     auto existing_buffer_id_pair = buffers.end();
     for (auto pair = buffers.begin(); pair != buffers.end(); ++pair)

=== modified file 'src/client/client_buffer_depository.h'
--- src/client/client_buffer_depository.h	2013-08-28 03:41:48 +0000
+++ src/client/client_buffer_depository.h	2013-12-18 14:40:47 +0000
@@ -23,7 +23,7 @@
 #include <list>
 #include <memory>
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 namespace mir
@@ -59,7 +59,7 @@
     /// This also marks the previous current buffer (if any) as being submitted to the server.
     /// \post current_buffer() will return a ClientBuffer constructed from this IPC data.
     void deposit_package(std::shared_ptr<MirBufferPackage> const&, int id,
-                         geometry::Size, geometry::PixelFormat);
+                         geometry::Size, MirPixelFormat);
     std::shared_ptr<ClientBuffer> current_buffer();
     uint32_t current_buffer_id() const;
 

=== modified file 'src/client/client_buffer_factory.h'
--- src/client/client_buffer_factory.h	2013-06-17 09:51:42 +0000
+++ src/client/client_buffer_factory.h	2013-12-18 14:40:47 +0000
@@ -23,7 +23,7 @@
 #include <memory>
 
 #include "mir_toolkit/mir_client_library.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include "mir/geometry/size.h"
 
 namespace mir
@@ -46,7 +46,7 @@
      * \param [in] pf the buffer's pixel format
      */
     virtual std::shared_ptr<ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
-                                                        geometry::Size size, geometry::PixelFormat pf) = 0;
+                                                        geometry::Size size, MirPixelFormat pf) = 0;
 
 protected:
     ClientBufferFactory() = default;

=== modified file 'src/client/client_platform.h'
--- src/client/client_platform.h	2013-10-15 08:53:10 +0000
+++ src/client/client_platform.h	2013-12-18 14:40:47 +0000
@@ -46,7 +46,7 @@
 
     virtual ~ClientPlatform() { /* TODO: make nothrow */ }
 
-    virtual MirPlatformType platform_type() const = 0; 
+    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/default_connection_configuration.cpp'
--- src/client/default_connection_configuration.cpp	2013-11-21 03:16:21 +0000
+++ src/client/default_connection_configuration.cpp	2013-12-18 14:40:47 +0000
@@ -128,7 +128,7 @@
         {
             auto val_raw = getenv("MIR_CLIENT_INPUT_RECEIVER_REPORT");
             std::string const val{val_raw ? val_raw : off_opt_val};
-            
+
             if (val == log_opt_val)
                 return std::make_shared<mcl::logging::InputReceiverReport>(the_logger());
             else

=== modified file 'src/client/display_configuration.cpp'
--- src/client/display_configuration.cpp	2013-10-15 08:53:10 +0000
+++ src/client/display_configuration.cpp	2013-12-18 14:40:47 +0000
@@ -48,8 +48,8 @@
 {
     num_modes = num_modes_;
     modes = new MirDisplayMode[num_modes];
-   
-    num_output_formats = num_formats; 
+
+    num_output_formats = num_formats;
     output_formats = new MirPixelFormat[num_formats];
 }
 
@@ -77,8 +77,8 @@
     for (auto i = 0u; i < output.num_modes; i++)
     {
         auto mode = msg.mode(i);
-        output.modes[i].horizontal_resolution = mode.horizontal_resolution(); 
-        output.modes[i].vertical_resolution = mode.vertical_resolution(); 
+        output.modes[i].horizontal_resolution = mode.horizontal_resolution();
+        output.modes[i].vertical_resolution = mode.vertical_resolution();
         output.modes[i].refresh_rate = mode.refresh_rate();
     }
     output.preferred_mode = msg.preferred_mode();
@@ -161,7 +161,7 @@
     {
         auto new_info = &new_config->outputs[i];
         MirDisplayOutput* output = outputs[i].get();
-        std::memcpy(new_info, output, sizeof(MirDisplayOutput)); 
+        std::memcpy(new_info, output, sizeof(MirDisplayOutput));
 
         new_info->output_formats = new MirPixelFormat[new_info->num_output_formats];
         auto format_size = sizeof(MirPixelFormat) * new_info->num_output_formats;

=== modified file 'src/client/egl_native_display_container.h'
--- src/client/egl_native_display_container.h	2013-05-02 00:11:18 +0000
+++ src/client/egl_native_display_container.h	2013-12-18 14:40:47 +0000
@@ -16,8 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_GBM_EGL_NATIVE_DISPLAY_CONTAINER_H_
-#define MIR_CLIENT_GBM_EGL_NATIVE_DISPLAY_CONTAINER_H_
+#ifndef MIR_CLIENT_EGL_NATIVE_DISPLAY_CONTAINER_H_
+#define MIR_CLIENT_EGL_NATIVE_DISPLAY_CONTAINER_H_
 
 #include "mir_toolkit/client_types.h"
 
@@ -47,4 +47,4 @@
 }
 } // namespace mir
 
-#endif // MIR_CLIENT_GBM_EGL_NATIVE_DISPLAY_CONTAINER_H_
+#endif // MIR_CLIENT_EGL_NATIVE_DISPLAY_CONTAINER_H_

=== modified file 'src/client/logging/input_receiver_report.cpp'
--- src/client/logging/input_receiver_report.cpp	2013-11-05 22:31:59 +0000
+++ src/client/logging/input_receiver_report.cpp	2013-12-18 14:40:47 +0000
@@ -118,8 +118,8 @@
     std::stringstream ss;
 
     ss << "Received event:" << std::endl;
-    
+
     format_event(ss, event);
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }

=== modified file 'src/client/logging/rpc_report.cpp'
--- src/client/logging/rpc_report.cpp	2013-10-14 11:37:26 +0000
+++ src/client/logging/rpc_report.cpp	2013-12-18 14:40:47 +0000
@@ -45,7 +45,7 @@
     ss << "Invocation request: id: " << invocation.id()
        << " method_name: " << invocation.method_name();
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }
 
 void mcll::RpcReport::invocation_succeeded(
@@ -55,7 +55,7 @@
     ss << "Invocation succeeded: id: " << invocation.id()
        << " method_name: " << invocation.method_name();
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }
 
 void mcll::RpcReport::invocation_failed(
@@ -67,7 +67,7 @@
        << " method_name: " << invocation.method_name()
        << " error: " << error.message();
 
-    logger->log<ml::Logger::error>(ss.str(), component);
+    logger->log(ml::Logger::error, ss.str(), component);
 }
 
 void mcll::RpcReport::header_receipt_failed(
@@ -76,7 +76,7 @@
     std::stringstream ss;
     ss << "Header receipt failed: " << " error: " << error.message();
 
-    logger->log<ml::Logger::error>(ss.str(), component);
+    logger->log(ml::Logger::error, ss.str(), component);
 }
 
 void mcll::RpcReport::result_receipt_succeeded(
@@ -85,7 +85,7 @@
     std::stringstream ss;
     ss << "Result received: id: " << result.id();
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }
 
 void mcll::RpcReport::result_receipt_failed(
@@ -94,7 +94,7 @@
     std::stringstream ss;
     ss << "Result receipt failed: reason: " << ex.what();
 
-    logger->log<ml::Logger::error>(ss.str(), component);
+    logger->log(ml::Logger::error, ss.str(), component);
 }
 
 void mcll::RpcReport::event_parsing_succeeded(
@@ -104,7 +104,7 @@
     /* TODO: Log more information about event */
     ss << "Event parsed";
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }
 
 void mcll::RpcReport::event_parsing_failed(
@@ -114,7 +114,7 @@
     /* TODO: Log more information about event */
     ss << "Event parsing failed";
 
-    logger->log<ml::Logger::warning>(ss.str(), component);
+    logger->log(ml::Logger::warning, ss.str(), component);
 }
 
 void mcll::RpcReport::orphaned_result(
@@ -123,7 +123,7 @@
     std::stringstream ss;
     ss << "Orphaned result: " << result.ShortDebugString();
 
-    logger->log<ml::Logger::error>(ss.str(), component);
+    logger->log(ml::Logger::error, ss.str(), component);
 }
 
 void mcll::RpcReport::complete_response(
@@ -132,7 +132,7 @@
     std::stringstream ss;
     ss << "Complete response: id: " << result.id();
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }
 
 void mcll::RpcReport::result_processing_failed(
@@ -142,7 +142,7 @@
     std::stringstream ss;
     ss << "Result processing failed: reason: " << ex.what();
 
-    logger->log<ml::Logger::error>(ss.str(), component);
+    logger->log(ml::Logger::error, ss.str(), component);
 }
 
 void mcll::RpcReport::file_descriptors_received(
@@ -154,7 +154,7 @@
     for (auto f : fds)
         ss << f << " ";
 
-    logger->log<ml::Logger::debug>(ss.str(), component);
+    logger->log(ml::Logger::debug, ss.str(), component);
 }
 
 void mcll::RpcReport::connection_failure(std::exception const& x)
@@ -162,5 +162,5 @@
     std::stringstream ss;
     ss << "Connection failure: " << boost::diagnostic_information(x) << std::endl;
 
-    logger->log<ml::Logger::warning>(ss.str(), component);
+    logger->log(ml::Logger::warning, ss.str(), component);
 }

=== renamed directory 'src/client/gbm' => 'src/client/mesa'
=== renamed file 'src/client/gbm/drm_fd_handler.h' => 'src/client/mesa/buffer_file_ops.h'
--- src/client/gbm/drm_fd_handler.h	2013-04-24 05:22:20 +0000
+++ src/client/mesa/buffer_file_ops.h	2013-12-18 14:40:47 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_GBM_DRM_FD_HANDLER_
-#define MIR_CLIENT_GBM_DRM_FD_HANDLER_
+#ifndef MIR_CLIENT_MESA_BUFFER_FILE_OPS_
+#define MIR_CLIENT_MESA_BUFFER_FILE_OPS_
 
 #include <sys/types.h>
 
@@ -25,28 +25,26 @@
 {
 namespace client
 {
-namespace gbm
+namespace mesa
 {
 
-class DRMFDHandler
+class BufferFileOps
 {
 public:
-    virtual ~DRMFDHandler() {}
+    virtual ~BufferFileOps() = default;
 
-    virtual int ioctl(unsigned long request, void* arg) = 0;
-    virtual int primeFDToHandle(int prime_fd, uint32_t *handle) = 0;
-    virtual int close(int fd) = 0;
-    virtual void* map(size_t size, off_t offset) = 0;
-    virtual void unmap(void* addr, size_t size) = 0;
+    virtual int close(int fd) const = 0;
+    virtual void* map(int fd, off_t offset, size_t size) const = 0;
+    virtual void unmap(void* addr, size_t size) const = 0;
 
 protected:
-    DRMFDHandler() = default;
-    DRMFDHandler(const DRMFDHandler&) = delete;
-    DRMFDHandler& operator=(const DRMFDHandler&) = delete;
+    BufferFileOps() = default;
+    BufferFileOps(BufferFileOps const&) = delete;
+    BufferFileOps& operator=(BufferFileOps const&) = delete;
 };
 
 }
 }
 }
 
-#endif /* MIR_CLIENT_GBM_DRM_FD_HANDLER_ */
+#endif /* MIR_CLIENT_MESA_BUFFER_FILE_OPS_ */

=== renamed file 'src/client/gbm/gbm_client_buffer.cpp' => 'src/client/mesa/client_buffer.cpp'
--- src/client/gbm/gbm_client_buffer.cpp	2013-11-21 03:16:21 +0000
+++ src/client/mesa/client_buffer.cpp	2013-12-18 14:40:47 +0000
@@ -17,91 +17,47 @@
  */
 
 #include "mir_toolkit/mir_client_library.h"
-#include "gbm_client_buffer.h"
-#include "drm_fd_handler.h"
+#include "client_buffer.h"
+#include "buffer_file_ops.h"
 
 #include <boost/exception/errinfo_errno.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <stdexcept>
 
-#include <xf86drm.h>
-#include <string.h>
 #include <errno.h>
 #include <sys/mman.h>
 
 namespace mcl=mir::client;
-namespace mclg=mir::client::gbm;
+namespace mclm=mir::client::mesa;
 namespace geom=mir::geometry;
 
 namespace
 {
 
-struct GEMHandle
-{
-    GEMHandle(std::shared_ptr<mclg::DRMFDHandler> const& drm_fd_handler,
-              int prime_fd)
-        : drm_fd_handler{drm_fd_handler}
-    {
-        int ret = drm_fd_handler->primeFDToHandle(prime_fd, &handle);
-        if (ret)
-        {
-            std::string msg("Failed to import PRIME fd for DRM buffer");
-            BOOST_THROW_EXCEPTION(
-                boost::enable_error_info(
-                    std::runtime_error(msg)) << boost::errinfo_errno(errno));
-        }
-    }
-
-    ~GEMHandle()
-    {
-        struct drm_gem_close arg;
-        arg.handle = handle;
-        // TODO (@raof): Error reporting? I do not believe it should be possible for this to fail,
-        //               so if it does we should probably flag it.
-        drm_fd_handler->ioctl(DRM_IOCTL_GEM_CLOSE, &arg);
-    }
-
-    std::shared_ptr<mclg::DRMFDHandler> const drm_fd_handler;
-    uint32_t handle;
-};
-
 struct NullDeleter
 {
     void operator()(char *) const {}
 };
 
-struct GBMMemoryRegion : mcl::MemoryRegion
+struct ShmMemoryRegion : mcl::MemoryRegion
 {
-    GBMMemoryRegion(std::shared_ptr<mclg::DRMFDHandler> const& drm_fd_handler,
-                    int prime_fd, geom::Size const& size_param,
-                    geom::Stride stride_param, geom::PixelFormat format_param)
-        : drm_fd_handler{drm_fd_handler},
-          gem_handle{drm_fd_handler, prime_fd},
+    ShmMemoryRegion(std::shared_ptr<mclm::BufferFileOps> const& buffer_file_ops,
+                    int buffer_fd, geom::Size const& size_param,
+                    geom::Stride stride_param, MirPixelFormat format_param)
+        : buffer_file_ops{buffer_file_ops},
           size_in_bytes{size_param.height.as_uint32_t() * stride_param.as_uint32_t()}
     {
+        static off_t const map_offset = 0;
         width = size_param.width;
         height = size_param.height;
         stride = stride_param;
         format = format_param;
 
-        struct drm_mode_map_dumb map_dumb;
-        memset(&map_dumb, 0, sizeof(map_dumb));
-        map_dumb.handle = gem_handle.handle;
-
-        int ret = drm_fd_handler->ioctl(DRM_IOCTL_MODE_MAP_DUMB, &map_dumb);
-        if (ret)
-        {
-            std::string msg("Failed to map dumb DRM buffer");
-            BOOST_THROW_EXCEPTION(
-                boost::enable_error_info(
-                    std::runtime_error(msg)) << boost::errinfo_errno(errno));
-        }
-
-        void* map = drm_fd_handler->map(size_in_bytes, map_dumb.offset);
+        void* map = buffer_file_ops->map(buffer_fd, map_offset, size_in_bytes);
         if (map == MAP_FAILED)
         {
-            std::string msg("Failed to mmap DRM buffer");
+            std::string msg("Failed to mmap buffer");
             BOOST_THROW_EXCEPTION(
                 boost::enable_error_info(
                     std::runtime_error(msg)) << boost::errinfo_errno(errno));
@@ -110,63 +66,62 @@
         vaddr = std::shared_ptr<char>(static_cast<char*>(map), NullDeleter());
     }
 
-    ~GBMMemoryRegion()
+    ~ShmMemoryRegion()
     {
-        drm_fd_handler->unmap(vaddr.get(), size_in_bytes);
+        buffer_file_ops->unmap(vaddr.get(), size_in_bytes);
     }
 
-    std::shared_ptr<mclg::DRMFDHandler> const drm_fd_handler;
-    GEMHandle const gem_handle;
+    std::shared_ptr<mclm::BufferFileOps> const buffer_file_ops;
     size_t const size_in_bytes;
 };
 
 }
 
-mclg::GBMClientBuffer::GBMClientBuffer(
-        std::shared_ptr<mclg::DRMFDHandler> const& drm_fd_handler,
-        std::shared_ptr<MirBufferPackage> const& package,
-        geom::Size size, geom::PixelFormat pf)
-    : drm_fd_handler{drm_fd_handler},
-      creation_package(std::move(package)),
+mclm::ClientBuffer::ClientBuffer(
+    std::shared_ptr<mclm::BufferFileOps> const& buffer_file_ops,
+    std::shared_ptr<MirBufferPackage> const& package,
+    geom::Size size, MirPixelFormat pf)
+    : buffer_file_ops{buffer_file_ops},
+      creation_package{package},
       rect({geom::Point{0, 0}, size}),
       buffer_pf{pf}
 {
 }
 
-mclg::GBMClientBuffer::~GBMClientBuffer() noexcept
+mclm::ClientBuffer::~ClientBuffer() noexcept
 {
     // TODO (@raof): Error reporting? It should not be possible for this to fail; if it does,
     //               something's seriously wrong.
-    drm_fd_handler->close(creation_package->fd[0]);
+    buffer_file_ops->close(creation_package->fd[0]);
 }
 
-std::shared_ptr<mcl::MemoryRegion> mclg::GBMClientBuffer::secure_for_cpu_write()
+std::shared_ptr<mcl::MemoryRegion> mclm::ClientBuffer::secure_for_cpu_write()
 {
-    const int prime_fd = creation_package->fd[0];
+    int const buffer_fd = creation_package->fd[0];
 
-    return std::make_shared<GBMMemoryRegion>(drm_fd_handler,
-                                             prime_fd,
+    return std::make_shared<ShmMemoryRegion>(buffer_file_ops,
+                                             buffer_fd,
                                              size(),
                                              stride(),
                                              pixel_format());
 }
 
-geom::Size mclg::GBMClientBuffer::size() const
+geom::Size mclm::ClientBuffer::size() const
 {
     return rect.size;
 }
 
-geom::Stride mclg::GBMClientBuffer::stride() const
+geom::Stride mclm::ClientBuffer::stride() const
 {
     return geom::Stride{creation_package->stride};
 }
 
-geom::PixelFormat mclg::GBMClientBuffer::pixel_format() const
+MirPixelFormat mclm::ClientBuffer::pixel_format() const
 {
     return buffer_pf;
 }
 
-std::shared_ptr<MirNativeBuffer> mclg::GBMClientBuffer::native_buffer_handle() const
+std::shared_ptr<MirNativeBuffer> mclm::ClientBuffer::native_buffer_handle() const
 {
     creation_package->age = age();
     return creation_package;

=== renamed file 'src/client/gbm/gbm_client_buffer.h' => 'src/client/mesa/client_buffer.h'
--- src/client/gbm/gbm_client_buffer.h	2013-11-21 03:16:21 +0000
+++ src/client/mesa/client_buffer.h	2013-12-18 14:40:47 +0000
@@ -17,8 +17,8 @@
  *   Kevin DuBois <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_GBM_GBM_CLIENT_BUFFER_H_
-#define MIR_CLIENT_GBM_GBM_CLIENT_BUFFER_H_
+#ifndef MIR_CLIENT_MESA_CLIENT_BUFFER_H_
+#define MIR_CLIENT_MESA_CLIENT_BUFFER_H_
 
 #include "../aging_buffer.h"
 #include "mir_toolkit/mir_client_library.h"
@@ -30,37 +30,35 @@
 {
 namespace client
 {
-namespace gbm
+namespace mesa
 {
 
-class DRMFDHandler;
+class BufferFileOps;
 
-class GBMClientBuffer : public AgingBuffer
+class ClientBuffer : public AgingBuffer
 {
 public:
-    GBMClientBuffer(std::shared_ptr<DRMFDHandler> const& drm_fd_handler,
-                    std::shared_ptr<MirBufferPackage> const& buffer_package,
-                    geometry::Size size,
-                    geometry::PixelFormat pf);
+    ClientBuffer(std::shared_ptr<BufferFileOps> const& buffer_file_ops,
+                 std::shared_ptr<MirBufferPackage> const& buffer_package,
+                 geometry::Size size,
+                 MirPixelFormat pf);
 
-    virtual ~GBMClientBuffer() noexcept;
+    ~ClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
 
-    GBMClientBuffer(const GBMClientBuffer&) = delete;
-    GBMClientBuffer& operator=(const GBMClientBuffer&) = delete;
 private:
-    const std::shared_ptr<DRMFDHandler> drm_fd_handler;
-    const std::shared_ptr<MirBufferPackage> creation_package;
-    const geometry::Rectangle rect;
-    const geometry::PixelFormat buffer_pf;
+    std::shared_ptr<BufferFileOps> const buffer_file_ops;
+    std::shared_ptr<MirBufferPackage> const creation_package;
+    geometry::Rectangle const rect;
+    MirPixelFormat const buffer_pf;
 };
 
 }
 }
 }
-#endif /* MIR_CLIENT_GBM_GBM_CLIENT_BUFFER_H_ */
+#endif /* MIR_CLIENT_MESA_CLIENT_BUFFER_H_ */

=== renamed file 'src/client/gbm/gbm_client_buffer_factory.cpp' => 'src/client/mesa/client_buffer_factory.cpp'
--- src/client/gbm/gbm_client_buffer_factory.cpp	2013-11-21 03:16:21 +0000
+++ src/client/mesa/client_buffer_factory.cpp	2013-12-18 14:40:47 +0000
@@ -17,23 +17,27 @@
  *   Christopher James Halse Rogers <[e-mail]>
  */
 
-#include "gbm_client_buffer_factory.h"
-#include "gbm_client_buffer.h"
+#include "client_buffer_factory.h"
+#include "client_buffer.h"
 
 namespace mcl=mir::client;
-namespace mclg=mir::client::gbm;
+namespace mclm=mir::client::mesa;
 
-mclg::GBMClientBufferFactory::GBMClientBufferFactory(
-        std::shared_ptr<DRMFDHandler> const& drm_fd_handler)
-    : drm_fd_handler{drm_fd_handler}
+mclm::ClientBufferFactory::ClientBufferFactory(
+    std::shared_ptr<BufferFileOps> const& buffer_file_ops)
+    : buffer_file_ops{buffer_file_ops}
 {
 }
 
-std::shared_ptr<mcl::ClientBuffer> mclg::GBMClientBufferFactory::create_buffer(std::shared_ptr<MirBufferPackage> const& package, geometry::Size size, geometry::PixelFormat pf)
+std::shared_ptr<mcl::ClientBuffer>
+mclm::ClientBufferFactory::create_buffer(
+    std::shared_ptr<MirBufferPackage> const& package,
+    geometry::Size size,
+    MirPixelFormat pf)
 {
     (void)size; // TODO: remove this unused parameter
-    return std::make_shared<mclg::GBMClientBuffer>(
-        drm_fd_handler,
+    return std::make_shared<mclm::ClientBuffer>(
+        buffer_file_ops,
         package,
         geometry::Size{package->width, package->height},
         pf);

=== renamed file 'src/client/gbm/gbm_client_buffer_factory.h' => 'src/client/mesa/client_buffer_factory.h'
--- src/client/gbm/gbm_client_buffer_factory.h	2013-04-24 05:22:20 +0000
+++ src/client/mesa/client_buffer_factory.h	2013-12-18 14:40:47 +0000
@@ -17,35 +17,33 @@
  *   Christopher James Halse Rogers <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_GBM_GBM_CLIENT_BUFFER_FACTORY_H_
-#define MIR_CLIENT_GBM_GBM_CLIENT_BUFFER_FACTORY_H_
+#ifndef MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_
+#define MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_
 
 #include "../client_buffer_factory.h"
-#include "gbm_client_buffer.h"
 
 namespace mir
 {
 namespace client
 {
-class ClientBuffer;
-
-namespace gbm
+namespace mesa
 {
 
-class DRMFDHandler;
+class BufferFileOps;
 
-class GBMClientBufferFactory : public ClientBufferFactory
+class ClientBufferFactory : public client::ClientBufferFactory
 {
 public:
-    explicit GBMClientBufferFactory(std::shared_ptr<DRMFDHandler> const& drm_fd_handler);
+    explicit ClientBufferFactory(std::shared_ptr<BufferFileOps> const& buffer_file_ops);
 
-    std::shared_ptr<ClientBuffer> create_buffer(std::shared_ptr<MirBufferPackage> const& package,
-                                                geometry::Size size, geometry::PixelFormat pf);
+    std::shared_ptr<client::ClientBuffer> create_buffer(
+        std::shared_ptr<MirBufferPackage> const& package,
+        geometry::Size size, MirPixelFormat pf);
 private:
-    std::shared_ptr<DRMFDHandler> drm_fd_handler;
+    std::shared_ptr<BufferFileOps> const buffer_file_ops;
 };
 
 }
 }
 }
-#endif /* MIR_CLIENT_GBM_GBM_CLIENT_BUFFER_FACTORY_H_ */
+#endif /* MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_ */

=== renamed file 'src/client/gbm/gbm_client_platform.cpp' => 'src/client/mesa/client_platform.cpp'
--- src/client/gbm/gbm_client_platform.cpp	2013-10-15 08:53:10 +0000
+++ src/client/mesa/client_platform.cpp	2013-12-18 14:40:47 +0000
@@ -17,44 +17,28 @@
  */
 
 #include "mir_toolkit/mir_client_library.h"
-#include "gbm_client_platform.h"
-#include "gbm_client_buffer_factory.h"
+#include "client_platform.h"
+#include "client_buffer_factory.h"
 #include "mesa_native_display_container.h"
-#include "drm_fd_handler.h"
-#include "gbm_native_surface.h"
+#include "buffer_file_ops.h"
+#include "native_surface.h"
 #include "../mir_connection.h"
 #include "../client_buffer_factory.h"
 #include "../native_client_platform_factory.h"
 
-#include <xf86drm.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
 namespace mcl=mir::client;
-namespace mclg=mir::client::gbm;
+namespace mclm=mir::client::mesa;
 namespace geom=mir::geometry;
 
 namespace
 {
 
-class RealDRMFDHandler : public mclg::DRMFDHandler
+struct RealBufferFileOps : public mclm::BufferFileOps
 {
-public:
-    RealDRMFDHandler(int drm_fd) : drm_fd{drm_fd}
-    {
-    }
-
-    int ioctl(unsigned long request, void* arg)
-    {
-        return drmIoctl(drm_fd, request, arg);
-    }
-
-    int primeFDToHandle(int prime_fd, uint32_t *handle)
-    {
-        return drmPrimeFDToHandle(drm_fd, prime_fd, handle);
-    }
-
-    int close(int fd)
+    int close(int fd) const
     {
         while (::close(fd) == -1)
         {
@@ -65,19 +49,16 @@
         return 0;
     }
 
-    void* map(size_t size, off_t offset)
+    void* map(int fd, off_t offset, size_t size) const
     {
-        return mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED,
-                    drm_fd, offset);
+        return mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                    fd, offset);
     }
 
-    void unmap(void* addr, size_t size)
+    void unmap(void* addr, size_t size) const
     {
         munmap(addr, size);
     }
-
-private:
-    int drm_fd;
 };
 
 struct NativeDisplayDeleter
@@ -101,40 +82,31 @@
 std::shared_ptr<mcl::ClientPlatform>
 mcl::NativeClientPlatformFactory::create_client_platform(mcl::ClientContext* context)
 {
-    MirPlatformPackage platform_package;
-
-    memset(&platform_package, 0, sizeof(platform_package));
-    context->populate(platform_package);
-
-    int drm_fd = -1;
-
-    if (platform_package.fd_items > 0)
-        drm_fd = platform_package.fd[0];
-
-    auto drm_fd_handler = std::make_shared<RealDRMFDHandler>(drm_fd);
-    return std::make_shared<mclg::GBMClientPlatform>(context, drm_fd_handler, mcl::EGLNativeDisplayContainer::instance());
+    auto buffer_file_ops = std::make_shared<RealBufferFileOps>();
+    return std::make_shared<mclm::ClientPlatform>(
+        context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance());
 }
 
-mclg::GBMClientPlatform::GBMClientPlatform(
+mclm::ClientPlatform::ClientPlatform(
         ClientContext* const context,
-        std::shared_ptr<DRMFDHandler> const& drm_fd_handler,
+        std::shared_ptr<BufferFileOps> const& buffer_file_ops,
         mcl::EGLNativeDisplayContainer& display_container)
     : context{context},
-      drm_fd_handler{drm_fd_handler},
+      buffer_file_ops{buffer_file_ops},
       display_container(display_container)
 {
 }
 
-std::shared_ptr<mcl::ClientBufferFactory> mclg::GBMClientPlatform::create_buffer_factory()
+std::shared_ptr<mcl::ClientBufferFactory> mclm::ClientPlatform::create_buffer_factory()
 {
-    return std::make_shared<mclg::GBMClientBufferFactory>(drm_fd_handler);
+    return std::make_shared<mclm::ClientBufferFactory>(buffer_file_ops);
 }
 
 namespace
 {
 struct NativeWindowDeleter
 {
-    NativeWindowDeleter(mclg::GBMNativeSurface* window)
+    NativeWindowDeleter(mclm::NativeSurface* window)
      : window(window) {}
 
     void operator()(EGLNativeWindowType* type)
@@ -144,21 +116,21 @@
     }
 
 private:
-    mclg::GBMNativeSurface* window;
+    mclm::NativeSurface* window;
 };
 }
 
-std::shared_ptr<EGLNativeWindowType> mclg::GBMClientPlatform::create_egl_native_window(ClientSurface* client_surface)
+std::shared_ptr<EGLNativeWindowType> mclm::ClientPlatform::create_egl_native_window(ClientSurface* client_surface)
 {
     //TODO: this is awkward on both android and gbm...
-    auto gbm_window = new GBMNativeSurface(*client_surface);
+    auto native_window = new NativeSurface(*client_surface);
     auto egl_native_window = new EGLNativeWindowType;
-    *egl_native_window = gbm_window; 
-    NativeWindowDeleter deleter(gbm_window);
+    *egl_native_window = native_window;
+    NativeWindowDeleter deleter(native_window);
     return std::shared_ptr<EGLNativeWindowType>(egl_native_window, deleter);
 }
 
-std::shared_ptr<EGLNativeDisplayType> mclg::GBMClientPlatform::create_egl_native_display()
+std::shared_ptr<EGLNativeDisplayType> mclm::ClientPlatform::create_egl_native_display()
 {
     MirEGLNativeDisplayType *mir_native_display = new MirEGLNativeDisplayType;
     *mir_native_display = display_container.create(context->mir_connection());
@@ -167,12 +139,12 @@
     return std::shared_ptr<EGLNativeDisplayType>(egl_native_display, NativeDisplayDeleter(display_container));
 }
 
-MirPlatformType mclg::GBMClientPlatform::platform_type() const
+MirPlatformType mclm::ClientPlatform::platform_type() const
 {
-    return mir_platform_type_gbm; 
-} 
+    return mir_platform_type_gbm;
+}
 
-MirNativeBuffer* mclg::GBMClientPlatform::convert_native_buffer(graphics::NativeBuffer* buf) const
+MirNativeBuffer* mclm::ClientPlatform::convert_native_buffer(graphics::NativeBuffer* buf) const
 {
     //MirNativeBuffer is type-compatible with the MirNativeBuffer
     return buf;

=== renamed file 'src/client/gbm/gbm_client_platform.h' => 'src/client/mesa/client_platform.h'
--- src/client/gbm/gbm_client_platform.h	2013-10-15 08:53:10 +0000
+++ src/client/mesa/client_platform.h	2013-12-18 14:40:47 +0000
@@ -15,8 +15,8 @@
  *
  * Authored by: Kevin DuBois <[e-mail]>
  */
-#ifndef MIR_CLIENT_GBM_GBM_CLIENT_PLATFORM_H_
-#define MIR_CLIENT_GBM_GBM_CLIENT_PLATFORM_H_
+#ifndef MIR_CLIENT_MESA_CLIENT_PLATFORM_H_
+#define MIR_CLIENT_MESA_CLIENT_PLATFORM_H_
 
 #include "../client_platform.h"
 
@@ -27,19 +27,19 @@
 class ClientBufferDepository;
 class EGLNativeDisplayContainer;
 
-namespace gbm
+namespace mesa
 {
 
-class DRMFDHandler;
+class BufferFileOps;
 
-class GBMClientPlatform : public ClientPlatform
+class ClientPlatform : public client::ClientPlatform
 {
 public:
-    GBMClientPlatform(ClientContext* const context,
-                      std::shared_ptr<DRMFDHandler> const& drm_fd_handler,
-                      EGLNativeDisplayContainer& display_container);
+    ClientPlatform(ClientContext* const context,
+                   std::shared_ptr<BufferFileOps> const& buffer_file_ops,
+                   EGLNativeDisplayContainer& display_container);
 
-    MirPlatformType platform_type() const; 
+    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();
@@ -47,7 +47,7 @@
 
 private:
     ClientContext* const context;
-    std::shared_ptr<DRMFDHandler> const drm_fd_handler;
+    std::shared_ptr<BufferFileOps> const buffer_file_ops;
     EGLNativeDisplayContainer& display_container;
 };
 
@@ -55,4 +55,4 @@
 }
 }
 
-#endif /* MIR_CLIENT_GBM_GBM_CLIENT_PLATFORM_H_ */
+#endif /* MIR_CLIENT_MESA_CLIENT_PLATFORM_H_ */

=== modified file 'src/client/mesa/mesa_native_display_container.cpp'
--- src/client/gbm/mesa_native_display_container.cpp	2013-08-28 03:41:48 +0000
+++ src/client/mesa/mesa_native_display_container.cpp	2013-12-18 14:40:47 +0000
@@ -25,15 +25,15 @@
 #include <mutex>
 
 namespace mcl = mir::client;
-namespace mclg = mcl::gbm;
+namespace mclm = mcl::mesa;
 
 namespace
 {
 extern "C"
 {
 
-static int gbm_egl_display_get_platform(MirMesaEGLNativeDisplay* display,
-                                         MirPlatformPackage* package)
+static int egl_display_get_platform(MirMesaEGLNativeDisplay* display,
+                                    MirPlatformPackage* package)
 {
     auto connection = static_cast<MirConnection*>(display->context);
     mir_connection_get_platform(connection, package);
@@ -50,15 +50,15 @@
 
 mcl::EGLNativeDisplayContainer& mcl::EGLNativeDisplayContainer::instance()
 {
-    static mclg::MesaNativeDisplayContainer default_display_container;
+    static mclm::MesaNativeDisplayContainer default_display_container;
     return default_display_container;
 }
 
-mclg::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
+mclm::MesaNativeDisplayContainer::MesaNativeDisplayContainer()
 {
 }
 
-mclg::MesaNativeDisplayContainer::~MesaNativeDisplayContainer()
+mclm::MesaNativeDisplayContainer::~MesaNativeDisplayContainer()
 {
     std::lock_guard<std::mutex> lg(guard);
 
@@ -68,17 +68,17 @@
     }
 }
 
-bool mclg::MesaNativeDisplayContainer::validate(MirEGLNativeDisplayType display) const
+bool mclm::MesaNativeDisplayContainer::validate(MirEGLNativeDisplayType display) const
 {
     std::lock_guard<std::mutex> lg(guard);
     return (valid_displays.find(display) != valid_displays.end());
 }
 
 MirEGLNativeDisplayType
-mclg::MesaNativeDisplayContainer::create(MirConnection* connection)
+mclm::MesaNativeDisplayContainer::create(MirConnection* connection)
 {
     MirMesaEGLNativeDisplay* display = new MirMesaEGLNativeDisplay();
-    display->display_get_platform = gbm_egl_display_get_platform;
+    display->display_get_platform = egl_display_get_platform;
     display->context = connection;
 
     std::lock_guard<std::mutex> lg(guard);
@@ -88,7 +88,7 @@
     return egl_display;
 }
 
-void mclg::MesaNativeDisplayContainer::release(MirEGLNativeDisplayType display)
+void mclm::MesaNativeDisplayContainer::release(MirEGLNativeDisplayType display)
 {
     std::lock_guard<std::mutex> lg(guard);
 

=== modified file 'src/client/mesa/mesa_native_display_container.h'
--- src/client/gbm/mesa_native_display_container.h	2013-08-28 03:41:48 +0000
+++ src/client/mesa/mesa_native_display_container.h	2013-12-18 14:40:47 +0000
@@ -16,8 +16,8 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_CLIENT_GBM_MESA_NATIVE_DISPLAY_CONTAINER_H_
-#define MIR_CLIENT_GBM_MESA_NATIVE_DISPLAY_CONTAINER_H_
+#ifndef MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_
+#define MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_
 
 #include "../egl_native_display_container.h"
 
@@ -31,7 +31,7 @@
 {
 namespace client
 {
-namespace gbm
+namespace mesa
 {
 
 class MesaNativeDisplayContainer : public EGLNativeDisplayContainer
@@ -60,4 +60,4 @@
 }
 } // namespace mir
 
-#endif // MIR_CLIENT_GBM_MESA_NATIVE_DISPLAY_CONTAINER_H_
+#endif // MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_

=== renamed file 'src/client/gbm/gbm_native_surface.cpp' => 'src/client/mesa/native_surface.cpp'
--- src/client/gbm/gbm_native_surface.cpp	2013-06-28 00:25:30 +0000
+++ src/client/mesa/native_surface.cpp	2013-12-18 14:40:47 +0000
@@ -18,31 +18,31 @@
 
 #include <cstring>
 #include "../client_buffer.h"
-#include "gbm_native_surface.h"
+#include "native_surface.h"
 
-namespace mclg=mir::client::gbm;
+namespace mclm=mir::client::mesa;
 
 namespace
 {
 static int advance_buffer_static(MirMesaEGLNativeSurface* surface,
                                   MirBufferPackage* buffer_package)
 {
-    auto s = static_cast<mclg::GBMNativeSurface*>(surface);
+    auto s = static_cast<mclm::NativeSurface*>(surface);
     return s->advance_buffer(buffer_package);
 }
 
 static int get_parameters_static(MirMesaEGLNativeSurface* surface,
                                   MirSurfaceParameters* surface_parameters)
 {
-    auto s = static_cast<mclg::GBMNativeSurface*>(surface);
+    auto s = static_cast<mclm::NativeSurface*>(surface);
     return s->get_parameters(surface_parameters);
 }
 
 static int set_swapinterval_static(MirMesaEGLNativeSurface* surface, int interval)
 {
-    auto s = static_cast<mclg::GBMNativeSurface*>(surface);
+    auto s = static_cast<mclm::NativeSurface*>(surface);
     return s->set_swapinterval(interval);
-} 
+}
 
 static void buffer_advanced_callback(MirSurface*  /* surface */,
                                      void*  /* context */)
@@ -50,15 +50,15 @@
 }
 }
 
-mclg::GBMNativeSurface::GBMNativeSurface(ClientSurface& surface)
+mclm::NativeSurface::NativeSurface(ClientSurface& surface)
     : surface(surface)
 {
-    surface_advance_buffer = advance_buffer_static; 
-    surface_get_parameters = get_parameters_static; 
-    surface_set_swapinterval = set_swapinterval_static; 
+    surface_advance_buffer = advance_buffer_static;
+    surface_get_parameters = get_parameters_static;
+    surface_set_swapinterval = set_swapinterval_static;
 }
 
-int mclg::GBMNativeSurface::advance_buffer(MirBufferPackage* buffer_package)
+int mclm::NativeSurface::advance_buffer(MirBufferPackage* buffer_package)
 {
     mir_wait_for(surface.next_buffer(buffer_advanced_callback, NULL));
     auto buffer = surface.get_current_buffer();
@@ -68,18 +68,18 @@
     return MIR_MESA_TRUE;
 }
 
-int mclg::GBMNativeSurface::get_parameters(MirSurfaceParameters* surface_parameters)
+int mclm::NativeSurface::get_parameters(MirSurfaceParameters* surface_parameters)
 {
     auto params = surface.get_parameters();
     memcpy(surface_parameters, &params, sizeof(MirSurfaceParameters));
     return MIR_MESA_TRUE;
 }
 
-int mclg::GBMNativeSurface::set_swapinterval(int interval)
+int mclm::NativeSurface::set_swapinterval(int interval)
 {
     if ((interval < 0) || (interval > 1))
         return MIR_MESA_FALSE;
 
-    mir_wait_for(surface.configure(mir_surface_attrib_swapinterval, interval)); 
+    mir_wait_for(surface.configure(mir_surface_attrib_swapinterval, interval));
     return MIR_MESA_TRUE;
 }

=== renamed file 'src/client/gbm/gbm_native_surface.h' => 'src/client/mesa/native_surface.h'
--- src/client/gbm/gbm_native_surface.h	2013-06-28 00:05:44 +0000
+++ src/client/mesa/native_surface.h	2013-12-18 14:40:47 +0000
@@ -16,6 +16,9 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
+#ifndef MIR_CLIENT_MESA_NATIVE_SURFACES_H_
+#define MIR_CLIENT_MESA_NATIVE_SURFACES_H_
+
 #include "mir_toolkit/mesa/native_display.h"
 #include "../mir_client_surface.h"
 
@@ -23,13 +26,13 @@
 {
 namespace client
 {
-namespace gbm
+namespace mesa
 {
 
-class GBMNativeSurface : public MirMesaEGLNativeSurface
+class NativeSurface : public MirMesaEGLNativeSurface
 {
 public:
-    explicit GBMNativeSurface(ClientSurface&);
+    explicit NativeSurface(ClientSurface&);
 
     int advance_buffer(MirBufferPackage* buffer_package);
     int get_parameters(MirSurfaceParameters* surface_parameters);
@@ -42,3 +45,5 @@
 }
 }
 }
+
+#endif /* MIR_CLIENT_MESA_NATIVE_SURFACE_H_ */

=== modified file 'src/client/mir_client_library.cpp'
--- src/client/mir_client_library.cpp	2013-11-21 03:16:21 +0000
+++ src/client/mir_client_library.cpp	2013-12-18 14:40:47 +0000
@@ -176,9 +176,9 @@
     return conn;
 }
 
-int mir_connection_is_valid(MirConnection * connection)
+MirBool mir_connection_is_valid(MirConnection * connection)
 {
-    return MirConnection::is_valid(connection);
+    return MirConnection::is_valid(connection) ? mir_true : mir_false;
 }
 
 char const * mir_connection_get_error_message(MirConnection * connection)
@@ -266,12 +266,12 @@
 
 int mir_debug_surface_id(MirSurface * surface)
 {
-    return surface->id();    
+    return surface->id();
 }
 
-int mir_surface_is_valid(MirSurface* surface)
+MirBool mir_surface_is_valid(MirSurface* surface)
 {
-    return surface->is_valid();
+    return surface->is_valid() ? mir_true : mir_false;
 }
 
 char const * mir_surface_get_error_message(MirSurface * surface)

=== modified file 'src/client/mir_connection.cpp'
--- src/client/mir_connection.cpp	2013-11-21 03:16:21 +0000
+++ src/client/mir_connection.cpp	2013-12-18 14:40:47 +0000
@@ -370,7 +370,7 @@
         for (auto i = 0u; i < valid_formats; i++)
         {
             formats[i] = static_cast<MirPixelFormat>(connect_result.surface_pixel_format(i));
-        }      
+        }
     }
 }
 
@@ -458,11 +458,11 @@
     {
         auto output = config->outputs[i];
         auto display_request = request.add_display_output();
-        display_request->set_output_id(output.output_id); 
-        display_request->set_used(output.used); 
-        display_request->set_current_mode(output.current_mode); 
-        display_request->set_position_x(output.position_x); 
-        display_request->set_position_y(output.position_y); 
+        display_request->set_output_id(output.output_id);
+        display_request->set_used(output.used);
+        display_request->set_current_mode(output.current_mode);
+        display_request->set_position_x(output.position_x);
+        display_request->set_position_y(output.position_y);
         display_request->set_power_mode(output.power_mode);
     }
 

=== modified file 'src/client/mir_connection.h'
--- src/client/mir_connection.h	2013-11-21 03:16:21 +0000
+++ src/client/mir_connection.h	2013-12-18 14:40:47 +0000
@@ -105,7 +105,7 @@
     void register_display_change_callback(mir_display_config_callback callback, void* context);
 
     void populate(MirPlatformPackage& platform_package);
-    MirDisplayConfiguration* create_copy_of_display_config(); 
+    MirDisplayConfiguration* create_copy_of_display_config();
     void available_surface_formats(MirPixelFormat* formats,
                                    unsigned int formats_size, unsigned int& valid_formats);
 

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2013-11-21 03:16:21 +0000
+++ src/client/mir_surface.cpp	2013-12-18 14:40:47 +0000
@@ -52,7 +52,7 @@
     message.set_pixel_format(params.pixel_format);
     message.set_buffer_usage(params.buffer_usage);
     message.set_output_id(params.output_id);
-    
+
     server.create_surface(0, &message, &surface, gp::NewCallback(this, &MirSurface::created, callback, context));
 
     for (int i = 0; i < mir_surface_attribs; i++)
@@ -159,10 +159,10 @@
 }
 
 /* todo: all these conversion functions are a bit of a kludge, probably
-         better to have a more developed geometry::PixelFormat that can handle this */
-geom::PixelFormat MirSurface::convert_ipc_pf_to_geometry(gp::int32 pf)
+         better to have a more developed MirPixelFormat that can handle this */
+MirPixelFormat MirSurface::convert_ipc_pf_to_geometry(gp::int32 pf)
 {
-    return static_cast<geom::PixelFormat>(pf);
+    return static_cast<MirPixelFormat>(pf);
 }
 
 void MirSurface::process_incoming_buffer()
@@ -254,7 +254,7 @@
 {
     std::lock_guard<std::recursive_mutex> lock(mutex);
 
-    return buffer_depository->current_buffer_id();    
+    return buffer_depository->current_buffer_id();
 }
 
 void MirSurface::populate(MirBufferPackage& buffer_package)

=== modified file 'src/client/mir_surface.h'
--- src/client/mir_surface.h	2013-11-21 03:16:21 +0000
+++ src/client/mir_surface.h	2013-12-18 14:40:47 +0000
@@ -20,7 +20,6 @@
 
 #include "mir_protobuf.pb.h"
 
-#include "mir/geometry/pixel_format.h"
 #include "mir/geometry/dimensions.h"
 #include "mir_toolkit/mir_client_library.h"
 #include "mir_toolkit/common.h"
@@ -101,7 +100,7 @@
     void populate(MirBufferPackage& buffer_package);
     void created(mir_surface_callback callback, void * context);
     void new_buffer(mir_surface_callback callback, void * context);
-    mir::geometry::PixelFormat convert_ipc_pf_to_geometry(google::protobuf::int32 pf);
+    MirPixelFormat convert_ipc_pf_to_geometry(google::protobuf::int32 pf);
 
     /* todo: race condition. protobuf does not guarantee that callbacks will be synchronized. potential
              race in surface, last_buffer_id */

=== modified file 'src/client/rpc/mir_socket_rpc_channel.cpp'
--- src/client/rpc/mir_socket_rpc_channel.cpp	2013-11-21 03:16:21 +0000
+++ src/client/rpc/mir_socket_rpc_channel.cpp	2013-12-18 14:40:47 +0000
@@ -415,7 +415,7 @@
             {
                 rpc_report->event_parsing_failed(event);
             }
-        } 
+        }
     }
 }
 

=== modified file 'src/client/surface_map.cpp'
--- src/client/surface_map.cpp	2013-11-20 17:13:18 +0000
+++ src/client/surface_map.cpp	2013-12-18 14:40:47 +0000
@@ -42,7 +42,7 @@
         ss << __PRETTY_FUNCTION__
            << "executed with non-existent surface ID "
            << surface_id << ".\n";
-    
+
         BOOST_THROW_EXCEPTION(std::runtime_error(ss.str()));
     }
 }
@@ -50,11 +50,11 @@
 void mcl::ConnectionSurfaceMap::insert(int const& surface_id, MirSurface* surface)
 {
     std::unique_lock<std::mutex> lk(guard);
-    surfaces[surface_id] = surface; 
+    surfaces[surface_id] = surface;
 }
 
 void mcl::ConnectionSurfaceMap::erase(int surface_id)
 {
     std::unique_lock<std::mutex> lk(guard);
-    surfaces.erase(surface_id); 
+    surfaces.erase(surface_id);
 }

=== modified file 'src/platform/graphics/CMakeLists.txt'
--- src/platform/graphics/CMakeLists.txt	2013-11-21 03:16:21 +0000
+++ src/platform/graphics/CMakeLists.txt	2013-12-18 14:40:47 +0000
@@ -26,3 +26,13 @@
 )
 
 install(TARGETS mirplatform LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+if (MIR_PLATFORM STREQUAL "android")
+  include_directories(${LIBHARDWARE_INCLUDE_DIRS})
+  add_subdirectory(android/)
+endif()
+
+if (MIR_PLATFORM STREQUAL "mesa")
+  add_subdirectory(mesa/)
+endif()
+

=== renamed directory 'src/server/graphics/android' => 'src/platform/graphics/android'
=== modified file 'src/platform/graphics/android/android_alloc_adaptor.cpp'
--- src/server/graphics/android/android_alloc_adaptor.cpp	2013-11-21 03:16:21 +0000
+++ src/platform/graphics/android/android_alloc_adaptor.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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:
@@ -52,7 +52,7 @@
 }
 
 std::shared_ptr<mg::NativeBuffer> mga::AndroidAllocAdaptor::alloc_buffer(
-    geometry::Size size, geometry::PixelFormat pf, BufferUsage usage)
+    geometry::Size size, MirPixelFormat pf, BufferUsage usage)
 {
     buffer_handle_t buf_handle = NULL;
     auto stride = 0;

=== modified file 'src/platform/graphics/android/android_alloc_adaptor.h'
--- src/server/graphics/android/android_alloc_adaptor.h	2013-10-15 08:53:10 +0000
+++ src/platform/graphics/android/android_alloc_adaptor.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -36,7 +36,7 @@
 public:
     explicit AndroidAllocAdaptor(const std::shared_ptr<struct alloc_device_t>& alloc_device);
     std::shared_ptr<NativeBuffer> alloc_buffer(geometry::Size,
-            geometry::PixelFormat, BufferUsage usage);
+            MirPixelFormat, BufferUsage usage);
 
     /* note: alloc_device_t has a third method (dump) that isn't needed by us. it can be used to check buffer contents */
 

=== modified file 'src/platform/graphics/android/android_buffer_allocator.cpp'
--- src/server/graphics/android/android_buffer_allocator.cpp	2013-11-21 03:16:21 +0000
+++ src/platform/graphics/android/android_buffer_allocator.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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:
@@ -78,7 +78,7 @@
 }
 
 std::shared_ptr<mg::Buffer> mga::AndroidGraphicBufferAllocator::alloc_buffer_platform(
-    geom::Size sz, geom::PixelFormat pf, mga::BufferUsage use)
+    geom::Size sz, MirPixelFormat pf, mga::BufferUsage use)
 {
     auto native_handle = alloc_device->alloc_buffer(sz, pf, use);
     auto buffer = std::make_shared<Buffer>(native_handle, egl_extensions);
@@ -86,12 +86,12 @@
     return buffer;
 }
 
-std::vector<geom::PixelFormat> mga::AndroidGraphicBufferAllocator::supported_pixel_formats()
+std::vector<MirPixelFormat> 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
+    static std::vector<MirPixelFormat> const pixel_formats{
+        mir_pixel_format_abgr_8888,
+        mir_pixel_format_xbgr_8888,
+        mir_pixel_format_bgr_888
     };
 
     return pixel_formats;
@@ -106,5 +106,5 @@
         case mg::BufferUsage::hardware:
         default:
             return mga::BufferUsage::use_hardware;
-    } 
+    }
 }

=== modified file 'src/platform/graphics/android/android_display.cpp'
--- src/server/graphics/android/android_display.cpp	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/android_display.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>

=== modified file 'src/platform/graphics/android/android_display.h'
--- src/server/graphics/android/android_display.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/android_display.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -71,7 +71,7 @@
     GLContext gl_context;
     std::shared_ptr<DisplayDevice> const display_device;
     //we only have a primary display at the moment
-    std::unique_ptr<graphics::DisplayBuffer> const display_buffer; 
+    std::unique_ptr<graphics::DisplayBuffer> const display_buffer;
     AndroidDisplayConfiguration current_configuration;
 };
 

=== modified file 'src/platform/graphics/android/android_display_configuration.cpp'
--- src/server/graphics/android/android_display_configuration.cpp	2013-09-12 23:48:21 +0000
+++ src/platform/graphics/android/android_display_configuration.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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/>.
  */
 
@@ -24,7 +24,7 @@
         : configuration{mg::DisplayConfigurationOutputId{1},
                         mg::DisplayConfigurationCardId{0},
                         mg::DisplayConfigurationOutputType::lvds,
-                        {geom::PixelFormat::abgr_8888},
+                        {mir_pixel_format_abgr_8888},
                         {mg::DisplayConfigurationMode{display_size,0.0f}},
                         0,
                         geom::Size{0,0},

=== modified file 'src/platform/graphics/android/android_display_configuration.h'
--- src/server/graphics/android/android_display_configuration.h	2013-09-12 23:48:21 +0000
+++ src/platform/graphics/android/android_display_configuration.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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/>.
  */
 
@@ -32,7 +32,7 @@
     AndroidDisplayConfiguration(geometry::Size const& display_size);
     AndroidDisplayConfiguration(AndroidDisplayConfiguration const& other);
     AndroidDisplayConfiguration& operator=(AndroidDisplayConfiguration const& other);
-    
+
     virtual ~AndroidDisplayConfiguration() = default;
 
     void for_each_card(std::function<void(DisplayConfigurationCard const&)> f) const;

=== modified file 'src/platform/graphics/android/android_format_conversion-inl.h'
--- src/server/graphics/android/android_format_conversion-inl.h	2013-04-19 15:58:22 +0000
+++ src/platform/graphics/android/android_format_conversion-inl.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -19,7 +19,7 @@
 #ifndef MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 #define MIR_GRAPHICS_ANDROID_ANDROID_FORMAT_CONVERSION_INL_H_
 
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include <system/graphics.h>
 
 namespace mir
@@ -29,39 +29,39 @@
 namespace android
 {
 
-inline static int to_android_format(geometry::PixelFormat format)
+inline static int to_android_format(MirPixelFormat format)
 {
     switch(format)
     {
-        case geometry::PixelFormat::abgr_8888:
+        case mir_pixel_format_abgr_8888:
             return HAL_PIXEL_FORMAT_RGBA_8888;
-        case geometry::PixelFormat::xbgr_8888:
+        case mir_pixel_format_xbgr_8888:
             return HAL_PIXEL_FORMAT_RGBX_8888;
-        case geometry::PixelFormat::argb_8888:
-            return HAL_PIXEL_FORMAT_BGRA_8888;
-        case geometry::PixelFormat::xrgb_8888:
-            return HAL_PIXEL_FORMAT_BGRA_8888;
-        case geometry::PixelFormat::bgr_888:
+        case mir_pixel_format_argb_8888:
+            return HAL_PIXEL_FORMAT_BGRA_8888;
+        case mir_pixel_format_xrgb_8888:
+            return HAL_PIXEL_FORMAT_BGRA_8888;
+        case mir_pixel_format_bgr_888:
             return HAL_PIXEL_FORMAT_RGB_888;
         default:
             return 0;
     }
 }
 
-inline static mir::geometry::PixelFormat to_mir_format(int format)
+inline static MirPixelFormat to_mir_format(int format)
 {
     switch(format)
     {
         case HAL_PIXEL_FORMAT_RGBA_8888:
-            return geometry::PixelFormat::abgr_8888;
+            return mir_pixel_format_abgr_8888;
         case HAL_PIXEL_FORMAT_RGBX_8888:
-            return geometry::PixelFormat::xbgr_8888;
+            return mir_pixel_format_xbgr_8888;
         case HAL_PIXEL_FORMAT_BGRA_8888:
-            return geometry::PixelFormat::argb_8888;
+            return mir_pixel_format_argb_8888;
         case HAL_PIXEL_FORMAT_RGB_888:
-            return geometry::PixelFormat::bgr_888;
+            return mir_pixel_format_bgr_888;
         default:
-            return geometry::PixelFormat::invalid;
+            return mir_pixel_format_invalid;
     }
 }
 

=== modified file 'src/platform/graphics/android/android_graphic_buffer_allocator.h'
--- src/server/graphics/android/android_graphic_buffer_allocator.h	2013-11-21 03:16:21 +0000
+++ src/platform/graphics/android/android_graphic_buffer_allocator.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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:
@@ -49,9 +49,9 @@
         graphics::BufferProperties const& buffer_properties);
 
     std::shared_ptr<graphics::Buffer> alloc_buffer_platform(
-        geometry::Size sz, geometry::PixelFormat pf, BufferUsage use);
+        geometry::Size sz, MirPixelFormat pf, BufferUsage use);
 
-    std::vector<geometry::PixelFormat> supported_pixel_formats();
+    std::vector<MirPixelFormat> supported_pixel_formats();
 
     static BufferUsage convert_from_compositor_usage(graphics::BufferUsage usage);
 

=== modified file 'src/platform/graphics/android/android_platform.cpp'
--- src/server/graphics/android/android_platform.cpp	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/android_platform.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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:
@@ -77,7 +77,7 @@
     auto buffer_handle = native_buffer->handle();
 
     int offset = 0;
-    
+
     for(auto i=0; i<buffer_handle->numFds; i++)
     {
         packer->pack_fd(buffer_handle->data[offset++]);
@@ -119,11 +119,7 @@
 
 extern "C" std::shared_ptr<mg::NativePlatform> create_native_platform(std::shared_ptr<mg::DisplayReport> const& display_report)
 {
-    auto should_use_fb_fallback = false;
-    auto buffer_initializer = std::make_shared<mg::NullBufferInitializer>();
-    auto fb_allocator = std::make_shared<mga::AndroidGraphicBufferAllocator>(buffer_initializer);
-    auto display_resource_factory = std::make_shared<mga::ResourceFactory>();
-    auto display_builder = std::make_shared<mga::OutputBuilder>(
-        fb_allocator, display_resource_factory, display_report, should_use_fb_fallback);
-    return std::make_shared<mga::AndroidPlatform>(display_builder, display_report);
+    //TODO: remove nullptr parameter once platform classes are sorted.
+    //      mg::NativePlatform cannot create a display anyways, so it doesnt need a  display builder
+    return std::make_shared<mga::AndroidPlatform>(nullptr, display_report);
 }

=== modified file 'src/platform/graphics/android/android_platform.h'
--- src/server/graphics/android/android_platform.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/android_platform.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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: Alexandros Frantzis <[e-mail]>

=== modified file 'src/platform/graphics/android/buffer.cpp'
--- src/server/graphics/android/buffer.cpp	2013-10-15 08:53:10 +0000
+++ src/platform/graphics/android/buffer.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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:
@@ -60,10 +60,10 @@
 {
     ANativeWindowBuffer *anwb = native_buffer->anwb();
     return geom::Stride{anwb->stride *
-                        geom::bytes_per_pixel(pixel_format())};
+                        MIR_BYTES_PER_PIXEL(pixel_format())};
 }
 
-geom::PixelFormat mga::Buffer::pixel_format() const
+MirPixelFormat mga::Buffer::pixel_format() const
 {
     ANativeWindowBuffer *anwb = native_buffer->anwb();
     return mga::to_mir_format(anwb->format);
@@ -123,7 +123,7 @@
             content_lock.unlock();
         });
 
-    //lock remains in effect until the native handle is released 
+    //lock remains in effect until the native handle is released
     lk.release();
     return native_resource;
 }

=== modified file 'src/platform/graphics/android/buffer.h'
--- src/server/graphics/android/buffer.h	2013-10-15 08:53:10 +0000
+++ src/platform/graphics/android/buffer.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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:
@@ -49,7 +49,7 @@
 
     geometry::Size size() const;
     geometry::Stride stride() const;
-    geometry::PixelFormat pixel_format() const;
+    MirPixelFormat pixel_format() const;
     void bind_to_texture();
     bool can_bypass() const override;
 

=== modified file 'src/platform/graphics/android/buffer_usage.h'
--- src/server/graphics/android/buffer_usage.h	2013-05-21 21:51:13 +0000
+++ src/platform/graphics/android/buffer_usage.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>

=== modified file 'src/platform/graphics/android/display_buffer.cpp'
--- src/server/graphics/android/display_buffer.cpp	2013-11-19 19:59:27 +0000
+++ src/platform/graphics/android/display_buffer.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>

=== modified file 'src/platform/graphics/android/display_buffer.h'
--- src/server/graphics/android/display_buffer.h	2013-11-18 22:44:06 +0000
+++ src/platform/graphics/android/display_buffer.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -46,7 +46,7 @@
     void release_current();
     void post_update();
     bool can_bypass() const override;
-    
+
 private:
     std::shared_ptr<FramebufferBundle> const fb_bundle;
     std::shared_ptr<DisplayDevice> const display_device;

=== modified file 'src/platform/graphics/android/display_builder.h'
--- src/server/graphics/android/display_builder.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/display_builder.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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: Alexandros Frantzis <[e-mail]>
@@ -20,7 +20,7 @@
 #define MIR_GRAPHICS_ANDROID_DISPLAY_BUILDER_H_
 
 #include "mir/graphics/display_buffer.h"
-#include "mir/geometry/pixel_format.h"
+#include "mir_toolkit/common.h"
 #include <memory>
 
 namespace mir
@@ -37,7 +37,7 @@
 public:
     virtual ~DisplayBuilder() = default;
 
-    virtual geometry::PixelFormat display_format() = 0;
+    virtual MirPixelFormat display_format() = 0;
     virtual std::shared_ptr<DisplayDevice> create_display_device() = 0;
     virtual std::unique_ptr<graphics::DisplayBuffer> create_display_buffer(
         std::shared_ptr<DisplayDevice> const& display_device,

=== modified file 'src/platform/graphics/android/display_device.h'
--- src/server/graphics/android/display_device.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/display_device.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -38,7 +38,7 @@
 
     virtual void mode(MirPowerMode mode) = 0;
     virtual void prepare_composition() = 0;
-    virtual void gpu_render(EGLDisplay dpy, EGLSurface sur) = 0; 
+    virtual void gpu_render(EGLDisplay dpy, EGLSurface sur) = 0;
     virtual void post(Buffer const& buffer) = 0;
 
 protected:

=== modified file 'src/platform/graphics/android/display_resource_factory.h'
--- src/server/graphics/android/display_resource_factory.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/display_resource_factory.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>

=== modified file 'src/platform/graphics/android/fb_device.cpp'
--- src/server/graphics/android/fb_device.cpp	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/fb_device.cpp	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -39,6 +39,8 @@
     {
         fb_device->setSwapInterval(fb_device.get(), 1);
     }
+
+    mode(mir_power_mode_on);
 }
 
 void mga::FBDevice::prepare_composition()
@@ -65,6 +67,14 @@
 
 void mga::FBDevice::mode(MirPowerMode mode)
 {
-    // TODO: Implement
-    (void) mode;
+    int enable = 0;
+    if (mode == mir_power_mode_on)
+    {
+        enable = 1;
+    }
+    
+    if (fb_device->enableScreen)
+    {
+        fb_device->enableScreen(fb_device.get(), enable);
+    }
 }

=== modified file 'src/platform/graphics/android/fb_device.h'
--- src/server/graphics/android/fb_device.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/fb_device.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * 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]>
@@ -22,7 +22,7 @@
 #include "display_device.h"
 #include <hardware/gralloc.h>
 #include <hardware/fb.h>
- 
+
 namespace mir
 {
 namespace graphics
@@ -30,14 +30,14 @@
 namespace android
 {
 
-class FBDevice : public DisplayDevice 
+class FBDevice : public DisplayDevice
 {
 public:
     FBDevice(std::shared_ptr<framebuffer_device_t> const& fbdev);
 
     void mode(MirPowerMode mode);
     void prepare_composition();
-    void gpu_render(EGLDisplay dpy, EGLSurface sur); 
+    void gpu_render(EGLDisplay dpy, EGLSurface sur);
     void post(Buffer const& buffer);
 
 private:

=== modified file 'src/platform/graphics/android/framebuffer_bundle.h'
--- src/server/graphics/android/framebuffer_bundle.h	2013-11-21 17:20:14 +0000
+++ src/platform/graphics/android/framebuffer_bundle.h	2013-12-18 14:40:47 +0000
@@ -2,15 +2,15 @@
  * Copyright © 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,
+ * 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 General Public License for more details.
+ * GNU Lesser General Public License for more details.