Merge lp:~alan-griffiths/mir/move-SurfaceBufferAccess-to-scene into lp:mir

[Alan Griffiths]

scene, shell: SurfaceBufferAccess belongs in scene, not shell

scene, shell: SurfaceBufferAccess belongs in scene, not shell

Snapshot and SnapshotCallback too - but moving them will be easier after landing https://code.launchpad.net/~alan-griffiths/mir/scene-grabs-Session-and-SessionListener/+merge/214275

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1538
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/1515
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/1513
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/1089
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/994
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/999
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/999/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/1090
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/1090/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1008
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5691

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/1262/rebuild

review: Approve (continuous-integration)

=== modified file 'include/server/mir/scene/surface.h'
--- include/server/mir/scene/surface.h	2014-04-03 13:56:16 +0000
+++ include/server/mir/scene/surface.h	2014-04-07 16:20:27 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/graphics/renderable.h"
 #include "mir/input/surface.h"
-#include "mir/shell/surface_buffer_access.h"
+#include "mir/scene/surface_buffer_access.h"
 #include "mir/frontend/surface.h"
 
 #include <vector>
@@ -40,7 +40,7 @@
     public graphics::Renderable,
     public input::Surface,
     public frontend::Surface,
-    public shell::SurfaceBufferAccess
+    public SurfaceBufferAccess
 {
 public:
     // resolve ambiguous member function names

=== renamed file 'include/server/mir/shell/surface_buffer_access.h' => 'include/server/mir/scene/surface_buffer_access.h'
--- include/server/mir/shell/surface_buffer_access.h	2013-08-28 03:41:48 +0000
+++ include/server/mir/scene/surface_buffer_access.h	2014-04-07 16:20:27 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2013 Canonical Ltd.
+ * Copyright © 2013-2014 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,
@@ -16,8 +16,8 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#ifndef MIR_SHELL_SURFACE_BUFFER_ACCESS_H_
-#define MIR_SHELL_SURFACE_BUFFER_ACCESS_H_
+#ifndef MIR_SCENE_SURFACE_BUFFER_ACCESS_H_
+#define MIR_SCENE_SURFACE_BUFFER_ACCESS_H_
 
 #include <functional>
 
@@ -27,7 +27,7 @@
 {
 class Buffer;
 }
-namespace shell
+namespace scene
 {
 
 class SurfaceBufferAccess
@@ -47,4 +47,4 @@
 }
 }
 
-#endif /* MIR_SHELL_SURFACE_BUFFER_ACCESS_H_ */
+#endif /* MIR_SCENE_SURFACE_BUFFER_ACCESS_H_ */

=== modified file 'include/test/mir_test_doubles/null_snapshot_strategy.h'
--- include/test/mir_test_doubles/null_snapshot_strategy.h	2014-03-06 06:05:17 +0000
+++ include/test/mir_test_doubles/null_snapshot_strategy.h	2014-04-07 16:20:27 +0000
@@ -30,7 +30,7 @@
 
 struct NullSnapshotStrategy : public scene::SnapshotStrategy
 {
-    void take_snapshot_of(std::shared_ptr<shell::SurfaceBufferAccess> const&,
+    void take_snapshot_of(std::shared_ptr<scene::SurfaceBufferAccess> const&,
                           shell::SnapshotCallback const&)
     {
     }

=== modified file 'src/server/scene/snapshot_strategy.h'
--- src/server/scene/snapshot_strategy.h	2014-03-06 06:05:17 +0000
+++ src/server/scene/snapshot_strategy.h	2014-04-07 16:20:27 +0000
@@ -25,20 +25,17 @@
 
 namespace mir
 {
-namespace shell
+namespace scene
 {
 class SurfaceBufferAccess;
-}
 
-namespace scene
-{
 class SnapshotStrategy
 {
 public:
     virtual ~SnapshotStrategy() = default;
 
     virtual void take_snapshot_of(
-        std::shared_ptr<shell::SurfaceBufferAccess> const& surface_buffer_access,
+        std::shared_ptr<SurfaceBufferAccess> const& surface_buffer_access,
         shell::SnapshotCallback const& snapshot_taken) = 0;
 
 protected:

=== modified file 'src/server/scene/threaded_snapshot_strategy.cpp'
--- src/server/scene/threaded_snapshot_strategy.cpp	2014-03-06 06:05:17 +0000
+++ src/server/scene/threaded_snapshot_strategy.cpp	2014-04-07 16:20:27 +0000
@@ -18,7 +18,7 @@
 
 #include "threaded_snapshot_strategy.h"
 #include "pixel_buffer.h"
-#include "mir/shell/surface_buffer_access.h"
+#include "mir/scene/surface_buffer_access.h"
 
 #include <deque>
 #include <mutex>
@@ -35,7 +35,7 @@
 
 struct WorkItem
 {
-    std::shared_ptr<msh::SurfaceBufferAccess> const surface_buffer_access;
+    std::shared_ptr<SurfaceBufferAccess> const surface_buffer_access;
     msh::SnapshotCallback const snapshot_taken;
 };
 
@@ -125,7 +125,7 @@
 }
 
 void ms::ThreadedSnapshotStrategy::take_snapshot_of(
-    std::shared_ptr<msh::SurfaceBufferAccess> const& surface_buffer_access,
+    std::shared_ptr<SurfaceBufferAccess> const& surface_buffer_access,
     msh::SnapshotCallback const& snapshot_taken)
 {
     functor->schedule_snapshot(WorkItem{surface_buffer_access, snapshot_taken});

=== modified file 'src/server/scene/threaded_snapshot_strategy.h'
--- src/server/scene/threaded_snapshot_strategy.h	2014-03-06 06:05:17 +0000
+++ src/server/scene/threaded_snapshot_strategy.h	2014-04-07 16:20:27 +0000
@@ -39,7 +39,7 @@
     ~ThreadedSnapshotStrategy() noexcept;
 
     void take_snapshot_of(
-        std::shared_ptr<shell::SurfaceBufferAccess> const& surface_buffer_access,
+        std::shared_ptr<SurfaceBufferAccess> const& surface_buffer_access,
         shell::SnapshotCallback const& snapshot_taken);
 
 private:

=== modified file 'tests/unit-tests/scene/test_application_session.cpp'
--- tests/unit-tests/scene/test_application_session.cpp	2014-04-03 13:17:52 +0000
+++ tests/unit-tests/scene/test_application_session.cpp	2014-04-07 16:20:27 +0000
@@ -52,7 +52,7 @@
     ~MockSnapshotStrategy() noexcept {}
 
     MOCK_METHOD2(take_snapshot_of,
-                void(std::shared_ptr<msh::SurfaceBufferAccess> const&,
+                void(std::shared_ptr<ms::SurfaceBufferAccess> const&,
                      msh::SnapshotCallback const&));
 };
 
@@ -264,7 +264,7 @@
     mtd::NullEventSink sender;
     auto const default_surface = make_mock_surface();
     auto const default_surface_buffer_access =
-        std::static_pointer_cast<msh::SurfaceBufferAccess>(default_surface);
+        std::static_pointer_cast<ms::SurfaceBufferAccess>(default_surface);
     auto const snapshot_strategy = std::make_shared<MockSnapshotStrategy>();
 
     EXPECT_CALL(surface_coordinator, add_surface(_,_,_))

=== modified file 'tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp'
--- tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp	2014-03-06 06:05:17 +0000
+++ tests/unit-tests/scene/test_threaded_snapshot_strategy.cpp	2014-04-07 16:20:27 +0000
@@ -18,7 +18,7 @@
 
 #include "src/server/scene/threaded_snapshot_strategy.h"
 #include "src/server/scene/pixel_buffer.h"
-#include "mir/shell/surface_buffer_access.h"
+#include "mir/scene/surface_buffer_access.h"
 #include "mir/graphics/buffer.h"
 
 #include "mir_test_doubles/stub_buffer.h"
@@ -38,7 +38,7 @@
 namespace mtd = mir::test::doubles;
 namespace geom = mir::geometry;
 
-class StubSurfaceBufferAccess : public msh::SurfaceBufferAccess
+class StubSurfaceBufferAccess : public ms::SurfaceBufferAccess
 {
 public:
     ~StubSurfaceBufferAccess() noexcept {}