← Back to branch summary

~kgunn72/mir/dont-crash-when-shooting-invalid-surface

« back to all changes in this revision

Viewing changes to src/server/scene/surface_controller.h

  • Committer: Tarmac
  • Author(s): Alan Griffiths, Alexandros Frantzis, Daniel van Vugt, Kevin DuBois, Christopher James Halse Rogers, chris.gagnon, Mathieu Trudel-Lapierre, Robert Carr, Automatic PS uploader, Kevin Gunn, Daniel d'Andrada, Christopher James Halse Rogers, Michael Terry, Brandon Schaefer, Timo Jyrinki, Mir Team, Andreas Pokorny
  • Date: 2013-12-20 11:11:22 UTC
  • mfrom: (1169.1.1 version-0.1.3)
  • Revision ID: tarmac-20131220111122-h503fd1fnq7pn9za
Latest upstream release: Mir 0.1.3 (r1298).

Approved by Alan Griffiths, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/scene/surface_controller.h
21
21
#define MIR_SCENE_SURFACE_CONTROLLER_H_
22
22
 
23
23
#include "surface_builder.h"
24
 
#include "mir/shell/surface_controller.h"
 
24
#include "surface_ranker.h"
25
25
 
26
26
namespace mir
27
27
{
35
35
class SurfaceStackModel;
36
36
 
37
37
/// Will grow up to provide synchronization of model updates
38
 
class SurfaceController : public SurfaceBuilder, public shell::SurfaceController
 
38
class SurfaceController : public SurfaceBuilder, public SurfaceRanker
39
39
{
40
40
public:
41
41
    explicit SurfaceController(std::shared_ptr<SurfaceStackModel> const& surface_stack);
42
42
 
43
 
    virtual std::weak_ptr<BasicSurface> create_surface(shell::Session* session, shell::SurfaceCreationParameters const& params);
 
43
    virtual std::weak_ptr<BasicSurface> create_surface(shell::SurfaceCreationParameters const& params);
44
44
    virtual void destroy_surface(std::weak_ptr<BasicSurface> const& surface);
45
45
 
46
46
    virtual void raise(std::weak_ptr<BasicSurface> const& surface);