Merge lp:~vanvugt/mir/privatize-SurfaceState into lp:mir

[Daniel van Vugt]

Privatize SurfaceState and MutableSurfaceState, which are only used
internally and don't need to be fully declared in public headers.

Another small step toward a /designed and controlled/ server SDK (LP: #1223393)

This proposal does not affect any ABIs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1106
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/83/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> This proposal does not affect any ABIs.

True, but it does affect the server API - as it removes a file we are publishing.

review: Approve

[Daniel van Vugt (vanvugt)]

Yep. I was wondering if anyone paid enough attention to notice that. According to current documentation [1] it does not affect APIs in use either.

[1] https://docs.google.com/a/canonical.com/document/d/1cLVfnBh4Z01uUZXiX3ocSw3_MXSDuR4Cv9sHxE-V7Xw/edit

[Alan Griffiths (alan-griffiths)]

> Yep. I was wondering if anyone paid enough attention to notice that. According
> to current documentation [1] it does not affect APIs in use either.
>
> [1] https://docs.google.com/a/canonical.com/document/d
> /1cLVfnBh4Z01uUZXiX3ocSw3_MXSDuR4Cv9sHxE-V7Xw/edit

I agree it doesn't affect *known* downstream projects. But it is still an API break. ;)

=== modified file 'include/test/mir_test_doubles/mock_surface_state.h'
--- include/test/mir_test_doubles/mock_surface_state.h	2013-08-28 03:41:48 +0000
+++ include/test/mir_test_doubles/mock_surface_state.h	2013-10-03 06:06:03 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_SURFACE_STATE_H_
 #define MIR_TEST_DOUBLES_MOCK_SURFACE_STATE_H_
 
-#include "mir/surfaces/surface_state.h"
+#include "src/server/surfaces/surface_state.h"
 #include <gmock/gmock.h>
 
 namespace mir

=== renamed file 'include/server/mir/surfaces/mutable_surface_state.h' => 'src/server/surfaces/mutable_surface_state.h'
=== modified file 'src/server/surfaces/surface.cpp'
--- src/server/surfaces/surface.cpp	2013-08-29 09:20:06 +0000
+++ src/server/surfaces/surface.cpp	2013-10-03 06:06:03 +0000
@@ -19,7 +19,7 @@
  */
 
 #include "mir/surfaces/surface.h"
-#include "mir/surfaces/surface_state.h"
+#include "surface_state.h"
 #include "mir/surfaces/buffer_stream.h"
 #include "mir/input/input_channel.h"
 #include "mir/graphics/buffer.h"

=== modified file 'src/server/surfaces/surface_data.h'
--- src/server/surfaces/surface_data.h	2013-10-02 09:28:12 +0000
+++ src/server/surfaces/surface_data.h	2013-10-03 06:06:03 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_SURFACES_SURFACE_DATA_STORAGE_H_
 #define MIR_SURFACES_SURFACE_DATA_STORAGE_H_
 
-#include "mir/surfaces/surface_state.h"
+#include "surface_state.h"
 
 #include <vector>
 #include <functional>

=== modified file 'src/server/surfaces/surface_stack.cpp'
--- src/server/surfaces/surface_stack.cpp	2013-08-28 03:41:48 +0000
+++ src/server/surfaces/surface_stack.cpp	2013-10-03 06:06:03 +0000
@@ -22,7 +22,7 @@
 #include "mir/compositor/renderer.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/surfaces/surface.h"
-#include "mir/surfaces/surface_state.h"
+#include "surface_state.h"
 #include "mir/surfaces/surface_stack.h"
 #include "mir/surfaces/surface_factory.h"
 #include "mir/surfaces/buffer_stream.h"

=== renamed file 'include/server/mir/surfaces/surface_state.h' => 'src/server/surfaces/surface_state.h'
--- include/server/mir/surfaces/surface_state.h	2013-08-28 03:41:48 +0000
+++ src/server/surfaces/surface_state.h	2013-10-03 06:06:03 +0000
@@ -21,7 +21,7 @@
 
 #include "mir/compositor/compositing_criteria.h"
 #include "mir/input/surface.h"
-#include "mir/surfaces/mutable_surface_state.h"
+#include "mutable_surface_state.h"
 
 namespace mir
 {