Merge lp:~afrantzis/mir/build-options-for-tests into lp:mir/0.1

[Alexandros Frantzis]

build: Expose options to allow building but not running tests by default

build: Expose options to allow building but not running tests by default

=== modified file 'cmake/MirCommon.cmake'
--- cmake/MirCommon.cmake	2013-08-28 03:41:48 +0000
+++ cmake/MirCommon.cmake	2013-11-28 12:22:03 +0000
@@ -1,11 +1,14 @@
 cmake_minimum_required (VERSION 2.6)
 # Create target to discover tests
 
-option(
+include(CMakeDependentOption)
+
+CMAKE_DEPENDENT_OPTION(
   DISABLE_GTEST_TEST_DISCOVERY
   "If set to ON, disables fancy test autodiscovery and switches back to classic add_test behavior"
   OFF
-)
+  "NOT MIR_IS_CROSS_COMPILING"
+  ON)
 
 option(
   ENABLE_MEMCHECK_OPTION
@@ -19,15 +22,22 @@
     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)
 endif(ENABLE_MEMCHECK_OPTION)
 
 function (mir_discover_tests EXECUTABLE)
-  if(BUILD_ANDROID OR DISABLE_GTEST_TEST_DISCOVERY)
+  if(DISABLE_GTEST_TEST_DISCOVERY)
     add_test(${EXECUTABLE} ${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} "${EXECUTABLE_OUTPUT_PATH}/${EXECUTABLE}")
 
     if (${ARGC} GREATER 1)
@@ -74,7 +84,7 @@
 
 function (mir_add_memcheck_test)
   if (ENABLE_MEMCHECK_OPTION)
-      if(BUILD_ANDROID OR DISABLE_GTEST_TEST_DISCOVERY)
+      if(DISABLE_GTEST_TEST_DISCOVERY)
           ADD_TEST("memcheck-test" "sh" "-c" "${VALGRIND_EXECUTABLE} ${VALGRIND_ARGS} ${CMAKE_BINARY_DIR}/mir_gtest/mir_test_memory_error; if [ $? != 0 ]; then exit 0; else exit 1; fi")
       else()
         add_custom_target(
 
=== 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-11-28 12:22:03 +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-11-28 12:22:03 +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 'examples/eglapp.c'
--- examples/eglapp.c	2013-11-21 03:16:21 +0000
+++ examples/eglapp.c	2013-11-28 12:22:03 +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,6 +116,17 @@
     {
         running = 0;
     }
+    else if (ev->type == mir_event_type_resize)
+    {
+        /*
+         * 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);
+    }
 }
 
 static unsigned int get_bpp(MirPixelFormat pf)
@@ -172,7 +187,7 @@
     };
     MirEventDelegate delegate = 
     {
-        mir_eglapp_handle_input,
+        mir_eglapp_handle_event,
         NULL
     };
     EGLConfig eglconfig;
 
=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2013-09-19 13:24:22 +0000
+++ examples/fingerpaint.c	2013-11-28 12:22:03 +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-11-28 12:22:03 +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();
+            {
+                std::shared_ptr<mg::Buffer> tmp;
+                s->swap_buffers(tmp);
+                s->swap_buffers(tmp);
+            }
 
             /*
              * 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-11-28 12:22:03 +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-11-28 12:22:03 +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/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-11-28 12:22:03 +0000
@@ -35,7 +35,7 @@
 public:
     virtual ~InternalSurface() = default;
 
-    virtual std::shared_ptr<Buffer> advance_client_buffer() = 0;
+    virtual void swap_buffers(std::shared_ptr<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-11-28 12:22:03 +0000
@@ -41,7 +41,8 @@
 public:
     virtual ~BufferStream() = default;
 
-    virtual std::shared_ptr<graphics::Buffer> secure_client_buffer() = 0;
+    virtual void swap_client_buffers(std::shared_ptr<graphics::Buffer>& buffer) = 0;
+    virtual void release_client_buffer(std::shared_ptr<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;
 
=== 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-11-28 12:22:03 +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-11-28 12:22:03 +0000
@@ -35,7 +35,6 @@
 class Drawer;
 class DisplayBufferCompositorFactory;
 class Compositor;
-class OverlayRenderer;
 class RendererFactory;
 }
 namespace frontend
@@ -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
@@ -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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +0000
@@ -57,7 +57,7 @@
     virtual geometry::Size size() const = 0;
     virtual geometry::PixelFormat pixel_format() const = 0;
 
-    virtual std::shared_ptr<graphics::Buffer> advance_client_buffer() = 0;
+    virtual void swap_buffers(std::shared_ptr<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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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/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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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_configurator.h'
--- include/server/mir/shell/surface_configurator.h	2013-07-29 22:55:20 +0000
+++ include/server/mir/shell/surface_configurator.h	2013-11-28 12:22:03 +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_controller.h'
--- include/server/mir/shell/surface_controller.h	2013-11-21 12:34:49 +0000
+++ include/server/mir/shell/surface_controller.h	2013-11-28 12:22:03 +0000
@@ -24,7 +24,7 @@
 
 namespace mir
 {
-namespace scene 
+namespace scene
 {
 class BasicSurface;
 }
 
=== 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-11-28 12:22:03 +0000
@@ -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_depth(scene::DepthId const& new_depth);
-    
+
     SurfaceCreationParameters& with_input_mode(input::InputReceptionMode const& new_mode);
 
     SurfaceCreationParameters& with_output_id(graphics::DisplayConfigurationOutputId const& output_id);
 
=== 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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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_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-11-28 12:22:03 +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;
@@ -157,7 +163,7 @@
 typedef enum MirPlatformType
 {
     mir_platform_type_gbm,
-    mir_platform_type_android    
+    mir_platform_type_android
 } MirPlatformType;
 
 typedef struct MirPlatformPackage
@@ -184,7 +190,7 @@
 
 } MirGraphicsRegion;
 
-/** 
+/**
  * DEPRECATED. use MirDisplayConfiguration
  */
 enum { mir_supported_pixel_format_max = 32 };
@@ -192,7 +198,7 @@
 {
     uint32_t width;
     uint32_t height;
-    
+
     int supported_pixel_format_items;
     MirPixelFormat supported_pixel_format[mir_supported_pixel_format_max];
 } MirDisplayInfo;
@@ -240,7 +246,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 +263,7 @@
 
     uint32_t physical_width_mm;
     uint32_t physical_height_mm;
-    
+
     MirPowerMode power_mode;
 } MirDisplayOutput;
 
 
=== 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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +0000
@@ -39,7 +39,7 @@
         {
             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];
         }
     }
@@ -58,7 +58,7 @@
         {
             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-11-28 12:22:03 +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-11-28 12:22:03 +0000
@@ -34,7 +34,7 @@
 class MockAllocAdaptor : public graphics::android::GraphicAllocAdaptor
 {
 public:
-    MOCK_METHOD3(alloc_buffer, 
+    MOCK_METHOD3(alloc_buffer,
         std::shared_ptr<graphics::NativeBuffer>(geometry::Size, geometry::PixelFormat, 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-11-28 12:22:03 +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-11-28 12:22:03 +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_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-11-28 12:22:03 +0000
@@ -31,7 +31,8 @@
 {
 struct MockBufferStream : public compositor::BufferStream
 {
-    MOCK_METHOD0(secure_client_buffer, std::shared_ptr<graphics::Buffer>());
+    MOCK_METHOD1(swap_client_buffers, void(std::shared_ptr<graphics::Buffer>&));
+    MOCK_METHOD1(release_client_buffer, void(std::shared_ptr<graphics::Buffer>&));
     MOCK_METHOD1(lock_compositor_buffer,
                  std::shared_ptr<graphics::Buffer>(unsigned long));
     MOCK_METHOD0(lock_snapshot_buffer, std::shared_ptr<graphics::Buffer>());
 
=== 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-11-28 12:22:03 +0000
@@ -22,7 +22,7 @@
 #include "mir/graphics/buffer.h"
 #include "src/server/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-11-28 12:22:03 +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-11-28 12:22:03 +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_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-11-28 12:22:03 +0000
@@ -39,7 +39,7 @@
 
     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(std::shared_ptr<graphics::Buffer>&));
 
     MOCK_CONST_METHOD0(size, geometry::Size());
     MOCK_CONST_METHOD0(pixel_format, geometry::PixelFormat());
 
=== 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-11-28 12:22:03 +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_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-11-28 12:22:03 +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-11-28 12:22:03 +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_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-11-28 12:22:03 +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-11-28 12:22:03 +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_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-11-28 12:22:03 +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 {}
 };
 
=== 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-11-28 12:22:03 +0000
@@ -37,27 +37,30 @@
         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()
+    void swap_client_buffers(std::shared_ptr<graphics::Buffer>& buffer) override
+    {
+        buffer = stub_client_buffer;
+    }
+    void release_client_buffer(std::shared_ptr<graphics::Buffer>& buffer) override
+    {
+        buffer.reset();
+    }
+    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;
+    }
+
+    geometry::PixelFormat get_stream_pixel_format() override
     {
         return geometry::PixelFormat();
     }
 
-    geometry::Size stream_size()
+    geometry::Size stream_size() override
     {
         return geometry::Size();
     }
@@ -66,11 +69,11 @@
     {
     }
 
-    void force_requests_to_complete()
+    void force_requests_to_complete() override
     {
     }
 
-    void allow_framedropping(bool)
+    void allow_framedropping(bool) override
     {
     }
 
 
=== 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-11-28 12:22:03 +0000
@@ -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-11-28 12:22:03 +0000
@@ -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{
 
=== 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-11-28 12:22:03 +0000
@@ -19,7 +19,7 @@
 #define MIR_TEST_DOUBLES_STUB_DISPLAY_DEVICE_H_
 
 #include "src/server/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-11-28 12:22:03 +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-11-28 12:22:03 +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_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-11-28 12:22:03 +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/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-11-28 12:22:03 +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-11-28 12:22:03 +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 'native-compile.sh'
--- native-compile.sh	2012-11-19 19:21:52 +0000
+++ native-compile.sh	2013-11-28 12:22:03 +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/aging_buffer.h'
--- src/client/aging_buffer.h	2013-06-14 09:00:20 +0000
+++ src/client/aging_buffer.h	2013-11-28 12:22:03 +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_platform.cpp'
--- src/client/android/android_client_platform.cpp	2013-10-15 08:53:10 +0000
+++ src/client/android/android_client_platform.cpp	2013-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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/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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +0000
@@ -54,6 +54,7 @@
 {
 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;
@@ -62,6 +63,11 @@
     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_platform.h'
--- src/client/client_platform.h	2013-10-15 08:53:10 +0000
+++ src/client/client_platform.h	2013-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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;
 
=== renamed file 'src/client/gbm/drm_fd_handler.h' => 'src/client/gbm/buffer_file_ops.h'
--- src/client/gbm/drm_fd_handler.h	2013-04-24 05:22:20 +0000
+++ src/client/gbm/buffer_file_ops.h	2013-11-28 12:22:03 +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_GBM_BUFFER_FILE_OPS_
+#define MIR_CLIENT_GBM_BUFFER_FILE_OPS_
 
 #include <sys/types.h>
 
@@ -28,25 +28,23 @@
 namespace gbm
 {
 
-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_GBM_BUFFER_FILE_OPS_ */
 
=== modified file 'src/client/gbm/gbm_client_buffer.cpp'
--- src/client/gbm/gbm_client_buffer.cpp	2013-11-21 03:16:21 +0000
+++ src/client/gbm/gbm_client_buffer.cpp	2013-11-28 12:22:03 +0000
@@ -18,15 +18,13 @@
 
 #include "mir_toolkit/mir_client_library.h"
 #include "gbm_client_buffer.h"
-#include "drm_fd_handler.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>
 
@@ -37,71 +35,29 @@
 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,
+    ShmMemoryRegion(std::shared_ptr<mclg::BufferFileOps> const& buffer_file_ops,
+                    int buffer_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},
+        : 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,24 +66,23 @@
         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<mclg::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)),
+    std::shared_ptr<mclg::BufferFileOps> const& buffer_file_ops,
+    std::shared_ptr<MirBufferPackage> const& package,
+    geom::Size size, geom::PixelFormat pf)
+    : buffer_file_ops{buffer_file_ops},
+      creation_package{package},
       rect({geom::Point{0, 0}, size}),
       buffer_pf{pf}
 {
@@ -137,15 +92,15 @@
 {
     // 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()
 {
-    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());
 
=== modified file 'src/client/gbm/gbm_client_buffer.h'
--- src/client/gbm/gbm_client_buffer.h	2013-11-21 03:16:21 +0000
+++ src/client/gbm/gbm_client_buffer.h	2013-11-28 12:22:03 +0000
@@ -33,17 +33,17 @@
 namespace gbm
 {
 
-class DRMFDHandler;
+class BufferFileOps;
 
 class GBMClientBuffer : public AgingBuffer
 {
 public:
-    GBMClientBuffer(std::shared_ptr<DRMFDHandler> const& drm_fd_handler,
+    GBMClientBuffer(std::shared_ptr<BufferFileOps> const& buffer_file_ops,
                     std::shared_ptr<MirBufferPackage> const& buffer_package,
                     geometry::Size size,
                     geometry::PixelFormat pf);
 
-    virtual ~GBMClientBuffer() noexcept;
+    ~GBMClientBuffer() noexcept;
 
     std::shared_ptr<MemoryRegion> secure_for_cpu_write();
     geometry::Size size() const;
@@ -51,13 +51,11 @@
     geometry::PixelFormat 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;
+    geometry::PixelFormat const buffer_pf;
 };
 
 }
 
=== modified file 'src/client/gbm/gbm_client_buffer_factory.cpp'
--- src/client/gbm/gbm_client_buffer_factory.cpp	2013-11-21 03:16:21 +0000
+++ src/client/gbm/gbm_client_buffer_factory.cpp	2013-11-28 12:22:03 +0000
@@ -24,8 +24,8 @@
 namespace mclg=mir::client::gbm;
 
 mclg::GBMClientBufferFactory::GBMClientBufferFactory(
-        std::shared_ptr<DRMFDHandler> const& drm_fd_handler)
-    : drm_fd_handler{drm_fd_handler}
+    std::shared_ptr<BufferFileOps> const& buffer_file_ops)
+    : buffer_file_ops{buffer_file_ops}
 {
 }
 
@@ -33,7 +33,7 @@
 {
     (void)size; // TODO: remove this unused parameter
     return std::make_shared<mclg::GBMClientBuffer>(
-        drm_fd_handler,
+        buffer_file_ops,
         package,
         geometry::Size{package->width, package->height},
         pf);
 
=== modified file 'src/client/gbm/gbm_client_buffer_factory.h'
--- src/client/gbm/gbm_client_buffer_factory.h	2013-04-24 05:22:20 +0000
+++ src/client/gbm/gbm_client_buffer_factory.h	2013-11-28 12:22:03 +0000
@@ -32,17 +32,17 @@
 namespace gbm
 {
 
-class DRMFDHandler;
+class BufferFileOps;
 
 class GBMClientBufferFactory : public ClientBufferFactory
 {
 public:
-    explicit GBMClientBufferFactory(std::shared_ptr<DRMFDHandler> const& drm_fd_handler);
+    explicit GBMClientBufferFactory(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);
 private:
-    std::shared_ptr<DRMFDHandler> drm_fd_handler;
+    std::shared_ptr<BufferFileOps> const buffer_file_ops;
 };
 
 }
 
=== modified file 'src/client/gbm/gbm_client_platform.cpp'
--- src/client/gbm/gbm_client_platform.cpp	2013-10-15 08:53:10 +0000
+++ src/client/gbm/gbm_client_platform.cpp	2013-11-28 12:22:03 +0000
@@ -20,7 +20,7 @@
 #include "gbm_client_platform.h"
 #include "gbm_client_buffer_factory.h"
 #include "mesa_native_display_container.h"
-#include "drm_fd_handler.h"
+#include "buffer_file_ops.h"
 #include "gbm_native_surface.h"
 #include "../mir_connection.h"
 #include "../client_buffer_factory.h"
@@ -37,24 +37,9 @@
 namespace
 {
 
-class RealDRMFDHandler : public mclg::DRMFDHandler
+struct RealBufferFileOps : public mclg::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 +50,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,33 +83,24 @@
 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<mclg::GBMClientPlatform>(
+        context, buffer_file_ops, mcl::EGLNativeDisplayContainer::instance());
 }
 
 mclg::GBMClientPlatform::GBMClientPlatform(
         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()
 {
-    return std::make_shared<mclg::GBMClientBufferFactory>(drm_fd_handler);
+    return std::make_shared<mclg::GBMClientBufferFactory>(buffer_file_ops);
 }
 
 namespace
@@ -153,7 +126,7 @@
     //TODO: this is awkward on both android and gbm...
     auto gbm_window = new GBMNativeSurface(*client_surface);
     auto egl_native_window = new EGLNativeWindowType;
-    *egl_native_window = gbm_window; 
+    *egl_native_window = gbm_window;
     NativeWindowDeleter deleter(gbm_window);
     return std::shared_ptr<EGLNativeWindowType>(egl_native_window, deleter);
 }
@@ -169,8 +142,8 @@
 
 MirPlatformType mclg::GBMClientPlatform::platform_type() const
 {
-    return mir_platform_type_gbm; 
-} 
+    return mir_platform_type_gbm;
+}
 
 MirNativeBuffer* mclg::GBMClientPlatform::convert_native_buffer(graphics::NativeBuffer* buf) const
 {
 
=== modified file 'src/client/gbm/gbm_client_platform.h'
--- src/client/gbm/gbm_client_platform.h	2013-10-15 08:53:10 +0000
+++ src/client/gbm/gbm_client_platform.h	2013-11-28 12:22:03 +0000
@@ -30,16 +30,16 @@
 namespace gbm
 {
 
-class DRMFDHandler;
+class BufferFileOps;
 
 class GBMClientPlatform : public ClientPlatform
 {
 public:
     GBMClientPlatform(ClientContext* const context,
-                      std::shared_ptr<DRMFDHandler> const& drm_fd_handler,
+                      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;
 };
 
 
=== modified file 'src/client/gbm/gbm_native_surface.cpp'
--- src/client/gbm/gbm_native_surface.cpp	2013-06-28 00:25:30 +0000
+++ src/client/gbm/gbm_native_surface.cpp	2013-11-28 12:22:03 +0000
@@ -42,7 +42,7 @@
 {
     auto s = static_cast<mclg::GBMNativeSurface*>(surface);
     return s->set_swapinterval(interval);
-} 
+}
 
 static void buffer_advanced_callback(MirSurface*  /* surface */,
                                      void*  /* context */)
@@ -53,9 +53,9 @@
 mclg::GBMNativeSurface::GBMNativeSurface(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)
@@ -80,6 +80,6 @@
     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;
 }
 
=== 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-11-28 12:22:03 +0000
@@ -118,7 +118,7 @@
     std::stringstream ss;
 
     ss << "Received event:" << std::endl;
-    
+
     format_event(ss, event);
 
     logger->log<ml::Logger::debug>(ss.str(), component);
 
=== 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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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-11-28 12:22:03 +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++)
@@ -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/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-11-28 12:22:03 +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-11-28 12:22:03 +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/server/asio_main_loop.cpp'
--- src/server/asio_main_loop.cpp	2013-06-28 15:16:39 +0000
+++ src/server/asio_main_loop.cpp	2013-11-28 12:22:03 +0000
@@ -101,7 +101,7 @@
     std::function<void(int)> handler;
 };
 
-/* 
+/*
  * We need to define an empty constructor and destructor in the .cpp file,
  * so that we can use unique_ptr to hold SignalHandler. Otherwise, users
  * of AsioMainLoop end up creating default constructors and destructors
 
=== modified file 'src/server/compositor/buffer_stream_surfaces.cpp'
--- src/server/compositor/buffer_stream_surfaces.cpp	2013-11-21 03:16:21 +0000
+++ src/server/compositor/buffer_stream_surfaces.cpp	2013-11-28 12:22:03 +0000
@@ -49,19 +49,29 @@
     return std::make_shared<mc::TemporarySnapshotBuffer>(buffer_bundle);
 }
 
-std::shared_ptr<mg::Buffer> mc::BufferStreamSurfaces::secure_client_buffer()
-{
-    return std::make_shared<mc::TemporaryClientBuffer>(buffer_bundle);
+void mc::BufferStreamSurfaces::swap_client_buffers(std::shared_ptr<mg::Buffer>& buffer)
+{
+    release_client_buffer(buffer);
+    buffer = buffer_bundle->client_acquire();
+}
+
+void mc::BufferStreamSurfaces::release_client_buffer(std::shared_ptr<mg::Buffer>& buffer)
+{
+    if (buffer)
+    {
+        buffer_bundle->client_release(buffer);
+        buffer.reset();
+    }
 }
 
 geom::PixelFormat mc::BufferStreamSurfaces::get_stream_pixel_format()
 {
-    return buffer_bundle->properties().format; 
+    return buffer_bundle->properties().format;
 }
 
 geom::Size mc::BufferStreamSurfaces::stream_size()
 {
-    return buffer_bundle->properties().size; 
+    return buffer_bundle->properties().size;
 }
 
 void mc::BufferStreamSurfaces::resize(geom::Size const& size)
 
=== modified file 'src/server/compositor/buffer_stream_surfaces.h'
--- src/server/compositor/buffer_stream_surfaces.h	2013-11-21 12:34:49 +0000
+++ src/server/compositor/buffer_stream_surfaces.h	2013-11-28 12:22:03 +0000
@@ -39,17 +39,18 @@
     BufferStreamSurfaces(std::shared_ptr<BufferBundle> const& swapper);
     ~BufferStreamSurfaces();
 
-    std::shared_ptr<graphics::Buffer> secure_client_buffer();
+    void swap_client_buffers(std::shared_ptr<graphics::Buffer>& buffer) override;
+    void release_client_buffer(std::shared_ptr<graphics::Buffer>& buffer) override;
 
     std::shared_ptr<graphics::Buffer>
         lock_compositor_buffer(unsigned long frameno) override;
     std::shared_ptr<graphics::Buffer> lock_snapshot_buffer() override;
 
-    geometry::PixelFormat get_stream_pixel_format();
-    geometry::Size stream_size();
+    geometry::PixelFormat get_stream_pixel_format() override;
+    geometry::Size stream_size() override;
     void resize(geometry::Size const& size) override;
-    void allow_framedropping(bool);
-    void force_requests_to_complete();
+    void allow_framedropping(bool) override;
+    void force_requests_to_complete() override;
 
 protected:
     BufferStreamSurfaces(const BufferStreamSurfaces&) = delete;
 
=== modified file 'src/server/compositor/default_configuration.cpp'
--- src/server/compositor/default_configuration.cpp	2013-11-20 15:56:58 +0000
+++ src/server/compositor/default_configuration.cpp	2013-11-28 12:22:03 +0000
@@ -20,7 +20,6 @@
 #include "buffer_stream_factory.h"
 #include "default_display_buffer_compositor_factory.h"
 #include "multi_threaded_compositor.h"
-#include "overlay_renderer.h"
 #include "gl_renderer_factory.h"
 
 namespace mc = mir::compositor;
@@ -43,7 +42,7 @@
         [this]()
         {
             return std::make_shared<mc::DefaultDisplayBufferCompositorFactory>(
-                the_scene(), the_renderer_factory(), the_overlay_renderer());
+                the_scene(), the_renderer_factory());
         });
 }
 
@@ -59,22 +58,6 @@
         });
 }
 
-std::shared_ptr<mc::OverlayRenderer>
-mir::DefaultServerConfiguration::the_overlay_renderer()
-{
-    struct NullOverlayRenderer : public mc::OverlayRenderer
-    {
-        virtual void render(
-            geometry::Rectangle const&,
-            std::function<void(std::shared_ptr<void> const&)>) {}
-    };
-    return overlay_renderer(
-        [this]()
-        {
-            return std::make_shared<NullOverlayRenderer>();
-        });
-}
-
 std::shared_ptr<mc::RendererFactory> mir::DefaultServerConfiguration::the_renderer_factory()
 {
     return renderer_factory(
 
=== modified file 'src/server/compositor/default_display_buffer_compositor.cpp'
--- src/server/compositor/default_display_buffer_compositor.cpp	2013-11-21 03:16:21 +0000
+++ src/server/compositor/default_display_buffer_compositor.cpp	2013-11-28 12:22:03 +0000
@@ -19,7 +19,6 @@
 #include "default_display_buffer_compositor.h"
 
 #include "rendering_operator.h"
-#include "overlay_renderer.h"
 #include "mir/compositor/scene.h"
 #include "mir/compositor/compositing_criteria.h"
 #include "mir/graphics/display_buffer.h"
@@ -69,12 +68,10 @@
 mc::DefaultDisplayBufferCompositor::DefaultDisplayBufferCompositor(
     mg::DisplayBuffer& display_buffer,
     std::shared_ptr<mc::Scene> const& scene,
-    std::shared_ptr<mc::Renderer> const& renderer,
-    std::shared_ptr<mc::OverlayRenderer> const& overlay_renderer)
+    std::shared_ptr<mc::Renderer> const& renderer)
     : display_buffer(display_buffer),
       scene{scene},
       renderer{renderer},
-      overlay_renderer{overlay_renderer},
       local_frameno{global_frameno}
 {
 }
@@ -138,11 +135,10 @@
         mc::OcclusionMatch occlusion_match;
         scene->reverse_for_each_if(occlusion_search, occlusion_match);
 
-        renderer->clear(local_frameno);
-        mc::RenderingOperator applicator(*renderer, save_resource);
+        renderer->clear();
+        mc::RenderingOperator applicator(*renderer, save_resource, local_frameno);
         FilterForVisibleSceneInRegion selector(view_area, occlusion_match);
         scene->for_each_if(selector, applicator);
-        overlay_renderer->render(view_area, save_resource);
 
         display_buffer.post_update();
     }
 
=== modified file 'src/server/compositor/default_display_buffer_compositor.h'
--- src/server/compositor/default_display_buffer_compositor.h	2013-10-03 03:57:28 +0000
+++ src/server/compositor/default_display_buffer_compositor.h	2013-11-28 12:22:03 +0000
@@ -33,7 +33,6 @@
 
 class Scene;
 class Renderer;
-class OverlayRenderer;
 
 class DefaultDisplayBufferCompositor : public DisplayBufferCompositor
 {
@@ -41,8 +40,7 @@
     DefaultDisplayBufferCompositor(
         graphics::DisplayBuffer& display_buffer,
         std::shared_ptr<Scene> const& scene,
-        std::shared_ptr<Renderer> const& renderer,
-        std::shared_ptr<OverlayRenderer> const& overlay_renderer);
+        std::shared_ptr<Renderer> const& renderer);
 
     void composite() override;
 
@@ -51,7 +49,6 @@
 
     std::shared_ptr<Scene> const scene;
     std::shared_ptr<Renderer> const renderer;
-    std::shared_ptr<OverlayRenderer> const overlay_renderer;
 
     unsigned long local_frameno;
 };
 
=== modified file 'src/server/compositor/default_display_buffer_compositor_factory.cpp'
--- src/server/compositor/default_display_buffer_compositor_factory.cpp	2013-11-21 03:16:21 +0000
+++ src/server/compositor/default_display_buffer_compositor_factory.cpp	2013-11-28 12:22:03 +0000
@@ -28,11 +28,9 @@
 
 mc::DefaultDisplayBufferCompositorFactory::DefaultDisplayBufferCompositorFactory(
     std::shared_ptr<mc::Scene> const& scene,
-    std::shared_ptr<mc::RendererFactory> const& renderer_factory,
-    std::shared_ptr<mc::OverlayRenderer> const& overlay_renderer)
+    std::shared_ptr<mc::RendererFactory> const& renderer_factory)
     : scene{scene},
-      renderer_factory{renderer_factory},
-      overlay_renderer{overlay_renderer}
+      renderer_factory{renderer_factory}
 {
 }
 
@@ -41,8 +39,6 @@
     graphics::DisplayBuffer& display_buffer)
 {
     auto renderer = renderer_factory->create_renderer_for(display_buffer.view_area());
-    auto raw = new DefaultDisplayBufferCompositor{display_buffer, scene, std::move(renderer),
-                                                  overlay_renderer};
-
+    auto raw = new DefaultDisplayBufferCompositor{display_buffer, scene, std::move(renderer)};
     return std::unique_ptr<DisplayBufferCompositor>(raw);
 }
 
=== modified file 'src/server/compositor/default_display_buffer_compositor_factory.h'
--- src/server/compositor/default_display_buffer_compositor_factory.h	2013-11-21 03:16:21 +0000
+++ src/server/compositor/default_display_buffer_compositor_factory.h	2013-11-28 12:22:03 +0000
@@ -27,7 +27,6 @@
 namespace compositor
 {
 class RendererFactory;
-class OverlayRenderer;
 class Scene;
 
 // TODO this is ideally an implementation class. It is only in a public header
@@ -37,15 +36,13 @@
 public:
     DefaultDisplayBufferCompositorFactory(
         std::shared_ptr<Scene> const& scene,
-        std::shared_ptr<RendererFactory> const& renderer_factory,
-        std::shared_ptr<OverlayRenderer> const& overlay_renderer);
+        std::shared_ptr<RendererFactory> const& renderer_factory);
 
     std::unique_ptr<DisplayBufferCompositor> create_compositor_for(graphics::DisplayBuffer& display_buffer);
 
 private:
     std::shared_ptr<Scene> const scene;
     std::shared_ptr<RendererFactory> const renderer_factory;
-    std::shared_ptr<OverlayRenderer> const overlay_renderer;
 };
 
 }
 
=== modified file 'src/server/compositor/gl_renderer.cpp'
--- src/server/compositor/gl_renderer.cpp	2013-11-21 03:16:21 +0000
+++ src/server/compositor/gl_renderer.cpp	2013-11-28 12:22:03 +0000
@@ -26,6 +26,7 @@
 #include <boost/throw_exception.hpp>
 #include <stdexcept>
 
+namespace mg = mir::graphics;
 namespace mc = mir::compositor;
 namespace geom = mir::geometry;
 
@@ -235,15 +236,11 @@
 }
 
 mc::GLRenderer::GLRenderer(geom::Rectangle const& display_area)
-    : frameno{0}
 {
     resources.setup(display_area);
 }
 
-void mc::GLRenderer::render(
-    std::function<void(std::shared_ptr<void> const&)> save_resource,
-    CompositingCriteria const& criteria,
-    BufferStream& stream)
+void mc::GLRenderer::render(CompositingCriteria const& criteria, mg::Buffer& buffer) const
 {
     glUseProgram(resources.program);
 
@@ -273,9 +270,7 @@
     /* Use the renderable's texture */
     glBindTexture(GL_TEXTURE_2D, resources.texture);
 
-    auto region_resource = stream.lock_compositor_buffer(frameno);
-    region_resource->bind_to_texture();
-    save_resource(region_resource);
+    buffer.bind_to_texture();
 
     /* Draw */
     glEnableVertexAttribArray(resources.position_attr_loc);
@@ -285,9 +280,7 @@
     glDisableVertexAttribArray(resources.position_attr_loc);
 }
 
-void mc::GLRenderer::clear(unsigned long frame)
+void mc::GLRenderer::clear() const
 {
-    frameno = frame;
     glClear(GL_COLOR_BUFFER_BIT);
 }
-
 
=== modified file 'src/server/compositor/gl_renderer.h'
--- src/server/compositor/gl_renderer.h	2013-11-21 03:16:21 +0000
+++ src/server/compositor/gl_renderer.h	2013-11-28 12:22:03 +0000
@@ -33,10 +33,8 @@
 public:
     GLRenderer(geometry::Rectangle const& display_area);
 
-    /* From renderer */
-    void render(std::function<void(std::shared_ptr<void> const&)> save_resource,
-                                   CompositingCriteria const& info, BufferStream& stream);
-    void clear(unsigned long frameno) override;
+    void render(CompositingCriteria const& info, graphics::Buffer& buffer) const override;
+    void clear() const override;
 
     ~GLRenderer() noexcept {}
 
@@ -60,8 +58,6 @@
     };
 
     Resources resources;
-
-    unsigned long frameno;
 };
 
 }
 
=== removed file 'src/server/compositor/overlay_renderer.h'
--- src/server/compositor/overlay_renderer.h	2013-11-21 03:16:21 +0000
+++ src/server/compositor/overlay_renderer.h	1970-01-01 00:00:00 +0000
@@ -1,53 +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_COMPOSITOR_OVERLAY_RENDERER_H_
-#define MIR_COMPOSITOR_OVERLAY_RENDERER_H_
-
-#include <functional>
-#include <memory>
-
-namespace mir
-{
-namespace geometry
-{
-struct Rectangle;
-}
-
-namespace compositor
-{
-
-class OverlayRenderer
-{
-public:
-    virtual ~OverlayRenderer() = default;
-
-    virtual void render(
-        geometry::Rectangle const& view_area,
-        std::function<void(std::shared_ptr<void> const&)> save_resource) = 0;
-
-protected:
-    OverlayRenderer() = default;
-    OverlayRenderer& operator=(OverlayRenderer const&) = delete;
-    OverlayRenderer(OverlayRenderer const&) = delete;
-};
-
-}
-} // namespace mir
-
-#endif // MIR_COMPOSITOR_OVERLAY_RENDERER_H_
 
=== modified file 'src/server/compositor/renderer.h'
--- src/server/compositor/renderer.h	2013-11-21 03:16:21 +0000
+++ src/server/compositor/renderer.h	2013-11-28 12:22:03 +0000
@@ -19,14 +19,14 @@
 #ifndef MIR_COMPOSITOR_RENDERER_H_
 #define MIR_COMPOSITOR_RENDERER_H_
 
-#include <memory>
-#include <functional>
-
 namespace mir
 {
+namespace graphics
+{
+class Buffer;
+}
 namespace compositor
 {
-class BufferStream;
 class CompositingCriteria;
 
 class Renderer
@@ -34,9 +34,8 @@
 public:
     virtual ~Renderer() = default;
 
-    virtual void clear(unsigned long frameno) = 0;
-    virtual void render(std::function<void(std::shared_ptr<void> const&)> save_resource,
-                                           CompositingCriteria const& info, BufferStream& stream) = 0;
+    virtual void clear() const = 0;
+    virtual void render(CompositingCriteria const& info, graphics::Buffer& buffer) const = 0;
 
 protected:
     Renderer() = default;
 
=== modified file 'src/server/compositor/rendering_operator.cpp'
--- src/server/compositor/rendering_operator.cpp	2013-11-21 03:16:21 +0000
+++ src/server/compositor/rendering_operator.cpp	2013-11-28 12:22:03 +0000
@@ -17,22 +17,23 @@
  */
 
 #include "rendering_operator.h"
+#include "mir/compositor/buffer_stream.h"
 
 namespace mc=mir::compositor;
 
 mc::RenderingOperator::RenderingOperator(
     Renderer& renderer,
-    std::function<void(std::shared_ptr<void> const&)> save_resource) :
+    std::function<void(std::shared_ptr<void> const&)> save_resource,
+    unsigned long frameno) :
     renderer(renderer),
-    save_resource(save_resource)
-{
-}
-
-mc::RenderingOperator::~RenderingOperator()
+    save_resource(save_resource),
+    frameno(frameno)
 {
 }
 
 void mc::RenderingOperator::operator()(CompositingCriteria const& info, BufferStream& stream)
 {
-    renderer.render(save_resource, info, stream);
+    auto compositor_buffer = stream.lock_compositor_buffer(frameno);
+    renderer.render(info, *compositor_buffer);
+    save_resource(compositor_buffer);
 }
 
=== modified file 'src/server/compositor/rendering_operator.h'
--- src/server/compositor/rendering_operator.h	2013-11-21 03:16:21 +0000
+++ src/server/compositor/rendering_operator.h	2013-11-28 12:22:03 +0000
@@ -32,14 +32,18 @@
 class RenderingOperator : public OperatorForScene
 {
 public:
-    explicit RenderingOperator(Renderer& renderer, std::function<void(std::shared_ptr<void> const&)> save_resource);
-    ~RenderingOperator();
+    explicit RenderingOperator(
+        Renderer& renderer,
+        std::function<void(std::shared_ptr<void> const&)> save_resource,
+        unsigned long frameno);
+    ~RenderingOperator() = default;
 
     void operator()(CompositingCriteria const& info, BufferStream&);
 
 private:
     Renderer& renderer;
     std::function<void(std::shared_ptr<void> const&)> save_resource;
+    unsigned long const frameno;
 };
 
 }
 
=== modified file 'src/server/compositor/switching_bundle.cpp'
--- src/server/compositor/switching_bundle.cpp	2013-11-21 03:16:21 +0000
+++ src/server/compositor/switching_bundle.cpp	2013-11-28 12:22:03 +0000
@@ -203,7 +203,7 @@
          * but always uses 50% more memory. So try to avoid it when possible.
          */
 
-        int min_free = 
+        int min_free =
 #if 0  // FIXME: This memory optimization breaks timing tests
             (nbuffers > 2 && !overlapping_compositors) ?  nbuffers - 1 : 1;
 #else
 
=== modified file 'src/server/compositor/switching_bundle.h'
--- src/server/compositor/switching_bundle.h	2013-11-21 03:16:21 +0000
+++ src/server/compositor/switching_bundle.h	2013-11-28 12:22:03 +0000
@@ -35,7 +35,7 @@
 namespace compositor
 {
 
-class SwitchingBundle : public BufferBundle 
+class SwitchingBundle : public BufferBundle
 {
 public:
     enum {min_buffers = 1, max_buffers = 5};
 
=== modified file 'src/server/compositor/temporary_buffers.cpp'
--- src/server/compositor/temporary_buffers.cpp	2013-10-15 08:53:10 +0000
+++ src/server/compositor/temporary_buffers.cpp	2013-11-28 12:22:03 +0000
@@ -28,18 +28,6 @@
 {
 }
 
-mc::TemporaryClientBuffer::TemporaryClientBuffer(std::shared_ptr<BufferBundle> const& buffer_swapper)
-    : TemporaryBuffer(buffer_swapper->client_acquire()),
-      allocating_swapper(buffer_swapper)
-{
-}
-
-mc::TemporaryClientBuffer::~TemporaryClientBuffer()
-{
-    if (auto swapper = allocating_swapper.lock())
-        swapper->client_release(buffer);
-}
-
 mc::TemporaryCompositorBuffer::TemporaryCompositorBuffer(
     std::shared_ptr<BufferBundle> const& bun, unsigned long frameno)
     : TemporaryBuffer(bun->compositor_acquire(frameno)),
 
=== modified file 'src/server/compositor/temporary_buffers.h'
--- src/server/compositor/temporary_buffers.h	2013-10-15 08:53:10 +0000
+++ src/server/compositor/temporary_buffers.h	2013-11-28 12:22:03 +0000
@@ -48,16 +48,6 @@
     std::shared_ptr<mg::Buffer> const buffer;
 };
 
-class TemporaryClientBuffer : public TemporaryBuffer
-{
-public:
-    explicit TemporaryClientBuffer(std::shared_ptr<BufferBundle> const& buffer_swapper);
-    ~TemporaryClientBuffer();
-
-private:
-    std::weak_ptr<BufferBundle> const allocating_swapper;
-};
-
 class TemporaryCompositorBuffer : public TemporaryBuffer
 {
 public:
 
=== modified file 'src/server/default_server_configuration.cpp'
--- src/server/default_server_configuration.cpp	2013-11-21 12:34:49 +0000
+++ src/server/default_server_configuration.cpp	2013-11-28 12:22:03 +0000
@@ -90,7 +90,7 @@
         [this]() -> std::shared_ptr<mi::InputReport>
         {
             auto opt = the_options()->get(input_report_opt, off_opt_value);
-            
+
             if (opt == log_opt_value)
             {
                 return std::make_shared<ml::InputReport>(the_logger());
 
=== modified file 'src/server/frontend/event_sender.cpp'
--- src/server/frontend/event_sender.cpp	2013-10-15 08:53:10 +0000
+++ src/server/frontend/event_sender.cpp	2013-11-28 12:22:03 +0000
@@ -37,7 +37,7 @@
 void mfd::EventSender::handle_event(MirEvent const& e)
 {
     // Limit the types of events we wish to send over protobuf, for now.
-    if (e.type == mir_event_type_surface)
+    if (e.type != mir_event_type_key && e.type != mir_event_type_motion)
     {
         // In future we might send multiple events, or insert them into messages
         // containing other responses, but for now we send them individually.
 
=== modified file 'src/server/frontend/event_sender.h'
--- src/server/frontend/event_sender.h	2013-08-28 03:41:48 +0000
+++ src/server/frontend/event_sender.h	2013-11-28 12:22:03 +0000
@@ -47,7 +47,7 @@
 
     std::shared_ptr<MessageSender> const sender;
 };
- 
+
 }
 }
 }
 
=== modified file 'src/server/frontend/fd_sets.h'
--- src/server/frontend/fd_sets.h	2013-09-26 19:16:26 +0000
+++ src/server/frontend/fd_sets.h	2013-11-28 12:22:03 +0000
@@ -28,6 +28,6 @@
 {
 typedef std::initializer_list<std::vector<int32_t>> FdSets;
 }
-} // namespace mir 
+} // namespace mir
 
 #endif // MIR_FRONTEND_FD_SETS_H_
 
=== modified file 'src/server/frontend/message_receiver.h'
--- src/server/frontend/message_receiver.h	2013-08-28 03:41:48 +0000
+++ src/server/frontend/message_receiver.h	2013-11-28 12:22:03 +0000
@@ -13,7 +13,7 @@
  * 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]> 
+ * Authored by: Kevin DuBois <[e-mail]>
  */
 #ifndef MIR_FRONTEND_MESSAGE_RECEIVER_H_
 #define MIR_FRONTEND_MESSAGE_RECEIVER_H_
@@ -32,7 +32,7 @@
 public:
     //receive message from the socket. 'handler' will be called when 'buffer' has been filled with exactly 'size'
     typedef std::function<void(boost::system::error_code const&, size_t)> MirReadHandler;
-    virtual void async_receive_msg(MirReadHandler const& handler, boost::asio::streambuf& buffer, size_t size) = 0; 
+    virtual void async_receive_msg(MirReadHandler const& handler, boost::asio::streambuf& buffer, size_t size) = 0;
     virtual pid_t client_pid() = 0;
 
 protected:
 
=== modified file 'src/server/frontend/session_mediator.cpp'
--- src/server/frontend/session_mediator.cpp	2013-11-21 03:16:21 +0000
+++ src/server/frontend/session_mediator.cpp	2013-11-28 12:22:03 +0000
@@ -120,16 +120,13 @@
 {
     auto& tracker = client_buffer_tracker[surf_id];
     if (!tracker) tracker = std::make_shared<ClientBufferTracker>(client_buffer_cache_size);
-    
-    client_buffer_resource[surf_id].reset();
 
-    auto client_buffer = surface.advance_client_buffer();
+    auto& client_buffer = client_buffer_resource[surf_id];
+    surface.swap_buffers(client_buffer);
     auto id = client_buffer->id();
     auto need_full_ipc = !tracker->client_has(id);
     tracker->add(id);
 
-    client_buffer_resource[surf_id] = client_buffer;
-
     return std::tie(client_buffer, need_full_ipc);
 }
 
 
=== modified file 'src/server/frontend/session_mediator_android.cpp'
--- src/server/frontend/session_mediator_android.cpp	2013-11-21 03:16:21 +0000
+++ src/server/frontend/session_mediator_android.cpp	2013-11-28 12:22:03 +0000
@@ -31,7 +31,7 @@
 {
     {
         std::unique_lock<std::mutex> lock(session_mutex);
-        
+
         auto session = weak_session.lock();
 
         if (session.get() == nullptr)
 
=== modified file 'src/server/frontend/socket_messenger.cpp'
--- src/server/frontend/socket_messenger.cpp	2013-10-15 08:53:10 +0000
+++ src/server/frontend/socket_messenger.cpp	2013-11-28 12:22:03 +0000
@@ -39,9 +39,9 @@
 {
     struct ucred cr;
     socklen_t cl = sizeof(cr);
-    
+
     auto status = getsockopt(socket->native_handle(), SOL_SOCKET, SO_PEERCRED, &cr, &cl);
-    
+
     if (status)
         BOOST_THROW_EXCEPTION(std::runtime_error("Failed to query client socket credentials"));
     return cr.pid;
@@ -60,7 +60,7 @@
         static_cast<unsigned char>((size >> 8) & 0xff),
         static_cast<unsigned char>((size >> 0) & 0xff)
     };
-    
+
     std::unique_lock<std::mutex> lg(message_lock);
 
     whole_message.resize(sizeof header_bytes + size);
@@ -126,4 +126,4 @@
          buffer,
          boost::asio::transfer_exactly(size),
          handler);
-} 
+}
 
=== modified file 'src/server/frontend/socket_messenger.h'
--- src/server/frontend/socket_messenger.h	2013-10-15 08:53:10 +0000
+++ src/server/frontend/socket_messenger.h	2013-11-28 12:22:03 +0000
@@ -16,8 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#ifndef MIR_FRONTEND_SOCKET_MESSENGER_H_ 
-#define MIR_FRONTEND_SOCKET_MESSENGER_H_ 
+#ifndef MIR_FRONTEND_SOCKET_MESSENGER_H_
+#define MIR_FRONTEND_SOCKET_MESSENGER_H_
 #include "message_sender.h"
 #include "message_receiver.h"
 #include <mutex>
@@ -37,19 +37,19 @@
     void send(std::string const& body);
     void send(std::string const& body, FdSets const& fd_set);
 
-    void async_receive_msg(MirReadHandler const& handler, boost::asio::streambuf& buffer, size_t size); 
+    void async_receive_msg(MirReadHandler const& handler, boost::asio::streambuf& buffer, size_t size);
     pid_t client_pid();
 
 private:
     std::shared_ptr<boost::asio::local::stream_protocol::socket> socket;
-    
+
     std::mutex message_lock;
     std::vector<char> whole_message;
-    
+
     void send_fds_locked(std::unique_lock<std::mutex> const& lock, std::vector<int32_t> const& fds);
 };
 }
 }
 }
 
-#endif /* MIR_FRONTEND_SOCKET_MESSENGER_H_ */ 
+#endif /* MIR_FRONTEND_SOCKET_MESSENGER_H_ */
 
=== modified file 'src/server/frontend/socket_session.cpp'
--- src/server/frontend/socket_session.cpp	2013-08-28 03:41:48 +0000
+++ src/server/frontend/socket_session.cpp	2013-11-28 12:22:03 +0000
@@ -66,7 +66,7 @@
         connected_sessions->remove(id());
         BOOST_THROW_EXCEPTION(std::runtime_error(error.message()));
     }
-  
+
     unsigned char high_byte = message.sbumpc();
     unsigned char low_byte = message.sbumpc();
     size_t const body_size = (high_byte << 8) + low_byte;
 
=== modified file 'src/server/frontend/surface.cpp'
--- src/server/frontend/surface.cpp	2013-11-21 03:16:21 +0000
+++ src/server/frontend/surface.cpp	2013-11-28 12:22:03 +0000
@@ -37,9 +37,9 @@
         ForwardingInternalSurface(std::shared_ptr<Surface> const& surface) : surface(surface) {}
 
     private:
-        virtual std::shared_ptr<mg::Buffer> advance_client_buffer()
+        void swap_buffers(std::shared_ptr<graphics::Buffer>& buffer)
         {
-            return surface->advance_client_buffer();
+            surface->swap_buffers(buffer);
         }
         virtual mir::geometry::Size size() const { return surface->size(); }
         virtual MirPixelFormat pixel_format() const { return static_cast<MirPixelFormat>(surface->pixel_format()); }
 
=== modified file 'src/server/graphics/android/android_buffer_allocator.cpp'
--- src/server/graphics/android/android_buffer_allocator.cpp	2013-11-21 03:16:21 +0000
+++ src/server/graphics/android/android_buffer_allocator.cpp	2013-11-28 12:22:03 +0000
@@ -106,5 +106,5 @@
         case mg::BufferUsage::hardware:
         default:
             return mga::BufferUsage::use_hardware;
-    } 
+    }
 }
 
=== modified file 'src/server/graphics/android/android_display.h'
--- src/server/graphics/android/android_display.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/android_display.h	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/android_display_configuration.h'
--- src/server/graphics/android/android_display_configuration.h	2013-09-12 23:48:21 +0000
+++ src/server/graphics/android/android_display_configuration.h	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/android_platform.cpp'
--- src/server/graphics/android/android_platform.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/android_platform.cpp	2013-11-28 12:22:03 +0000
@@ -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++]);
 
=== modified file 'src/server/graphics/android/buffer.cpp'
--- src/server/graphics/android/buffer.cpp	2013-10-15 08:53:10 +0000
+++ src/server/graphics/android/buffer.cpp	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/display_buffer.h'
--- src/server/graphics/android/display_buffer.h	2013-11-18 22:44:06 +0000
+++ src/server/graphics/android/display_buffer.h	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/display_device.h'
--- src/server/graphics/android/display_device.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/display_device.h	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/fb_device.cpp'
--- src/server/graphics/android/fb_device.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/fb_device.cpp	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/fb_device.h'
--- src/server/graphics/android/fb_device.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/fb_device.h	2013-11-28 12:22:03 +0000
@@ -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/server/graphics/android/framebuffers.cpp'
--- src/server/graphics/android/framebuffers.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/framebuffers.cpp	2013-11-28 12:22:03 +0000
@@ -55,7 +55,7 @@
     {
         int visual_id;
         eglGetConfigAttrib(egl_display, fb_egl_config, EGL_NATIVE_VISUAL_ID, &visual_id);
-        fb_format = mga::to_mir_format(visual_id); 
+        fb_format = mga::to_mir_format(visual_id);
     }
     else
     {
@@ -76,7 +76,7 @@
     auto rc = hwc_device->getDisplayConfigs(hwc_device.get(), HWC_DISPLAY_PRIMARY, &primary_display_config, &num_configs);
     if (rc != 0)
     {
-        BOOST_THROW_EXCEPTION(std::runtime_error("could not determine hwc display config")); 
+        BOOST_THROW_EXCEPTION(std::runtime_error("could not determine hwc display config"));
     }
     static uint32_t size_request[3] = { HWC_DISPLAY_WIDTH,
                                         HWC_DISPLAY_HEIGHT,
@@ -94,7 +94,7 @@
     std::shared_ptr<mga::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<hwc_composer_device_1> const& hwc)
     : format(determine_hwc11_fb_format()),
-      size(determine_hwc11_size(hwc)) 
+      size(determine_hwc11_size(hwc))
 {
     for(auto i = 0u; i < 2; i++)
     {
@@ -106,7 +106,7 @@
     std::shared_ptr<mga::GraphicBufferAllocator> const& buffer_allocator,
     std::shared_ptr<framebuffer_device_t> const& fb)
     : format{mga::to_mir_format(fb->format)},
-      size({fb->width, fb->height}) 
+      size({fb->width, fb->height})
 {
     //guarantee always 2 fb's allocated
     auto fb_num = static_cast<unsigned int>(fb->numFramebuffers);
@@ -154,5 +154,5 @@
 
 void mga::Framebuffers::wait_for_consumed_buffer(bool)
 {
-    //TODO: change swapping so buffer_for_render() does not wait 
+    //TODO: change swapping so buffer_for_render() does not wait
 }
 
=== modified file 'src/server/graphics/android/gl_context.cpp'
--- src/server/graphics/android/gl_context.cpp	2013-11-15 20:34:17 +0000
+++ src/server/graphics/android/gl_context.cpp	2013-11-28 12:22:03 +0000
@@ -115,7 +115,7 @@
                   eglCreateContext(egl_display, egl_config, EGL_NO_CONTEXT, default_egl_context_attr)},
       egl_surface{egl_display,
                     eglCreatePbufferSurface(egl_display, egl_config, dummy_pbuffer_attribs)}
-{    
+{
     report.report_egl_configuration(egl_display, egl_config);
 }
 
 
=== modified file 'src/server/graphics/android/hwc10_device.h'
--- src/server/graphics/android/hwc10_device.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/hwc10_device.h	2013-11-28 12:22:03 +0000
@@ -39,7 +39,7 @@
                 std::shared_ptr<HWCVsyncCoordinator> const& coordinator);
 
     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/server/graphics/android/hwc11_device.h'
--- src/server/graphics/android/hwc11_device.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/hwc11_device.h	2013-11-28 12:22:03 +0000
@@ -43,7 +43,7 @@
                 std::shared_ptr<HWCVsyncCoordinator> const& coordinator);
 
     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/server/graphics/android/hwc_common_device.cpp'
--- src/server/graphics/android/hwc_common_device.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/hwc_common_device.cpp	2013-11-28 12:22:03 +0000
@@ -77,18 +77,18 @@
 
     //note: mir_power_mode_standby, mir_power_mode_suspend, mir_power_mode_off
     //      are all treated like mir_power_mode_off
-    if ((mode_request == mir_power_mode_suspend) || 
+    if ((mode_request == mir_power_mode_suspend) ||
         (mode_request == mir_power_mode_standby))
     {
         mode_request = mir_power_mode_off;
     }
 
-    if ((mode_request == mir_power_mode_on) && 
+    if ((mode_request == mir_power_mode_on) &&
         (current_mode == mir_power_mode_off))
     {
         err = turn_screen_on();
     }
-    else if ((mode_request == mir_power_mode_off) && 
+    else if ((mode_request == mir_power_mode_off) &&
              (current_mode == mir_power_mode_on))
     {
         err = turn_screen_off();
@@ -96,15 +96,15 @@
 
     if (err)
     {
-        std::string blanking_status_msg = "Could not " + 
+        std::string blanking_status_msg = "Could not " +
             ((mode_request == mir_power_mode_off) ? std::string("blank") : std::string("unblank")) + " display";
         BOOST_THROW_EXCEPTION(
             boost::enable_error_info(
                 std::runtime_error(blanking_status_msg)) <<
             boost::errinfo_errno(-err));
     }
-   
-    current_mode = mode_request; 
+
+    current_mode = mode_request;
     blanked_cond.notify_all();
 }
 
 
=== modified file 'src/server/graphics/android/hwc_common_device.h'
--- src/server/graphics/android/hwc_common_device.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/hwc_common_device.h	2013-11-28 12:22:03 +0000
@@ -65,7 +65,7 @@
 
     std::mutex blanked_mutex;
     std::condition_variable blanked_cond;
-    MirPowerMode current_mode; 
+    MirPowerMode current_mode;
 };
 
 }
 
=== modified file 'src/server/graphics/android/hwc_layerlist.cpp'
--- src/server/graphics/android/hwc_layerlist.cpp	2013-11-21 03:16:21 +0000
+++ src/server/graphics/android/hwc_layerlist.cpp	2013-11-28 12:22:03 +0000
@@ -28,14 +28,14 @@
 
 mga::HWCLayer& mga::HWCLayer::operator=(HWCLayer const& layer)
 {
-    memcpy(this, &layer, sizeof(HWCLayer)); 
+    memcpy(this, &layer, sizeof(HWCLayer));
     this->visibleRegionScreen = {1, &this->visible_rect};
-    return *this;     
+    return *this;
 }
 
 mga::HWCLayer::HWCLayer(HWCLayer const& layer)
 {
-    memcpy(this, &layer, sizeof(HWCLayer)); 
+    memcpy(this, &layer, sizeof(HWCLayer));
     this->visibleRegionScreen = {1, &this->visible_rect};
 }
 
@@ -59,6 +59,8 @@
     visibleRegionScreen.numRects=1;
     visibleRegionScreen.rects= &visible_rect;
     handle = buffer_handle;
+
+    memset(&reserved, 0, sizeof(reserved));
 }
 
 mga::FramebufferLayer::FramebufferLayer()
@@ -92,7 +94,7 @@
     auto i = 0u;
     for(auto& layer : layer_list)
     {
-        hwc_representation->hwLayers[i++] = layer;        
+        hwc_representation->hwLayers[i++] = layer;
     }
     hwc_representation->numHwLayers = layer_list.size();
     hwc_representation->retireFenceFd = -1;
@@ -102,7 +104,7 @@
     //these fields are deprecated in hwc1.1 and later.
     hwc_representation->dpy = reinterpret_cast<void*>(0xDECAF);
     hwc_representation->sur = reinterpret_cast<void*>(0xC0FFEE);
-    
+
 }
 
 void mga::LayerList::set_fb_target(std::shared_ptr<NativeBuffer> const& native_buffer)
@@ -119,7 +121,7 @@
 mga::NativeFence mga::LayerList::framebuffer_fence()
 {
     auto fb_position = hwc_representation->numHwLayers - 1;
-    return hwc_representation->hwLayers[fb_position].releaseFenceFd; 
+    return hwc_representation->hwLayers[fb_position].releaseFenceFd;
 }
 
 hwc_display_contents_1_t* mga::LayerList::native_list() const
 
=== modified file 'src/server/graphics/android/hwc_vsync.cpp'
--- src/server/graphics/android/hwc_vsync.cpp	2013-05-16 19:16:56 +0000
+++ src/server/graphics/android/hwc_vsync.cpp	2013-11-28 12:22:03 +0000
@@ -23,7 +23,7 @@
     : vsync_occurred(false)
 {
 }
-    
+
 void mga::HWCVsync::wait_for_vsync()
 {
     std::unique_lock<std::mutex> lk(vsync_wait_mutex);
 
=== modified file 'src/server/graphics/android/hwc_vsync.h'
--- src/server/graphics/android/hwc_vsync.h	2013-05-16 19:04:50 +0000
+++ src/server/graphics/android/hwc_vsync.h	2013-11-28 12:22:03 +0000
@@ -34,7 +34,7 @@
 {
 public:
     HWCVsync();
-    
+
     void wait_for_vsync();
     void notify_vsync();
 private:
 
=== modified file 'src/server/graphics/android/hwc_vsync_coordinator.h'
--- src/server/graphics/android/hwc_vsync_coordinator.h	2013-05-20 15:29:28 +0000
+++ src/server/graphics/android/hwc_vsync_coordinator.h	2013-11-28 12:22:03 +0000
@@ -30,7 +30,7 @@
 {
 public:
     virtual ~HWCVsyncCoordinator() = default;
-    
+
     virtual void wait_for_vsync() = 0;
     virtual void notify_vsync() = 0;
 
 
=== modified file 'src/server/graphics/android/internal_client.cpp'
--- src/server/graphics/android/internal_client.cpp	2013-09-20 13:19:03 +0000
+++ src/server/graphics/android/internal_client.cpp	2013-11-28 12:22:03 +0000
@@ -37,7 +37,7 @@
     if (!client_windows[surface])
     {
         auto cache = std::make_shared<mga::InterpreterCache>();
-        auto interpreter = std::make_shared<mga::InternalClientWindow>(surface, cache); 
+        auto interpreter = std::make_shared<mga::InternalClientWindow>(surface, cache);
         client_windows[surface] = std::make_shared<mga::MirNativeWindow>(interpreter);
     }
 
 
=== modified file 'src/server/graphics/android/internal_client_window.cpp'
--- src/server/graphics/android/internal_client_window.cpp	2013-10-15 08:53:10 +0000
+++ src/server/graphics/android/internal_client_window.cpp	2013-11-28 12:22:03 +0000
@@ -40,7 +40,8 @@
 
 mg::NativeBuffer* mga::InternalClientWindow::driver_requests_buffer()
 {
-    auto buffer = surface->advance_client_buffer();
+    std::shared_ptr<graphics::Buffer> buffer;
+    surface->swap_buffers(buffer);
     auto handle = buffer->native_buffer_handle();
     resource_cache->store_buffer(buffer, handle);
     return handle.get();
@@ -74,7 +75,7 @@
         case NATIVE_WINDOW_FORMAT:
             return format;
         case NATIVE_WINDOW_TRANSFORM_HINT:
-            return 0; 
+            return 0;
         case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS:
             return 1;
         default:
 
=== modified file 'src/server/graphics/android/internal_client_window.h'
--- src/server/graphics/android/internal_client_window.h	2013-10-15 08:53:10 +0000
+++ src/server/graphics/android/internal_client_window.h	2013-11-28 12:22:03 +0000
@@ -42,7 +42,7 @@
     void driver_returns_buffer(ANativeWindowBuffer*, int);
     void dispatch_driver_request_format(int);
     int  driver_requests_info(int) const;
-    void sync_to_display(bool sync); 
+    void sync_to_display(bool sync);
 
 private:
     std::shared_ptr<InternalSurface> const surface;
 
=== modified file 'src/server/graphics/android/interpreter_cache.cpp'
--- src/server/graphics/android/interpreter_cache.cpp	2013-10-15 08:53:10 +0000
+++ src/server/graphics/android/interpreter_cache.cpp	2013-11-28 12:22:03 +0000
@@ -34,7 +34,7 @@
 
 std::shared_ptr<mg::Buffer> mga::InterpreterCache::retrieve_buffer(ANativeWindowBuffer* returned_handle)
 {
-    auto buffer_it = buffers_in_driver.find(returned_handle); 
+    auto buffer_it = buffers_in_driver.find(returned_handle);
     auto native_it = native_buffers.find(returned_handle);
 
     if ((buffer_it == buffers_in_driver.end()) ||
 
=== modified file 'src/server/graphics/android/output_builder.cpp'
--- src/server/graphics/android/output_builder.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/output_builder.cpp	2013-11-28 12:22:03 +0000
@@ -75,7 +75,7 @@
 
 std::shared_ptr<mga::DisplayDevice> mga::OutputBuilder::create_display_device()
 {
-    std::shared_ptr<mga::DisplayDevice> device; 
+    std::shared_ptr<mga::DisplayDevice> device;
     if (force_backup_display)
     {
         device = res_factory->create_fb_device(fb_native);
@@ -104,5 +104,5 @@
 {
     auto native_window = res_factory->create_native_window(framebuffers);
     return std::unique_ptr<mg::DisplayBuffer>(
-        new DisplayBuffer(framebuffers, display_device, native_window, gl_context)); 
+        new DisplayBuffer(framebuffers, display_device, native_window, gl_context));
 }
 
=== modified file 'src/server/graphics/android/resource_factory.cpp'
--- src/server/graphics/android/resource_factory.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/resource_factory.cpp	2013-11-28 12:22:03 +0000
@@ -45,7 +45,7 @@
     auto rc = hw_get_module(GRALLOC_HARDWARE_MODULE_ID, &module);
     if ((rc != 0) || (module == nullptr) || (framebuffer_open(module, &fbdev_raw) != 0) )
     {
-        BOOST_THROW_EXCEPTION(std::runtime_error("display factory cannot create fb display")); 
+        BOOST_THROW_EXCEPTION(std::runtime_error("display factory cannot create fb display"));
     }
 
     return std::shared_ptr<framebuffer_device_t>(fbdev_raw,
@@ -65,7 +65,7 @@
        module->methods->open(module, HWC_HARDWARE_COMPOSER, reinterpret_cast<hw_device_t**>(&hwc_device_raw)) ||
        (hwc_device_raw == nullptr))
     {
-        BOOST_THROW_EXCEPTION(std::runtime_error("error opening hwc hal")); 
+        BOOST_THROW_EXCEPTION(std::runtime_error("error opening hwc hal"));
     }
 
     return std::shared_ptr<hwc_composer_device_1>(
@@ -78,7 +78,7 @@
 {
     auto cache = std::make_shared<mga::InterpreterCache>();
     auto interpreter = std::make_shared<ServerRenderWindow>(fb_bundle, cache);
-    return std::make_shared<MirNativeWindow>(interpreter); 
+    return std::make_shared<MirNativeWindow>(interpreter);
 }
 
 std::shared_ptr<mga::DisplayDevice> mga::ResourceFactory::create_fb_device(
 
=== modified file 'src/server/graphics/android/server_render_window.cpp'
--- src/server/graphics/android/server_render_window.cpp	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/server_render_window.cpp	2013-11-28 12:22:03 +0000
@@ -77,7 +77,7 @@
         case NATIVE_WINDOW_FORMAT:
             return format;
         case NATIVE_WINDOW_TRANSFORM_HINT:
-            return 0; 
+            return 0;
         case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS:
             return 1;
         default:
 
=== modified file 'src/server/graphics/android/server_render_window.h'
--- src/server/graphics/android/server_render_window.h	2013-11-21 17:20:14 +0000
+++ src/server/graphics/android/server_render_window.h	2013-11-28 12:22:03 +0000
@@ -34,7 +34,7 @@
 
 class FramebufferBundle;
 class InterpreterResourceCache;
-class ServerRenderWindow : public AndroidDriverInterpreter 
+class ServerRenderWindow : public AndroidDriverInterpreter
 {
 public:
     ServerRenderWindow(std::shared_ptr<FramebufferBundle> const& fb_bundle,
@@ -50,7 +50,7 @@
     std::shared_ptr<FramebufferBundle> const fb_bundle;
     std::shared_ptr<InterpreterResourceCache> const resource_cache;
     int format;
-}; 
+};
 
 }
 }
 
=== modified file 'src/server/graphics/gbm/CMakeLists.txt'
--- src/server/graphics/gbm/CMakeLists.txt	2013-11-21 03:16:21 +0000
+++ src/server/graphics/gbm/CMakeLists.txt	2013-11-28 12:22:03 +0000
@@ -15,7 +15,7 @@
   mirplatformgraphics SHARED
 
   gbm_platform.cpp
-  gbm_buffer_allocator.cpp
+  buffer_allocator.cpp
   gbm_buffer.cpp
   gbm_cursor.cpp
   gbm_display_helpers.cpp
@@ -34,6 +34,8 @@
   udev_wrapper.cpp
   overlapping_output_grouping.cpp
   native_gbm_platform.cpp
+  anonymous_shm_file.cpp
+  shm_buffer.cpp
 )
 
 target_link_libraries(
 
=== added file 'src/server/graphics/gbm/anonymous_shm_file.cpp'
--- src/server/graphics/gbm/anonymous_shm_file.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/gbm/anonymous_shm_file.cpp	2013-11-28 12:22:03 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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:
+ *   Alexandros Frantzis <[e-mail]>
+ */
+
+#include "anonymous_shm_file.h"
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+
+#include <vector>
+
+#include <cstdlib>
+#include <cstring>
+#include <sys/mman.h>
+#include <fcntl.h>
+
+namespace mgg = mir::graphics::gbm;
+
+namespace
+{
+
+mgg::detail::FdHandle create_anonymous_file(size_t size)
+{
+    char const* const tmpl = "/mir-buffer-XXXXXX";
+    char const* const runtime_dir = getenv("XDG_RUNTIME_DIR");
+    char const* const target_dir = runtime_dir ? runtime_dir : "/tmp";
+
+    /* We need a mutable array for mkostemp */
+    std::vector<char> path(target_dir, target_dir + strlen(target_dir));
+    path.insert(path.end(), tmpl, tmpl + strlen(tmpl));
+    path.push_back('\0');
+
+    mgg::detail::FdHandle fd{mkostemp(path.data(), O_CLOEXEC)};
+    if (unlink(path.data()) < 0)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to unlink temporary file"));
+    if (ftruncate(fd, size) < 0)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to resize temporary file"));
+
+    return fd;
+}
+
+}
+
+/*************
+ * FdHandle *
+ *************/
+
+mgg::detail::FdHandle::FdHandle(int fd)
+    : fd{fd}
+{
+    if (fd < 0)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to create file"));
+}
+
+mgg::detail::FdHandle::FdHandle(FdHandle&& other)
+    : fd{other.fd}
+{
+    other.fd = -1;
+}
+
+mgg::detail::FdHandle::~FdHandle() noexcept
+{
+    if (fd >= 0)
+        close(fd);
+}
+
+mgg::detail::FdHandle::operator int() const
+{
+    return fd;
+}
+
+/*************
+ * MapHandle *
+ *************/
+
+mgg::detail::MapHandle::MapHandle(int fd, size_t size)
+    : size{size},
+      mapping{mmap(nullptr, size, PROT_READ|PROT_WRITE,
+                   MAP_SHARED, fd, 0)}
+{
+    if (mapping == MAP_FAILED)
+        BOOST_THROW_EXCEPTION(std::runtime_error("Failed to map file"));
+}
+
+mgg::detail::MapHandle::~MapHandle() noexcept
+{
+    munmap(mapping, size);
+}
+
+mgg::detail::MapHandle::operator void*() const
+{
+    return mapping;
+
+}
+
+/********************
+ * AnonymousShmFile *
+ ********************/
+
+mgg::AnonymousShmFile::AnonymousShmFile(size_t size)
+    : fd_{create_anonymous_file(size)},
+      mapping{fd_, size}
+{
+}
+
+void* mgg::AnonymousShmFile::base_ptr() const
+{
+    return mapping;
+}
+
+int mgg::AnonymousShmFile::fd() const
+{
+    return fd_;
+}
 
=== added file 'src/server/graphics/gbm/anonymous_shm_file.h'
--- src/server/graphics/gbm/anonymous_shm_file.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/gbm/anonymous_shm_file.h	2013-11-28 12:22:03 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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:
+ *   Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_GBM_ANONYMOUS_SHM_FILE_H_
+#define MIR_GRAPHICS_GBM_ANONYMOUS_SHM_FILE_H_
+
+#include "shm_file.h"
+
+namespace mir
+{
+namespace graphics
+{
+namespace gbm
+{
+
+namespace detail
+{
+class FdHandle
+{
+public:
+    FdHandle(int fd);
+    FdHandle(FdHandle&&);
+    ~FdHandle() noexcept;
+
+    operator int() const;
+
+private:
+    FdHandle(FdHandle const&) = delete;
+    FdHandle& operator=(FdHandle const&) = delete;
+    int fd;
+};
+
+class MapHandle
+{
+public:
+    MapHandle(int fd, size_t size);
+    ~MapHandle() noexcept;
+
+    operator void*() const;
+
+private:
+    MapHandle(MapHandle const&) = delete;
+    MapHandle& operator=(MapHandle const&) = delete;
+    size_t const size;
+    void* const mapping;
+};
+}
+
+class AnonymousShmFile : public ShmFile
+{
+public:
+    AnonymousShmFile(size_t size);
+
+    void* base_ptr() const;
+    int fd() const;
+
+private:
+    detail::FdHandle const fd_;
+    detail::MapHandle const mapping;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_GBM_ANONYMOUS_SHM_FILE_H_ */
 
=== modified file 'src/server/graphics/gbm/black_arrow.c'
--- src/server/graphics/gbm/black_arrow.c	2013-06-11 08:10:28 +0000
+++ src/server/graphics/gbm/black_arrow.c	2013-11-28 12:22:03 +0000
@@ -3,7 +3,7 @@
 static const struct {
   unsigned int 	 width;
   unsigned int 	 height;
-  unsigned int 	 bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ 
+  unsigned int 	 bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */
   unsigned char	 pixel_data[64 * 64 * 4 + 1];
 } black_arrow = {
   64, 64, 4,
 
=== renamed file 'src/server/graphics/gbm/gbm_buffer_allocator.cpp' => 'src/server/graphics/gbm/buffer_allocator.cpp'
--- src/server/graphics/gbm/gbm_buffer_allocator.cpp	2013-11-20 17:13:18 +0000
+++ src/server/graphics/gbm/buffer_allocator.cpp	2013-11-28 12:22:03 +0000
@@ -17,10 +17,12 @@
  *   Christopher James Halse Rogers <[e-mail]>
  */
 
-#include "gbm_buffer_allocator.h"
+#include "buffer_allocator.h"
 #include "gbm_buffer.h"
 #include "gbm_platform.h"
 #include "buffer_texture_binder.h"
+#include "anonymous_shm_file.h"
+#include "shm_buffer.h"
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/egl_extensions.h"
 #include "mir/graphics/buffer_properties.h"
@@ -106,12 +108,12 @@
 
 }
 
-mgg::GBMBufferAllocator::GBMBufferAllocator(
-        gbm_device* device,
-        const std::shared_ptr<BufferInitializer>& buffer_initializer)
-        : device(device),
-          buffer_initializer(buffer_initializer),
-          egl_extensions(std::make_shared<mg::EGLExtensions>())
+mgg::BufferAllocator::BufferAllocator(
+    gbm_device* device,
+    const std::shared_ptr<BufferInitializer>& buffer_initializer)
+    : device(device),
+      buffer_initializer(buffer_initializer),
+      egl_extensions(std::make_shared<mg::EGLExtensions>())
 {
     assert(buffer_initializer.get() != 0);
 
@@ -119,11 +121,25 @@
     bypass_env = env ? env[0] != '0' : true;
 }
 
-std::shared_ptr<mg::Buffer> mgg::GBMBufferAllocator::alloc_buffer(BufferProperties const& buffer_properties)
+std::shared_ptr<mg::Buffer> mgg::BufferAllocator::alloc_buffer(
+    BufferProperties const& buffer_properties)
+{
+    std::shared_ptr<mg::Buffer> buffer;
+
+    if (buffer_properties.usage == BufferUsage::software)
+        buffer = alloc_software_buffer(buffer_properties);
+    else
+        buffer = alloc_hardware_buffer(buffer_properties);
+
+    return buffer;
+}
+
+std::shared_ptr<mg::Buffer> mgg::BufferAllocator::alloc_hardware_buffer(
+    BufferProperties const& buffer_properties)
 {
     uint32_t bo_flags{GBM_BO_USE_RENDERING};
 
-    uint32_t gbm_format = mgg::mir_format_to_gbm_format(buffer_properties.format);
+    uint32_t const gbm_format = mgg::mir_format_to_gbm_format(buffer_properties.format);
 
     if (!is_pixel_format_supported(buffer_properties.format) ||
         gbm_format == mgg::invalid_gbm_format)
@@ -132,10 +148,6 @@
             std::runtime_error("Trying to create GBM buffer with unsupported pixel format"));
     }
 
-    /* Create the GBM buffer object */
-    if (buffer_properties.usage == BufferUsage::software)
-        bo_flags |= GBM_BO_USE_WRITE;
-
     /*
      * Bypass is generally only beneficial to hardware buffers where the
      * blitting happens on the GPU. For software buffers it is slower to blit
@@ -149,7 +161,6 @@
      *       mir_surface_state_fullscreen later when it's fully wired up.
      */
     if (bypass_env &&
-        buffer_properties.usage == BufferUsage::hardware &&
         buffer_properties.size.width.as_uint32_t() >= 800 &&
         buffer_properties.size.height.as_uint32_t() >= 600)
     {
@@ -172,14 +183,42 @@
         new EGLImageBufferTextureBinder{bo, egl_extensions}};
 
     /* Create the GBMBuffer */
-    std::shared_ptr<mg::Buffer> buffer{new GBMBuffer{bo, bo_flags, std::move(texture_binder)}};
-
-    (*buffer_initializer)(*buffer);
-
-    return buffer;
-}
-
-std::vector<geom::PixelFormat> mgg::GBMBufferAllocator::supported_pixel_formats()
+    auto const buffer =
+        std::make_shared<GBMBuffer>(bo, bo_flags, std::move(texture_binder));
+
+    (*buffer_initializer)(*buffer);
+
+    return buffer;
+}
+
+std::shared_ptr<mg::Buffer> mgg::BufferAllocator::alloc_software_buffer(
+    BufferProperties const& buffer_properties)
+{
+    if (!is_pixel_format_supported(buffer_properties.format))
+    {
+        BOOST_THROW_EXCEPTION(
+            std::runtime_error(
+                "Trying to create SHM buffer with unsupported pixel format"));
+    }
+
+    auto const stride = geom::Stride{
+        geom::bytes_per_pixel(buffer_properties.format) *
+        buffer_properties.size.width.as_uint32_t()};
+    size_t const size_in_bytes = 
+        stride.as_int() * buffer_properties.size.height.as_int();
+    auto const shm_file =
+        std::make_shared<mgg::AnonymousShmFile>(size_in_bytes);
+
+    auto const buffer =
+        std::make_shared<ShmBuffer>(shm_file, buffer_properties.size,
+                                    buffer_properties.format);
+
+    (*buffer_initializer)(*buffer);
+
+    return buffer;
+}
+
+std::vector<geom::PixelFormat> mgg::BufferAllocator::supported_pixel_formats()
 {
     static std::vector<geom::PixelFormat> const pixel_formats{
         geom::PixelFormat::argb_8888,
@@ -189,7 +228,7 @@
     return pixel_formats;
 }
 
-bool mgg::GBMBufferAllocator::is_pixel_format_supported(geom::PixelFormat format)
+bool mgg::BufferAllocator::is_pixel_format_supported(geom::PixelFormat format)
 {
     auto formats = supported_pixel_formats();
 
 
=== renamed file 'src/server/graphics/gbm/gbm_buffer_allocator.h' => 'src/server/graphics/gbm/buffer_allocator.h'
--- src/server/graphics/gbm/gbm_buffer_allocator.h	2013-09-18 14:41:59 +0000
+++ src/server/graphics/gbm/buffer_allocator.h	2013-11-28 12:22:03 +0000
@@ -16,8 +16,8 @@
  * Authored by: Christopher James Halse Rogers <[e-mail]>
  */
 
-#ifndef MIR_PLATFORM_GBM_GBM_BUFFER_ALLOCATOR_H_
-#define MIR_PLATFORM_GBM_GBM_BUFFER_ALLOCATOR_H_
+#ifndef MIR_PLATFORM_GBM_BUFFER_ALLOCATOR_H_
+#define MIR_PLATFORM_GBM_BUFFER_ALLOCATOR_H_
 
 #include "mir/graphics/graphic_buffer_allocator.h"
 #include "mir/graphics/buffer_id.h"
@@ -38,11 +38,11 @@
 
 namespace gbm
 {
-class GBMBufferAllocator: public graphics::GraphicBufferAllocator
+class BufferAllocator: public graphics::GraphicBufferAllocator
 {
 public:
-    GBMBufferAllocator(gbm_device* device,
-                       const std::shared_ptr<BufferInitializer>& buffer_initializer);
+    BufferAllocator(gbm_device* device,
+                    std::shared_ptr<BufferInitializer> const& buffer_initializer);
 
     virtual std::shared_ptr<Buffer> alloc_buffer(
         graphics::BufferProperties const& buffer_properties);
@@ -51,6 +51,10 @@
 
 private:
     bool is_pixel_format_supported(geometry::PixelFormat format);
+    std::shared_ptr<Buffer> alloc_hardware_buffer(
+        graphics::BufferProperties const& buffer_properties);
+    std::shared_ptr<Buffer> alloc_software_buffer(
+        graphics::BufferProperties const& buffer_properties);
 
     gbm_device* const device;
     std::shared_ptr<graphics::BufferInitializer> buffer_initializer;
@@ -63,4 +67,4 @@
 }
 }
 
-#endif // MIR_PLATFORM_GBM_GBM_BUFFER_ALLOCATOR_H_
+#endif // MIR_PLATFORM_GBM_BUFFER_ALLOCATOR_H_
 
=== modified file 'src/server/graphics/gbm/gbm_buffer.cpp'
--- src/server/graphics/gbm/gbm_buffer.cpp	2013-11-21 03:16:21 +0000
+++ src/server/graphics/gbm/gbm_buffer.cpp	2013-11-28 12:22:03 +0000
@@ -86,7 +86,7 @@
     auto gem_handle = gbm_bo_get_handle(gbm_handle.get()).u32;
     auto drm_fd = gbm_device_get_fd(device);
 
-    auto ret = drmPrimeHandleToFD(drm_fd, gem_handle, DRM_CLOEXEC, &prime_fd);    
+    auto ret = drmPrimeHandleToFD(drm_fd, gem_handle, DRM_CLOEXEC, &prime_fd);
 
     if (ret)
     {
 
=== modified file 'src/server/graphics/gbm/gbm_display_helpers.cpp'
--- src/server/graphics/gbm/gbm_display_helpers.cpp	2013-11-21 03:16:21 +0000
+++ src/server/graphics/gbm/gbm_display_helpers.cpp	2013-11-28 12:22:03 +0000
@@ -182,7 +182,7 @@
 }
 
 int mggh::DRMHelper::open_drm_device(std::shared_ptr<UdevContext> const& udev)
-{    
+{
     int tmp_fd = -1;
     int error = ENODEV; //Default error is "there are no DRM devices"
 
 
=== modified file 'src/server/graphics/gbm/gbm_platform.cpp'
--- src/server/graphics/gbm/gbm_platform.cpp	2013-11-21 03:16:21 +0000
+++ src/server/graphics/gbm/gbm_platform.cpp	2013-11-28 12:22:03 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "gbm_platform.h"
-#include "gbm_buffer_allocator.h"
+#include "buffer_allocator.h"
 #include "gbm_display.h"
 #include "internal_client.h"
 #include "internal_native_display.h"
@@ -114,8 +114,7 @@
 std::shared_ptr<mg::GraphicBufferAllocator> mgg::GBMPlatform::create_buffer_allocator(
         const std::shared_ptr<mg::BufferInitializer>& buffer_initializer)
 {
-    return std::make_shared<mgg::GBMBufferAllocator>(gbm.device,
-                                                     buffer_initializer);
+    return std::make_shared<mgg::BufferAllocator>(gbm.device, buffer_initializer);
 }
 
 std::shared_ptr<mg::Display> mgg::GBMPlatform::create_display(
@@ -138,13 +137,13 @@
     for(auto i=0; i<native_handle->data_items; i++)
     {
         packer->pack_data(native_handle->data[i]);
-    }    
+    }
     for(auto i=0; i<native_handle->fd_items; i++)
     {
         packer->pack_fd(native_handle->fd[i]);
     }
 
-    packer->pack_stride(buffer->stride()); 
+    packer->pack_stride(buffer->stride());
     packer->pack_flags(native_handle->flags);
     packer->pack_size(buffer->size());
 }
@@ -157,7 +156,7 @@
 std::shared_ptr<mg::InternalClient> mgg::GBMPlatform::create_internal_client()
 {
     if (!internal_native_display)
-        internal_native_display = std::make_shared<mgg::InternalNativeDisplay>(get_ipc_package()); 
+        internal_native_display = std::make_shared<mgg::InternalNativeDisplay>(get_ipc_package());
     internal_display_clients_present = true;
     return std::make_shared<mgg::InternalClient>(internal_native_display);
 }
 
=== modified file 'src/server/graphics/gbm/gbm_platform.h'
--- src/server/graphics/gbm/gbm_platform.h	2013-11-21 03:16:21 +0000
+++ src/server/graphics/gbm/gbm_platform.h	2013-11-28 12:22:03 +0000
@@ -48,7 +48,7 @@
             const std::shared_ptr<BufferInitializer>& buffer_initializer);
     std::shared_ptr<Display> create_display(
         std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy);
-    std::shared_ptr<PlatformIPCPackage> get_ipc_package(); 
+    std::shared_ptr<PlatformIPCPackage> get_ipc_package();
     std::shared_ptr<InternalClient> create_internal_client();
 
     void fill_ipc_package(BufferIPCPacker* packer, Buffer const* buffer) const;
 
=== modified file 'src/server/graphics/gbm/internal_native_surface.cpp'
--- src/server/graphics/gbm/internal_native_surface.cpp	2013-08-28 03:41:48 +0000
+++ src/server/graphics/gbm/internal_native_surface.cpp	2013-11-28 12:22:03 +0000
@@ -27,7 +27,7 @@
 {
     surface_advance_buffer = advance_buffer_static;
     surface_get_parameters = get_parameters_static;
-    surface_set_swapinterval = set_swapinterval_static; 
+    surface_set_swapinterval = set_swapinterval_static;
 }
 
 int mgg::InternalNativeSurface::advance_buffer_static(
@@ -39,8 +39,7 @@
 
 int mgg::InternalNativeSurface::advance_buffer(MirBufferPackage* package)
 {
-    current_buffer.reset();
-    current_buffer = surface->advance_client_buffer();
+    surface->swap_buffers(current_buffer);
 
     auto buffer_package = current_buffer->native_buffer_handle();
     memcpy(package, buffer_package.get(), sizeof(MirBufferPackage));
 
=== modified file 'src/server/graphics/gbm/kms_output.h'
--- src/server/graphics/gbm/kms_output.h	2013-09-25 07:51:32 +0000
+++ src/server/graphics/gbm/kms_output.h	2013-11-28 12:22:03 +0000
@@ -52,7 +52,7 @@
     virtual void move_cursor(geometry::Point destination) = 0;
     virtual void clear_cursor() = 0;
     virtual bool has_cursor() const = 0;
-    
+
     virtual void set_power_mode(MirPowerMode mode) = 0;
 
 protected:
 
=== modified file 'src/server/graphics/gbm/native_gbm_platform.cpp'
--- src/server/graphics/gbm/native_gbm_platform.cpp	2013-11-21 03:16:21 +0000
+++ src/server/graphics/gbm/native_gbm_platform.cpp	2013-11-28 12:22:03 +0000
@@ -20,7 +20,7 @@
 
 #include "native_gbm_platform.h"
 
-#include "gbm_buffer_allocator.h"
+#include "buffer_allocator.h"
 #include "mir/graphics/buffer_ipc_packer.h"
 #include "mir/graphics/platform_ipc_package.h"
 #include "mir/graphics/nested_context.h"
@@ -45,7 +45,7 @@
 std::shared_ptr<mg::GraphicBufferAllocator> mgg::NativeGBMPlatform::create_buffer_allocator(
         std::shared_ptr<mg::BufferInitializer> const& buffer_initializer)
 {
-    return std::make_shared<mgg::GBMBufferAllocator>(gbm.device, buffer_initializer);
+    return std::make_shared<mgg::BufferAllocator>(gbm.device, buffer_initializer);
 }
 
 std::shared_ptr<mg::PlatformIPCPackage> mgg::NativeGBMPlatform::get_ipc_package()
 
=== modified file 'src/server/graphics/gbm/real_kms_display_configuration.cpp'
--- src/server/graphics/gbm/real_kms_display_configuration.cpp	2013-09-17 18:40:01 +0000
+++ src/server/graphics/gbm/real_kms_display_configuration.cpp	2013-11-28 12:22:03 +0000
@@ -229,7 +229,7 @@
     else
     {
         auto& output = *iter;
-        
+
         output.modes = modes;
         output.preferred_mode_index = preferred_mode_index;
         output.physical_size_mm = physical_size;
 
=== modified file 'src/server/graphics/gbm/real_kms_output.h'
--- src/server/graphics/gbm/real_kms_output.h	2013-09-25 07:51:32 +0000
+++ src/server/graphics/gbm/real_kms_output.h	2013-11-28 12:22:03 +0000
@@ -54,7 +54,7 @@
     void move_cursor(geometry::Point destination);
     void clear_cursor();
     bool has_cursor() const;
-    
+
     void set_power_mode(MirPowerMode mode);
 
 private:
@@ -75,7 +75,7 @@
 
     MirPowerMode power_mode;
     int dpms_enum_id;
-    
+
     std::mutex power_mutex;
 };
 
 
=== added file 'src/server/graphics/gbm/shm_buffer.cpp'
--- src/server/graphics/gbm/shm_buffer.cpp	1970-01-01 00:00:00 +0000
+++ src/server/graphics/gbm/shm_buffer.cpp	2013-11-28 12:22:03 +0000
@@ -0,0 +1,87 @@
+/*
+ * 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:
+ *   Alexandros Frantzis <[e-mail]>
+ */
+
+#include "shm_file.h"
+#include "shm_buffer.h"
+#include "buffer_texture_binder.h"
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
+namespace mgg = mir::graphics::gbm;
+namespace geom = mir::geometry;
+
+mgg::ShmBuffer::ShmBuffer(
+    std::shared_ptr<ShmFile> const& shm_file,
+    geom::Size const& size,
+    geom::PixelFormat const& pixel_format)
+    : shm_file{shm_file},
+      size_{size},
+      pixel_format_{pixel_format},
+      stride_{geom::bytes_per_pixel(pixel_format_) * size_.width.as_uint32_t()},
+      pixels{shm_file->base_ptr()}
+{
+}
+
+mgg::ShmBuffer::~ShmBuffer() noexcept
+{
+}
+
+geom::Size mgg::ShmBuffer::size() const
+{
+    return size_;
+}
+
+geom::Stride mgg::ShmBuffer::stride() const
+{
+    return stride_;
+}
+
+geom::PixelFormat mgg::ShmBuffer::pixel_format() const
+{
+    return pixel_format_;
+}
+
+void mgg::ShmBuffer::bind_to_texture()
+{
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_BGRA_EXT,
+                 size_.width.as_int(), size_.height.as_int(),
+                 0, GL_BGRA_EXT, GL_UNSIGNED_BYTE,
+                 pixels);
+}
+
+std::shared_ptr<MirNativeBuffer> mgg::ShmBuffer::native_buffer_handle() const
+{
+    auto native_buffer = std::make_shared<MirNativeBuffer>();
+
+    native_buffer->fd_items = 1;
+    native_buffer->fd[0] = shm_file->fd();
+    native_buffer->stride = stride().as_uint32_t();
+    native_buffer->flags = 0;
+
+    auto const& dim = size();
+    native_buffer->width = dim.width.as_int();
+    native_buffer->height = dim.height.as_int();
+
+    return native_buffer;
+}
+
+bool mgg::ShmBuffer::can_bypass() const
+{
+    return false;
+}
 
=== added file 'src/server/graphics/gbm/shm_buffer.h'
--- src/server/graphics/gbm/shm_buffer.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/gbm/shm_buffer.h	2013-11-28 12:22:03 +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:
+ *   Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_GBM_SHM_BUFFER_H_
+#define MIR_GRAPHICS_GBM_SHM_BUFFER_H_
+
+#include "mir/graphics/buffer_basic.h"
+#include "mir/geometry/dimensions.h"
+#include "mir/geometry/size.h"
+#include "mir/geometry/pixel_format.h"
+
+namespace mir
+{
+namespace graphics
+{
+namespace gbm
+{
+
+class ShmFile;
+
+class ShmBuffer : public BufferBasic
+{
+public:
+    ShmBuffer(std::shared_ptr<ShmFile> const& shm_file,
+              geometry::Size const& size,
+              geometry::PixelFormat const& pixel_format);
+    ~ShmBuffer() noexcept;
+
+    geometry::Size size() const;
+    geometry::Stride stride() const;
+    geometry::PixelFormat pixel_format() const;
+    std::shared_ptr<MirNativeBuffer> native_buffer_handle() const;
+    void bind_to_texture();
+    bool can_bypass() const;
+
+private:
+    ShmBuffer(ShmBuffer const&) = delete;
+    ShmBuffer& operator=(ShmBuffer const&) = delete;
+
+    std::shared_ptr<ShmFile> const shm_file;
+    geometry::Size const size_;
+    geometry::PixelFormat const pixel_format_;
+    geometry::Stride const stride_;
+    void* const pixels;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_GBM_SHM_BUFFER_H_ */
 
=== added file 'src/server/graphics/gbm/shm_file.h'
--- src/server/graphics/gbm/shm_file.h	1970-01-01 00:00:00 +0000
+++ src/server/graphics/gbm/shm_file.h	2013-11-28 12:22:03 +0000
@@ -0,0 +1,50 @@
+/*
+ * 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:
+ *   Alexandros Frantzis <[e-mail]>
+ */
+
+#ifndef MIR_GRAPHICS_GBM_SHM_FILE_H_
+#define MIR_GRAPHICS_GBM_SHM_FILE_H_
+
+#include <cstddef>
+
+namespace mir
+{
+namespace graphics
+{
+namespace gbm
+{
+
+class ShmFile
+{
+public:
+    virtual ~ShmFile() = default;
+
+    virtual void* base_ptr() const = 0;
+    virtual int fd() const = 0;
+
+protected:
+    ShmFile() = default;
+    ShmFile(ShmFile const&) = delete;
+    ShmFile& operator=(ShmFile const&) = delete;
+};
+
+}
+}
+}
+
+#endif /* MIR_GRAPHICS_GBM_SHM_FILE_H_ */
 
=== modified file 'src/server/graphics/gbm/udev_wrapper.cpp'
--- src/server/graphics/gbm/udev_wrapper.cpp	2013-11-19 05:40:39 +0000
+++ src/server/graphics/gbm/udev_wrapper.cpp	2013-11-28 12:22:03 +0000
@@ -257,7 +257,7 @@
     do
     {
         dev = udev_monitor_receive_device(const_cast<udev_monitor*>(monitor));
-        if (dev != nullptr) 
+        if (dev != nullptr)
             handler(action_to_event_type(udev_device_get_action(dev)), UdevDevice(dev));
     } while (dev != nullptr);
 }
 
=== modified file 'src/server/graphics/gbm/udev_wrapper.h'
--- src/server/graphics/gbm/udev_wrapper.h	2013-11-19 05:40:39 +0000
+++ src/server/graphics/gbm/udev_wrapper.h	2013-11-28 12:22:03 +0000
@@ -84,7 +84,7 @@
     void match_parent(UdevDevice const& parent);
     void match_sysname(std::string const& sysname);
 
-        class iterator : 
+        class iterator :
         public std::iterator<std::input_iterator_tag, UdevDevice>
     {
     public:
 
=== modified file 'src/server/graphics/nested/nested_display_configuration.cpp'
--- src/server/graphics/nested/nested_display_configuration.cpp	2013-09-12 21:36:55 +0000
+++ src/server/graphics/nested/nested_display_configuration.cpp	2013-11-28 12:22:03 +0000
@@ -85,7 +85,7 @@
         });
 }
 
-void mgn::NestedDisplayConfiguration::configure_output(DisplayConfigurationOutputId id, bool used, 
+void mgn::NestedDisplayConfiguration::configure_output(DisplayConfigurationOutputId id, bool used,
     geometry::Point top_left, size_t mode_index, MirPowerMode power_mode)
 {
     for (auto mir_output = display_config->outputs;
 
=== modified file 'src/server/graphics/offscreen/display_buffer.cpp'
--- src/server/graphics/offscreen/display_buffer.cpp	2013-11-14 09:46:02 +0000
+++ src/server/graphics/offscreen/display_buffer.cpp	2013-11-28 12:22:03 +0000
@@ -33,12 +33,6 @@
 namespace
 {
 
-EGLint const default_egl_context_attr[] =
-{
-    EGL_CONTEXT_CLIENT_VERSION, 2,
-    EGL_NONE
-};
-
 class GLExtensions : public mgo::GLExtensionsBase
 {
 public:
 
=== modified file 'src/server/input/android/android_input_application_handle.cpp'
--- src/server/input/android/android_input_application_handle.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_application_handle.cpp	2013-11-28 12:22:03 +0000
@@ -36,7 +36,7 @@
 {
     if (mInfo == NULL)
         mInfo = new droidinput::InputApplicationInfo;
-    
+
     mInfo->dispatchingTimeout = INT_MAX;
     mInfo->name = droidinput::String8(surface->name().c_str());
 
 
=== modified file 'src/server/input/android/android_input_channel.cpp'
--- src/server/input/android/android_input_channel.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_channel.cpp	2013-11-28 12:22:03 +0000
@@ -27,7 +27,7 @@
 
 mia::AndroidInputChannel::AndroidInputChannel()
 {
-    
+
     droidinput::InputChannel::openInputFdPair(s_fd, c_fd);
 }
 
 
=== modified file 'src/server/input/android/android_input_reader_policy.cpp'
--- src/server/input/android/android_input_reader_policy.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_reader_policy.cpp	2013-11-28 12:22:03 +0000
@@ -48,7 +48,7 @@
         width,
         height,
         default_display_orientation);
-    
+
     out_config->pointerVelocityControlParameters.acceleration = 1.0;
 }
 
 
=== modified file 'src/server/input/android/android_input_registrar.cpp'
--- src/server/input/android/android_input_registrar.cpp	2013-11-20 15:56:58 +0000
+++ src/server/input/android/android_input_registrar.cpp	2013-11-28 12:22:03 +0000
@@ -59,7 +59,7 @@
 
         auto application_handle = new mia::InputApplicationHandle(surface);
         window_handle = new mia::InputWindowHandle(application_handle, channel, surface);
-    
+
         window_handles[channel] = window_handle;
     }
 
 
=== modified file 'src/server/input/android/android_input_target_enumerator.h'
--- src/server/input/android/android_input_target_enumerator.h	2013-11-20 15:56:58 +0000
+++ src/server/input/android/android_input_target_enumerator.h	2013-11-28 12:22:03 +0000
@@ -52,9 +52,9 @@
     explicit InputTargetEnumerator(std::shared_ptr<input::InputTargets> const& targets,
                                    std::shared_ptr<WindowHandleRepository> const& repository);
     virtual ~InputTargetEnumerator() noexcept(true);
-    
+
     void for_each(std::function<void(droidinput::sp<droidinput::InputWindowHandle> const&)> const& callback);
-    
+
 private:
     std::weak_ptr<input::InputTargets> const targets;
     std::weak_ptr<input::android::WindowHandleRepository> const repository;
 
=== modified file 'src/server/input/android/android_input_targeter.cpp'
--- src/server/input/android/android_input_targeter.cpp	2013-11-20 15:56:58 +0000
+++ src/server/input/android/android_input_targeter.cpp	2013-11-28 12:22:03 +0000
@@ -46,16 +46,16 @@
 void mia::InputTargeter::focus_cleared()
 {
     droidinput::sp<droidinput::InputWindowHandle> null_window = nullptr;
-    
+
     input_dispatcher->setKeyboardFocus(null_window);
 }
 
 void mia::InputTargeter::focus_changed(std::shared_ptr<mi::InputChannel const> const& focus_channel)
 {
     auto window_handle = repository->handle_for_channel(focus_channel);
-    
+
     if (window_handle == NULL)
         BOOST_THROW_EXCEPTION(std::logic_error("Attempt to set keyboard focus to an unregistered input channel"));
-    
+
     input_dispatcher->setKeyboardFocus(window_handle);
 }
 
=== modified file 'src/server/input/android/android_input_window_handle.cpp'
--- src/server/input/android/android_input_window_handle.cpp	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_input_window_handle.cpp	2013-11-28 12:22:03 +0000
@@ -76,7 +76,7 @@
     mInfo->frameTop = surface_position.y.as_uint32_t();
     mInfo->frameRight = mInfo->frameLeft + surface_size.width.as_uint32_t();
     mInfo->frameBottom = mInfo->frameTop + surface_size.height.as_uint32_t();
-    
+
     mInfo->touchableRegionLeft = mInfo->frameLeft;
     mInfo->touchableRegionTop = mInfo->frameTop;
     mInfo->touchableRegionRight = mInfo->frameRight;
 
=== modified file 'src/server/input/android/android_window_handle_repository.h'
--- src/server/input/android/android_window_handle_repository.h	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_window_handle_repository.h	2013-11-28 12:22:03 +0000
@@ -44,7 +44,7 @@
 {
 public:
     virtual ~WindowHandleRepository() = default;
-    
+
     virtual droidinput::sp<droidinput::InputWindowHandle> handle_for_channel(std::shared_ptr<input::InputChannel const> const& channel) = 0;
 protected:
     WindowHandleRepository() = default;
 
=== modified file 'src/server/input/android/event_filter_dispatcher_policy.cpp'
--- src/server/input/android/event_filter_dispatcher_policy.cpp	2013-06-06 10:03:12 +0000
+++ src/server/input/android/event_filter_dispatcher_policy.cpp	2013-11-28 12:22:03 +0000
@@ -54,7 +54,7 @@
 {
     MirEvent mir_ev;
     mia::Lexicon::translate(input_event, mir_ev);
-    
+
     // TODO: Use XKBMapper
 
     return !event_filter->handle(mir_ev);
 
=== modified file 'src/server/input/null_input_configuration.cpp'
--- src/server/input/null_input_configuration.cpp	2013-11-21 12:34:49 +0000
+++ src/server/input/null_input_configuration.cpp	2013-11-28 12:22:03 +0000
@@ -33,7 +33,7 @@
 {
     NullInputRegistrar() = default;
     virtual ~NullInputRegistrar() noexcept(true) = default;
-    
+
     void input_channel_opened(std::shared_ptr<mi::InputChannel> const&,
                               std::shared_ptr<mi::Surface> const&,
                               mi::InputReceptionMode /* receives_all_input */)
 
=== modified file 'src/server/input/null_input_configuration.h'
--- src/server/input/null_input_configuration.h	2013-11-21 12:34:49 +0000
+++ src/server/input/null_input_configuration.h	2013-11-28 12:22:03 +0000
@@ -35,7 +35,7 @@
     std::shared_ptr<scene::InputRegistrar> the_input_registrar();
     std::shared_ptr<shell::InputTargeter> the_input_targeter();
     std::shared_ptr<InputManager> the_input_manager();
-    
+
     void set_input_targets(std::shared_ptr<InputTargets> const& /* targets */);
 
 protected:
 
=== modified file 'src/server/logging/display_report.cpp'
--- src/server/logging/display_report.cpp	2013-11-21 03:16:21 +0000
+++ src/server/logging/display_report.cpp	2013-11-28 12:22:03 +0000
@@ -150,5 +150,5 @@
         eglGetConfigAttrib(disp, config, i.val, &value);
         logger->log<Logger::informational>(
             "    [" + i.name + "] : " + std::to_string(value), component());
-    } 
+    }
 }
 
=== modified file 'src/server/logging/input_report.cpp'
--- src/server/logging/input_report.cpp	2013-05-28 17:55:26 +0000
+++ src/server/logging/input_report.cpp	2013-11-28 12:22:03 +0000
@@ -92,7 +92,7 @@
 }
 
 
-ml::InputReport::InputReport(const std::shared_ptr<Logger>& logger) 
+ml::InputReport::InputReport(const std::shared_ptr<Logger>& logger)
     : logger(logger)
 {
 }
@@ -106,7 +106,7 @@
 void ml::InputReport::received_event_from_kernel(int64_t when, int type, int code, int value)
 {
     std::stringstream ss;
-    
+
     ss << "Received event (when, type, code, value) from kernel: "
        << "(" << when << "ns, " << type << ", " << code << ", " << value << ")";
     logger->log<Logger::informational>(ss.str(), component());
@@ -116,7 +116,7 @@
 {
     std::stringstream ss;
 
-    ss << "Published key event (seq_id, event_time) to fd " << dest_fd << ": (" 
+    ss << "Published key event (seq_id, event_time) to fd " << dest_fd << ": ("
         << seq_id << ", " << event_time << ")";
     logger->log<Logger::informational>(ss.str(), component());
 }
@@ -125,7 +125,7 @@
 {
     std::stringstream ss;
 
-    ss << "Published motion event (seq_id, event_time) to fd " << dest_fd << ": (" 
+    ss << "Published motion event (seq_id, event_time) to fd " << dest_fd << ": ("
         << seq_id << ", " << event_time << ")";
     logger->log<Logger::informational>(ss.str(), component());
 }
@@ -133,7 +133,7 @@
 void ml::InputReport::received_event_finished_signal(int src_fd, uint32_t seq_id)
 {
     std::stringstream ss;
-    
+
     ss << "Received event finished (seq_id) from fd " << src_fd << ": " << seq_id;
     logger->log<Logger::informational>(ss.str(), component());
 }
 
=== modified file 'src/server/scene/application_session.cpp'
--- src/server/scene/application_session.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/application_session.cpp	2013-11-28 12:22:03 +0000
@@ -72,9 +72,9 @@
 
     std::unique_lock<std::mutex> lock(surfaces_mutex);
     surfaces[id] = surf;
-    
+
     session_listener->surface_created(*this, surf);
-    
+
     return id;
 }
 
@@ -114,7 +114,7 @@
 {
     std::unique_lock<std::mutex> lock(surfaces_mutex);
     auto p = checked_find(id);
-    
+
     session_listener->destroying_surface(*this, p->second);
 
     surfaces.erase(p);
 
=== modified file 'src/server/scene/basic_surface.h'
--- src/server/scene/basic_surface.h	2013-11-21 12:34:49 +0000
+++ src/server/scene/basic_surface.h	2013-11-28 12:22:03 +0000
@@ -65,7 +65,7 @@
     virtual geometry::PixelFormat pixel_format() const = 0;
 
     virtual std::shared_ptr<graphics::Buffer> snapshot_buffer() const = 0;
-    virtual std::shared_ptr<graphics::Buffer> advance_client_buffer() = 0;
+    virtual void swap_buffers(std::shared_ptr<graphics::Buffer>&) = 0;
     virtual void force_requests_to_complete() = 0;
 
     virtual bool supports_input() const = 0;
 
=== modified file 'src/server/scene/default_session_container.cpp'
--- src/server/scene/default_session_container.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/default_session_container.cpp	2013-11-28 12:22:03 +0000
@@ -63,12 +63,12 @@
 std::shared_ptr<msh::Session> ms::DefaultSessionContainer::successor_of(std::shared_ptr<msh::Session> const& session) const
 {
     std::shared_ptr<msh::Session> result, first;
-    
+
     if (!session && apps.size())
         return apps.back();
     else if(!session)
         return std::shared_ptr<msh::Session>();
-    
+
     for (auto it = apps.begin(); it != apps.end(); it++)
     {
         if (*it == session)
@@ -79,6 +79,6 @@
             else return *successor;
         }
     }
-    
+
     BOOST_THROW_EXCEPTION(std::logic_error("Invalid session"));
 }
 
=== modified file 'src/server/scene/global_event_sender.cpp'
--- src/server/scene/global_event_sender.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/global_event_sender.cpp	2013-11-28 12:22:03 +0000
@@ -30,7 +30,7 @@
 }
 
 void ms::GlobalEventSender::handle_event(MirEvent const&)
-{ 
+{
     //TODO, no driving test cases, although messages like 'server shutdown' could go here
 }
 
 
=== modified file 'src/server/scene/mediating_display_changer.cpp'
--- src/server/scene/mediating_display_changer.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/mediating_display_changer.cpp	2013-11-28 12:22:03 +0000
@@ -129,12 +129,12 @@
     conf->for_each_output([&](mg::DisplayConfigurationOutput const& output) -> void
     {
         if (!output.used) return;
-        
+
         if (output.power_mode != mir_power_mode_on)
         {
             switched = true;
             conf->configure_output(output.id, output.used,
-                                   output.top_left, 
+                                   output.top_left,
                                    output.current_mode_index,
                                    mir_power_mode_on);
         }
 
=== modified file 'src/server/scene/mutable_surface_state.h'
--- src/server/scene/mutable_surface_state.h	2013-11-21 12:34:49 +0000
+++ src/server/scene/mutable_surface_state.h	2013-11-28 12:22:03 +0000
@@ -41,7 +41,7 @@
         std::vector<geometry::Rectangle> const& input_rectangles) = 0;
 
 protected:
-    MutableSurfaceState() = default; 
+    MutableSurfaceState() = default;
     virtual ~MutableSurfaceState() noexcept = default;
     MutableSurfaceState(const MutableSurfaceState&) = delete;
     MutableSurfaceState& operator=(const MutableSurfaceState& ) = delete;
 
=== modified file 'src/server/scene/session_manager.cpp'
--- src/server/scene/session_manager.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/session_manager.cpp	2013-11-28 12:22:03 +0000
@@ -81,7 +81,7 @@
             surface_factory, name, snapshot_strategy, session_listener, sender);
 
     app_container->insert_session(new_session);
-    
+
     session_listener->starting(new_session);
 
     set_focus_to(new_session);
 
=== modified file 'src/server/scene/surface.cpp'
--- src/server/scene/surface.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/surface.cpp	2013-11-28 12:22:03 +0000
@@ -44,8 +44,7 @@
     surface_state(state),
     surface_buffer_stream(buffer_stream),
     server_input_channel(input_channel),
-    report(report),
-    surface_in_startup(true)
+    report(report)
 {
     report->surface_created(this);
 }
@@ -110,20 +109,16 @@
     return surface_buffer_stream->get_stream_pixel_format();
 }
 
-std::shared_ptr<mg::Buffer> ms::Surface::advance_client_buffer()
+void ms::Surface::swap_buffers(std::shared_ptr<graphics::Buffer>& buffer)
 {
-    if (surface_in_startup)
-    {
-        surface_in_startup = false;
-    }
-    else
-    {
-        // TODO There is something crazy about assuming that giving out any buffer
-        // TODO after the first implies that previous buffers have been rendered.
-        flag_for_render();
-    }
-
-    return surface_buffer_stream->secure_client_buffer();
+    bool const posting{!!buffer};
+
+    surface_buffer_stream->swap_client_buffers(buffer);
+
+    if (posting)
+    {
+        surface_state->frame_posted();
+    }
 }
 
 void ms::Surface::allow_framedropping(bool allow)
@@ -136,12 +131,6 @@
     return surface_buffer_stream->lock_snapshot_buffer();
 }
 
-//TODO: this is just used in example code, could be private
-void ms::Surface::flag_for_render()
-{
-    surface_state->frame_posted();
-}
-
 bool ms::Surface::supports_input() const
 {
     if (server_input_channel)
 
=== modified file 'src/server/scene/surface.h'
--- src/server/scene/surface.h	2013-11-20 16:22:32 +0000
+++ src/server/scene/surface.h	2013-11-28 12:22:03 +0000
@@ -50,9 +50,8 @@
     geometry::PixelFormat pixel_format() const;
 
     std::shared_ptr<graphics::Buffer> snapshot_buffer() const;
-    std::shared_ptr<graphics::Buffer> advance_client_buffer();
+    void swap_buffers(std::shared_ptr<graphics::Buffer>& buffer);
     void force_requests_to_complete();
-    void flag_for_render();
 
     bool supports_input() const;
     int client_input_fd() const;
@@ -74,7 +73,6 @@
     std::shared_ptr<compositor::BufferStream> surface_buffer_stream;
     std::shared_ptr<input::InputChannel> const server_input_channel;
     std::shared_ptr<SceneReport> const report;
-    bool surface_in_startup;
 };
 }
 }
 
=== modified file 'src/server/scene/surface_data.cpp'
--- src/server/scene/surface_data.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/surface_data.cpp	2013-11-28 12:22:03 +0000
@@ -46,7 +46,7 @@
     std::unique_lock<std::mutex> lk(guard);
 
     auto surface_size = surface_rect.size;
-    auto surface_top_left = surface_rect.top_left; 
+    auto surface_top_left = surface_rect.top_left;
     if (transformation_dirty || transformation_size != surface_size)
     {
         const glm::vec3 top_left_vec{surface_top_left.x.as_int(),
@@ -183,7 +183,7 @@
         if (rectangle.contains(point))
         {
             return true;
-        } 
+        }
     }
     return false;
 }
 
=== modified file 'src/server/scene/surface_impl.cpp'
--- src/server/scene/surface_impl.cpp	2013-11-21 12:34:49 +0000
+++ src/server/scene/surface_impl.cpp	2013-11-28 12:22:03 +0000
@@ -104,16 +104,16 @@
     return surface->pixel_format();
 }
 
-std::shared_ptr<mg::Buffer> ms::SurfaceImpl::advance_client_buffer()
+void ms::SurfaceImpl::swap_buffers(std::shared_ptr<graphics::Buffer>& buffer)
 {
-    return surface->advance_client_buffer();
+    surface->swap_buffers(buffer);
 }
 
 void ms::SurfaceImpl::allow_framedropping(bool allow)
 {
     surface->allow_framedropping(allow);
 }
- 
+
 void ms::SurfaceImpl::with_most_recent_buffer_do(
     std::function<void(mg::Buffer&)> const& exec)
 {
@@ -247,6 +247,15 @@
 void ms::SurfaceImpl::resize(geom::Size const& size)
 {
     surface->resize(size);
+
+    MirEvent e;
+    memset(&e, 0, sizeof e);
+    e.type = mir_event_type_resize;
+    e.resize.surface_id = id.as_value();
+    e.resize.width = size.width.as_int();
+    e.resize.height = size.height.as_int();
+
+    event_sink->handle_event(e);
 }
 
 void ms::SurfaceImpl::set_rotation(float degrees, glm::vec3 const& axis)
 
=== modified file 'src/server/scene/surface_impl.h'
--- src/server/scene/surface_impl.h	2013-11-20 16:22:32 +0000
+++ src/server/scene/surface_impl.h	2013-11-28 12:22:03 +0000
@@ -72,7 +72,7 @@
 
     virtual void with_most_recent_buffer_do(
         std::function<void(graphics::Buffer&)> const& exec);
-    virtual std::shared_ptr<graphics::Buffer> advance_client_buffer();
+    virtual void swap_buffers(std::shared_ptr<graphics::Buffer>& buffer);
 
     virtual bool supports_input() const;
     virtual int client_input_fd() const;
 
=== modified file 'src/server/scene/surface_stack.h'
--- src/server/scene/surface_stack.h	2013-11-21 12:34:49 +0000
+++ src/server/scene/surface_stack.h	2013-11-28 12:22:03 +0000
@@ -72,15 +72,15 @@
     virtual void reverse_for_each_if(compositor::FilterForScene& filter,
                                      compositor::OperatorForScene& op);
     virtual void set_change_callback(std::function<void()> const& f);
-    
+
     // From InputTargets
     void for_each(std::function<void(std::shared_ptr<input::InputChannel> const&)> const& callback);
 
-    // From SurfaceStackModel 
+    // From SurfaceStackModel
     virtual std::weak_ptr<BasicSurface> create_surface(const shell::SurfaceCreationParameters& params);
 
     virtual void destroy_surface(std::weak_ptr<BasicSurface> const& surface);
-    
+
     virtual void raise(std::weak_ptr<BasicSurface> const& surface);
 
     virtual void lock();
 
=== modified file 'src/server/scene/surface_state.h'
--- src/server/scene/surface_state.h	2013-11-20 16:22:32 +0000
+++ src/server/scene/surface_state.h	2013-11-28 12:22:03 +0000
@@ -29,10 +29,10 @@
 {
 
 class SurfaceState : public compositor::CompositingCriteria, public input::Surface,
-                     public MutableSurfaceState 
+                     public MutableSurfaceState
 {
 protected:
-    SurfaceState() = default; 
+    SurfaceState() = default;
     virtual ~SurfaceState() = default;
     SurfaceState(const SurfaceState&) = delete;
     SurfaceState& operator=(const SurfaceState& ) = delete;
 
=== modified file 'src/server/shell/default_focus_mechanism.cpp'
--- src/server/shell/default_focus_mechanism.cpp	2013-11-21 03:16:21 +0000
+++ src/server/shell/default_focus_mechanism.cpp	2013-11-28 12:22:03 +0000
@@ -41,7 +41,7 @@
         input_targeter->focus_cleared();
         return;
     }
-    
+
     auto surface = focus_session->default_surface();
     if (surface)
     {