Merge lp:~brandontschaefer/mir/deprecate-set-event-handler into lp:mir

[Brandon Schaefer]

Deprecate set_event_handler as we are using mir_surface_spec_set_event_handler now.

The tests need to stay testing the old way, which will be moved over once we remove the function. All other places have moved over to the new way.

[lp:~brandontschaefer/mir/deprecate-set-event-handler]

3908. By Brandon Schaefer on 2017-01-06

* Merge parent

3909. By Brandon Schaefer on 2017-01-07

* Merge parent, fix conflicts

Unmerged revisions

3909. By Brandon Schaefer on 2017-01-07

* Merge parent, fix conflicts

3908. By Brandon Schaefer on 2017-01-06

* Merge parent

3907. By Brandon Schaefer on 2017-01-06

* Deprecate mir_surface_set_event_handler

=== modified file 'benchmarks/frame-uniformity/touch_measuring_client.cpp'
--- benchmarks/frame-uniformity/touch_measuring_client.cpp	2015-06-17 05:20:42 +0000
+++ benchmarks/frame-uniformity/touch_measuring_client.cpp	2017-01-06 19:13:38 +0000
@@ -42,7 +42,7 @@
 
     auto surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
-    
+
     if (!mir_surface_is_valid(surface))
     {
         std::cerr << "Surface creation failed: " << mir_surface_get_error_message(surface) << std::endl;
@@ -55,14 +55,17 @@
 void input_callback(MirSurface * /* surface */, MirEvent const* event, void* context)
 {
     auto results = static_cast<TouchSamples*>(context);
-    
+
     results->record_pointer_coordinates(std::chrono::high_resolution_clock::now(), *event);
 }
 
 void collect_input_and_frame_timing(MirSurface *surface, mt::Barrier& client_ready, std::chrono::high_resolution_clock::duration duration, std::shared_ptr<TouchSamples> const& results)
 {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, input_callback, results.get());
-    
+#pragma GCC diagnostic pop
+
     client_ready.ready();
 
     // May be better if end time were relative to the first input event

=== modified file 'examples/camera.c'
--- examples/camera.c	2016-10-26 05:15:38 +0000
+++ examples/camera.c	2017-01-06 19:13:38 +0000
@@ -397,6 +397,12 @@
         return 0;
     }
 
+    State state =
+    {
+        PTHREAD_MUTEX_INITIALIZER,
+        true
+    };
+
     MirSurface* surface = mir_eglapp_native_surface();
     if (win_width == 1)  /* Fullscreen was not chosen */
     {
@@ -408,6 +414,7 @@
         win_height = cam->pix.height;
         mir_surface_spec_set_width(changes, win_width);
         mir_surface_spec_set_height(changes, win_height);
+        mir_surface_spec_set_event_handler(changes, on_event, &state);
         mir_surface_apply_spec(surface, changes);
         mir_surface_spec_release(changes);
     }
@@ -465,13 +472,6 @@
     glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glViewport(0, 0, win_width, win_height);
 
-    State state =
-    {
-        PTHREAD_MUTEX_INITIALIZER,
-        true
-    };
-    mir_surface_set_event_handler(surface, on_event, &state);
-
     bool first_frame = true;
     while (mir_eglapp_running())
     {
@@ -563,7 +563,10 @@
         mir_eglapp_swap_buffers();
     }
 
-    mir_surface_set_event_handler(surface, NULL, NULL);
+    MirSurfaceSpec* spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, NULL, NULL);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
     mir_eglapp_cleanup();
     close_camera(cam);
 

=== modified file 'examples/client_touch_validator.cpp'
--- examples/client_touch_validator.cpp	2016-10-21 07:53:23 +0000
+++ examples/client_touch_validator.cpp	2017-01-06 19:13:38 +0000
@@ -168,7 +168,10 @@
     TouchState state;
 
     MirSurface *surface = mir_eglapp_native_surface();
-    mir_surface_set_event_handler(surface, on_event, &state);
+    MirSurfaceSpec *spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, on_event, &state);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
 
     float const opacity = mir_eglapp_background_opacity;
     Color red = {opacity, 0.0f, 0.0f, opacity};

=== modified file 'examples/demo_client_display_config.c'
--- examples/demo_client_display_config.c	2016-10-21 07:53:23 +0000
+++ examples/demo_client_display_config.c	2017-01-06 19:13:38 +0000
@@ -368,7 +368,10 @@
     mir_connection_set_display_config_change_callback(
         connection, display_change_callback, &ctx);
 
-    mir_surface_set_event_handler(surface, event_callback, &ctx);
+    MirSurfaceSpec *spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, event_callback, &ctx);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
 
     time_t start = time(NULL);
 

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2016-12-09 02:54:31 +0000
+++ examples/eglapp.c	2017-01-06 19:13:38 +0000
@@ -484,13 +484,13 @@
     if (output_id != mir_display_output_id_invalid)
         mir_surface_spec_set_fullscreen_on_output(spec, output_id);
 
+    mir_surface_spec_set_event_handler(spec, mir_eglapp_handle_event, NULL);
+
     surface = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
 
     CHECK(mir_surface_is_valid(surface), "Can't create a surface");
 
-    mir_surface_set_event_handler(surface, mir_eglapp_handle_event, NULL);
-    
     spec = mir_connection_create_spec_for_changes(connection);
     mir_surface_spec_set_cursor_name(spec, cursor_name);
     mir_surface_apply_spec(surface, spec);
@@ -498,7 +498,7 @@
 
     eglsurface = eglCreateWindowSurface(egldisplay, eglconfig,
         (EGLNativeWindowType)mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)), NULL);
-    
+
     CHECK(eglsurface != EGL_NO_SURFACE, "eglCreateWindowSurface failed");
 
     eglctx = eglCreateContext(egldisplay, eglconfig, EGL_NO_CONTEXT,

=== modified file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2015-05-29 12:53:18 +0000
+++ examples/eglsquare.cpp	2017-01-06 19:13:38 +0000
@@ -109,7 +109,10 @@
         context{connection, surface, swap_interval},
         program{context, dimensions.width, dimensions.height}
     {
-        mir_surface_set_event_handler(surface, &on_event, this);
+        MirSurfaceSpec* spec = mir_connection_create_spec_for_changes(connection);
+        mir_surface_spec_set_event_handler(spec, &on_event, this);
+        mir_surface_apply_spec(surface, spec);
+        mir_surface_spec_release(spec);
     }
 
     void on_event(MirEvent const* ev)

=== modified file 'examples/fingerpaint.c'
--- examples/fingerpaint.c	2016-01-29 08:18:22 +0000
+++ examples/fingerpaint.c	2017-01-06 19:13:38 +0000
@@ -468,6 +468,7 @@
     MirSurfaceSpec *spec = mir_connection_create_spec_for_normal_surface(conn, width, height, pixel_format);
     mir_surface_spec_set_name(spec, "Mir Fingerpaint");
     mir_surface_spec_set_buffer_usage(spec, mir_buffer_usage_software);
+    mir_surface_spec_set_event_handler(spec, &on_event, &canvas);
 
     surf = mir_surface_create_sync(spec);
     mir_surface_spec_release(spec);
@@ -475,8 +476,7 @@
     if (surf != NULL)
     {
         mir_surface_set_swapinterval(surf, swap_interval);
-        mir_surface_set_event_handler(surf, &on_event, &canvas);
-    
+
         canvas.width = width;
         canvas.height = height;
         canvas.stride = canvas.width * BYTES_PER_PIXEL(pixel_format);
@@ -488,9 +488,9 @@
             signal(SIGINT, shutdown);
             signal(SIGTERM, shutdown);
             signal(SIGHUP, shutdown);
-        
+
             clear_region(&canvas, &background);
-        
+
             MirBufferStream *bs = mir_surface_get_buffer_stream(surf);
 
             while (running)
@@ -509,7 +509,10 @@
             }
 
             /* Ensure canvas won't be used after it's freed */
-            mir_surface_set_event_handler(surf, NULL, NULL);
+            MirSurfaceSpec* spec = mir_connection_create_spec_for_changes(conn);
+            mir_surface_spec_set_event_handler(spec, NULL, NULL);
+            mir_surface_apply_spec(surf, spec);
+            mir_surface_spec_release(spec);
             free(canvas.vaddr);
         }
         else

=== modified file 'examples/pointer_confinement.c'
--- examples/pointer_confinement.c	2016-12-09 02:54:31 +0000
+++ examples/pointer_confinement.c	2017-01-06 19:13:38 +0000
@@ -214,10 +214,10 @@
     glUseProgram(prog);
 
     MirSurface* surface = mir_eglapp_native_surface();
-    mir_surface_set_event_handler(surface, handle_event, NULL);
 
     spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
     mir_surface_spec_set_pointer_confinement(spec, mir_pointer_confined_to_surface);
+    mir_surface_spec_set_event_handler(spec, handle_event, NULL);
 
     mir_surface_apply_spec(surface, spec);
     mir_surface_spec_release(spec);

=== modified file 'examples/target.c'
--- examples/target.c	2016-10-21 07:53:23 +0000
+++ examples/target.c	2017-01-06 19:13:38 +0000
@@ -352,7 +352,10 @@
     }
 
     MirSurface *surface = mir_eglapp_native_surface();
-    mir_surface_set_event_handler(surface, on_event, &state);
+    MirSurfaceSpec *spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, on_event, &state);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
 
     while (true)
     {
@@ -421,7 +424,10 @@
         mir_eglapp_swap_buffers();
     }
 
-    mir_surface_set_event_handler(surface, NULL, NULL);
+    spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, NULL, NULL);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
     mir_eglapp_cleanup();
 
     pthread_join(shutdown_handler_thread, NULL);

=== modified file 'include/client/mir_toolkit/mir_surface.h'
--- include/client/mir_toolkit/mir_surface.h	2016-12-09 02:54:31 +0000
+++ include/client/mir_toolkit/mir_surface.h	2017-01-06 19:13:38 +0000
@@ -607,6 +607,9 @@
 
 /**
  * Set the event handler to be called when events arrive for a surface.
+ *
+ * \deprecated Use mir_surface_spec_set_event_handler instead.
+ *
  *   \warning event_handler could be called from another thread. You must do
  *            any locking appropriate to protect your data accessed in the
  *            callback. There is also a chance that different events will be
@@ -616,6 +619,7 @@
  *   \param [in] callback       The callback function
  *   \param [in] context        Additional argument to be passed to callback
  */
+__attribute__ ((deprecated))
 void mir_surface_set_event_handler(MirSurface *surface,
                                    mir_surface_event_callback callback,
                                    void* context);

=== modified file 'src/client/mir_surface.cpp'
--- src/client/mir_surface.cpp	2016-12-23 07:58:44 +0000
+++ src/client/mir_surface.cpp	2017-01-06 19:13:38 +0000
@@ -654,6 +654,13 @@
         surface_specification->set_hotspot_y(rs_cursor.hotspot.y.as_int());
     }
 
+    if (spec.event_handler.is_set())
+    {
+        set_event_handler(
+            spec.event_handler.value().callback,
+            spec.event_handler.value().context);
+    }
+
     modify_wait_handle.expect_result();
     server->modify_surface(&mods, modify_result.get(),
               google::protobuf::NewCallback(this, &MirSurface::on_modified));

=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2016-12-21 04:39:38 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2017-01-06 19:13:38 +0000
@@ -139,7 +139,10 @@
 
     void set_event_handler(mir_surface_event_callback cb, void* context) override
     {
-        mir_surface_set_event_handler(mir_surface, cb, context);
+        auto spec = mir_connection_create_spec_for_changes(mir_connection);
+        mir_surface_spec_set_event_handler(spec, cb, context);
+        mir_surface_apply_spec(mir_surface, spec);
+        mir_surface_spec_release(spec);
     }
 
     void set_cursor_image(mg::CursorImage const& image)

=== modified file 'src/utils/vanity.c'
--- src/utils/vanity.c	2016-11-07 02:53:07 +0000
+++ src/utils/vanity.c	2017-01-06 19:13:38 +0000
@@ -752,7 +752,10 @@
         false
     };
     MirSurface* surface = mir_eglapp_native_surface();
-    mir_surface_set_event_handler(surface, on_event, &state);
+    MirSurfaceSpec* spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, on_event, &state);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
 
     GLint tint = glGetUniformLocation(prog, "tint");
 
@@ -891,7 +894,10 @@
         last_swap_time = swap_time;
     }
 
-    mir_surface_set_event_handler(surface, NULL, NULL);
+    spec = mir_connection_create_spec_for_changes(mir_eglapp_native_connection());
+    mir_surface_spec_set_event_handler(spec, NULL, NULL);
+    mir_surface_apply_spec(surface, spec);
+    mir_surface_spec_release(spec);
     mir_eglapp_cleanup();
 
     pthread_join(capture_thread, NULL);

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2016-12-20 15:01:43 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2017-01-06 19:13:38 +0000
@@ -102,8 +102,10 @@
         if (!mir_surface_is_valid(surface))
             BOOST_THROW_EXCEPTION(std::runtime_error{std::string{"Failed creating a surface: "}+
                 mir_surface_get_error_message(surface)});
-
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_event, this);
+#pragma GCC diagnostic pop
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));
 
@@ -149,7 +151,10 @@
         // Remove the event handler to avoid handling spurious events unrelated
         // to the tests (e.g. pointer leave events when the surface is destroyed),
         // which can cause test expectations to fail.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_handler, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
     }

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2016-12-17 00:52:45 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2017-01-06 19:13:38 +0000
@@ -938,8 +938,11 @@
      *
      * Without manual dispatch, it's racy to try and test that.
      */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, &dummy_event_handler_one, nullptr);
     mir_surface_set_event_handler(surface, &dummy_event_handler_two, nullptr);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
     mir_connection_release(connection);

=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
--- tests/acceptance-tests/test_client_surface_events.cpp	2016-12-09 02:54:31 +0000
+++ tests/acceptance-tests/test_client_surface_events.cpp	2017-01-06 19:13:38 +0000
@@ -128,12 +128,15 @@
 
         mtf::ConnectedClientWithASurface::SetUp();
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, &event_callback, this);
 
         scene_surface = the_latest_surface();
 
         other_surface = mtf::make_any_surface(connection);
         mir_surface_set_event_handler(other_surface, nullptr, nullptr);
+#pragma GCC diagnostic pop
 
         reset_last_event();
     }
@@ -306,7 +309,10 @@
 {
     set_event_filter(mir_event_type_close_surface);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(surface, nullptr, nullptr);
+#pragma GCC diagnostic pop
     scene_surface->request_client_surface_close();
 
     EXPECT_FALSE(wait_for_event(std::chrono::seconds(1)));
@@ -348,6 +354,8 @@
     auto surface = mtf::make_any_surface(connection);
 
     mt::Signal focus_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(
         surface,
         [](MirSurface*, MirEvent const* event, void* ctx)
@@ -378,6 +386,7 @@
             }
         },
         &unfocus_received);
+#pragma GCC diagnostic pop
 
     mir_surface_release_sync(surface);
 
@@ -392,6 +401,8 @@
     auto surface = mtf::make_any_surface(connection);
 
     mt::Signal focus_received;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     mir_surface_set_event_handler(
         surface,
         [](MirSurface*, MirEvent const* event, void* ctx)
@@ -422,6 +433,7 @@
             }
         },
         &unfocus_received);
+#pragma GCC diagnostic pop
 
     // Add a new surface that will take focus.
     auto focus_grabbing_surface = mtf::make_any_surface(connection);

=== modified file 'tests/acceptance-tests/test_client_surface_visibility.cpp'
--- tests/acceptance-tests/test_client_surface_visibility.cpp	2016-08-11 07:24:14 +0000
+++ tests/acceptance-tests/test_client_surface_visibility.cpp	2017-01-06 19:13:38 +0000
@@ -126,7 +126,10 @@
 
     ~Surface()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_callback, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
     }
 

=== modified file 'tests/acceptance-tests/test_confined_pointer.cpp'
--- tests/acceptance-tests/test_confined_pointer.cpp	2017-01-04 04:40:09 +0000
+++ tests/acceptance-tests/test_confined_pointer.cpp	2017-01-06 19:13:38 +0000
@@ -89,7 +89,10 @@
                 mir_surface_get_error_message(surface)});
         }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_event, this);
+#pragma GCC diagnostic pop
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));
 
@@ -148,7 +151,10 @@
         // Remove the event handler to avoid handling spurious events unrelated
         // to the tests (e.g. pointer leave events when the surface is destroyed),
         // which can cause test expectations to fail.
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_handler, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
     }

=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp	2016-12-09 02:54:31 +0000
+++ tests/acceptance-tests/test_nested_input.cpp	2017-01-06 19:13:38 +0000
@@ -133,7 +133,10 @@
         // Ensure the nested server posts a frame
         connection = mir_connect_sync(connect_string.c_str(), __PRETTY_FUNCTION__);
         surface = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_event, this);
+#pragma GCC diagnostic pop
         mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
     }
 
@@ -173,7 +176,10 @@
     static void null_event_handler(MirSurface*, MirEvent const*, void*) {};
     ~ExposedSurface()
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, null_event_handler, nullptr);
+#pragma GCC diagnostic pop
         mir_surface_release_sync(surface);
         mir_connection_release(connection);
     }

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2016-12-16 00:09:49 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2017-01-06 19:13:38 +0000
@@ -420,7 +420,10 @@
 
     void wait_until_surface_ready(MirSurface* surface)
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, wait_for_key_a_event, this);
+#pragma GCC diagnostic pop
 
         auto const dummy_events_received = mt::spin_wait_for_condition_or_timeout(
             [this]
@@ -436,7 +439,10 @@
 
         EXPECT_TRUE(dummy_events_received);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, nullptr, nullptr);
+#pragma GCC diagnostic pop
     }
 
 protected:

=== modified file 'tests/acceptance-tests/test_surface_raise.cpp'
--- tests/acceptance-tests/test_surface_raise.cpp	2016-12-09 02:54:31 +0000
+++ tests/acceptance-tests/test_surface_raise.cpp	2017-01-06 19:13:38 +0000
@@ -52,23 +52,28 @@
     {
         ConnectedClientHeadlessServer::SetUp();
 
-       surface1 = mtf::make_any_surface(connection);
+        surface1 = mtf::make_any_surface(connection);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface1, &cookie_capturing_callback, this);
+#pragma GCC diagnostic pop
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface1));
 
         surface2 = mtf::make_any_surface(connection);
-        mir_surface_set_event_handler(surface2, &cookie_capturing_callback, this);
-        mir_buffer_stream_swap_buffers_sync(
-            mir_surface_get_buffer_stream(surface2));
 
         // Need fullscreen for the cursor events
         auto const spec = mir_connection_create_spec_for_changes(connection);
         mir_surface_spec_set_fullscreen_on_output(spec, 1);
         mir_surface_apply_spec(surface1, spec);
+
+        mir_surface_spec_set_event_handler(spec, &cookie_capturing_callback, this);
         mir_surface_apply_spec(surface2, spec);
         mir_surface_spec_release(spec);
-        
+
+        mir_buffer_stream_swap_buffers_sync(
+            mir_surface_get_buffer_stream(surface2));
+
         bool surface_fullscreen = mt::spin_wait_for_condition_or_timeout(
             [this]
             {

=== modified file 'tests/acceptance-tests/test_system_compositor_window_manager.cpp'
--- tests/acceptance-tests/test_system_compositor_window_manager.cpp	2016-06-08 13:49:11 +0000
+++ tests/acceptance-tests/test_system_compositor_window_manager.cpp	2017-01-06 19:13:38 +0000
@@ -81,7 +81,10 @@
         auto const surface = mir_surface_create_sync(spec);
         mir_surface_spec_release(spec);
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, on_surface_event, this);
+#pragma GCC diagnostic pop
 
         return SurfaceHandle{surface};
     };

=== modified file 'tests/privileged-tests/test_input_events.cpp'
--- tests/privileged-tests/test_input_events.cpp	2016-11-09 02:30:14 +0000
+++ tests/privileged-tests/test_input_events.cpp	2017-01-06 19:13:38 +0000
@@ -213,7 +213,10 @@
         if (!mir_surface_is_valid(surface))
             throw std::runtime_error("Failed to create MirSurface");
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
         mir_surface_set_event_handler(surface, handle_input, handler);
+#pragma GCC diagnostic pop
         mir_buffer_stream_swap_buffers_sync(
             mir_surface_get_buffer_stream(surface));