← Back to branch summary

~mterry/mir/session-for-surface

« back to all changes in this revision

Viewing changes to include/server/mir/frontend/session_mediator.h

  • Committer: Michael Terry
  • Date: 2013-07-18 17:24:31 UTC
  • mfrom: (832.1.32 trunk)
  • Revision ID: michael.terry@canonical.com-20130718172431-xtdoug2fp31asy06
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/server/mir/frontend/session_mediator.h
34
34
}
35
35
namespace graphics
36
36
{
 
37
class Buffer;
37
38
class Platform;
38
39
class ViewableArea;
39
40
}
40
41
 
41
42
namespace compositor
42
43
{
43
 
class Buffer;
44
44
class GraphicBufferAllocator;
45
45
}
46
46
 
123
123
    std::shared_ptr<ResourceCache> const resource_cache;
124
124
    std::shared_ptr<ClientBufferTracker> const client_tracker;
125
125
 
126
 
    std::shared_ptr<compositor::Buffer> client_buffer_resource;
 
126
    std::shared_ptr<graphics::Buffer> client_buffer_resource;
127
127
 
128
128
    std::mutex session_mutex;
129
129
    std::shared_ptr<Session> session;