Merge lp:~alan-griffiths/miral/remove-properties-WM-ignores into lp:miral

[Alan Griffiths]

Remove pixel_format, buffer_usage and content_id properties from WindowSpecification as they are not used by Window Management

[Gerry Boland (gerboland)]

QtMir does need this info for compositing, but mir::shell::Surface has similar getters which we're using and which do the job.

I'm ok with this, as they're not WM specific info

review: Approve

=== modified file 'debian/libmiral1.symbols'
--- debian/libmiral1.symbols	2016-08-29 09:19:00 +0000
+++ debian/libmiral1.symbols	2016-09-05 10:44:19 +0000
@@ -189,9 +189,6 @@
  (c++)"miral::WindowSpecification::aux_rect_placement_gravity()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::aux_rect_placement_offset() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::aux_rect_placement_offset()@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::buffer_usage() const@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::buffer_usage()@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::content_id()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::height_inc() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::height_inc()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::input_mode() const@MIRAL_0.1" 0.1.0
@@ -217,8 +214,6 @@
  (c++)"miral::WindowSpecification::output_id()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::parent() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::parent()@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::pixel_format() const@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::pixel_format()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::placement_hints() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::placement_hints()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::preferred_orientation() const@MIRAL_0.1" 0.1.0
 
=== modified file 'include/miral/window_specification.h'
--- include/miral/window_specification.h	2016-08-29 14:26:01 +0000
+++ include/miral/window_specification.h	2016-09-05 10:44:19 +0000
@@ -133,8 +133,6 @@
 
     auto top_left() const -> mir::optional_value<Point> const&;
     auto size() const -> mir::optional_value<Size> const&;
-    auto pixel_format() const -> mir::optional_value<MirPixelFormat> const&;
-    auto buffer_usage() const -> mir::optional_value<BufferUsage> const&;
     auto name() const -> mir::optional_value<std::string> const&;
     auto output_id() const -> mir::optional_value<int> const&;
     auto type() const -> mir::optional_value<MirSurfaceType> const&;
@@ -162,13 +160,11 @@
     auto top_left() -> mir::optional_value<Point>&;
     auto size() -> mir::optional_value<Size>&;
     auto pixel_format() -> mir::optional_value<MirPixelFormat>&;
-    auto buffer_usage() -> mir::optional_value<BufferUsage>&;
     auto name() -> mir::optional_value<std::string>&;
     auto output_id() -> mir::optional_value<int>&;
     auto type() -> mir::optional_value<MirSurfaceType>&;
     auto state() -> mir::optional_value<MirSurfaceState>&;
     auto preferred_orientation() -> mir::optional_value<MirOrientationMode>&;
-    auto content_id() -> mir::optional_value<BufferStreamId>&;
     auto aux_rect() -> mir::optional_value<Rectangle>&;
     auto placement_hints() -> mir::optional_value<MirPlacementHints>&;
     auto window_placement_gravity() -> mir::optional_value<MirPlacementGravity>&;
 
=== modified file 'miral/symbols.map'
--- miral/symbols.map	2016-08-29 09:19:00 +0000
+++ miral/symbols.map	2016-09-05 10:44:19 +0000
@@ -165,8 +165,6 @@
     miral::WindowSpecification::aux_rect*;
     miral::WindowSpecification::aux_rect_placement_gravity*;
     miral::WindowSpecification::aux_rect_placement_offset*;
-    miral::WindowSpecification::buffer_usage*;
-    miral::WindowSpecification::content_id*;
     miral::WindowSpecification::height_inc*;
     miral::WindowSpecification::input_mode*;
     miral::WindowSpecification::input_shape*;
@@ -180,7 +178,6 @@
     miral::WindowSpecification::operator*;
     miral::WindowSpecification::output_id*;
     miral::WindowSpecification::parent*;
-    miral::WindowSpecification::pixel_format*;
     miral::WindowSpecification::placement_hints*;
     miral::WindowSpecification::preferred_orientation*;
     miral::WindowSpecification::shell_chrome*;
 
=== modified file 'miral/window_specification.cpp'
--- miral/window_specification.cpp	2016-08-29 11:17:18 +0000
+++ miral/window_specification.cpp	2016-09-05 10:44:19 +0000
@@ -394,16 +394,6 @@
     return self->size;
 }
 
-auto miral::WindowSpecification::pixel_format() const -> mir::optional_value<MirPixelFormat> const&
-{
-    return self->pixel_format;
-}
-
-auto miral::WindowSpecification::buffer_usage() const -> mir::optional_value<BufferUsage> const&
-{
-    return self->buffer_usage;
-}
-
 auto miral::WindowSpecification::name() const -> mir::optional_value<std::string> const&
 {
     return self->name;
@@ -534,11 +524,6 @@
     return self->pixel_format;
 }
 
-auto miral::WindowSpecification::buffer_usage() -> mir::optional_value<BufferUsage>&
-{
-    return self->buffer_usage;
-}
-
 auto miral::WindowSpecification::name() -> mir::optional_value<std::string>&
 {
     return self->name;
@@ -564,11 +549,6 @@
     return self->preferred_orientation;
 }
 
-auto miral::WindowSpecification::content_id() -> mir::optional_value<BufferStreamId>&
-{
-    return self->content_id;
-}
-
 auto miral::WindowSpecification::aux_rect() -> mir::optional_value<Rectangle>&
 {
     return self->aux_rect;