← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to src/server/frontend/session_mediator.h

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20140108020438-e1npu0pm7qdv5wc4
Tags: upstream-0.1.3+14.04.20140108
Import upstream version 0.1.3+14.04.20140108

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/frontend/session_mediator.h
22
22
 
23
23
#include "mir_protobuf.pb.h"
24
24
#include "mir/frontend/surface_id.h"
25
 
#include "mir/geometry/pixel_format.h"
 
25
#include "mir_toolkit/common.h"
26
26
 
27
27
#include <unordered_map>
28
28
#include <memory>
61
61
        std::shared_ptr<Shell> const& shell,
62
62
        std::shared_ptr<graphics::Platform> const& graphics_platform,
63
63
        std::shared_ptr<frontend::DisplayChanger> const& display_changer,
64
 
        std::vector<geometry::PixelFormat> const& surface_pixel_formats,
 
64
        std::vector<MirPixelFormat> const& surface_pixel_formats,
65
65
        std::shared_ptr<SessionMediatorReport> const& report,
66
66
        std::shared_ptr<EventSink> const& event_sink,
67
67
        std::shared_ptr<ResourceCache> const& resource_cache);
113
113
 
114
114
private:
115
115
    void pack_protobuf_buffer(protobuf::Buffer& protobuf_buffer,
116
 
                              std::shared_ptr<graphics::Buffer> const& graphics_buffer,
 
116
                              graphics::Buffer* graphics_buffer,
117
117
                              bool need_full_ipc);
118
118
 
119
 
    std::tuple<std::shared_ptr<graphics::Buffer>, bool> advance_buffer(SurfaceId surf_id, Surface& surface);
 
119
    std::tuple<graphics::Buffer*, bool> advance_buffer(SurfaceId surf_id, Surface& surface);
120
120
    std::shared_ptr<Shell> const shell;
121
121
    std::shared_ptr<graphics::Platform> const graphics_platform;
122
122
 
123
 
    std::vector<geometry::PixelFormat> const surface_pixel_formats;
 
123
    std::vector<MirPixelFormat> const surface_pixel_formats;
124
124
 
125
125
    std::shared_ptr<frontend::DisplayChanger> const display_changer;
126
126
    std::shared_ptr<SessionMediatorReport> const report;
127
127
    std::shared_ptr<EventSink> const event_sink;
128
128
    std::shared_ptr<ResourceCache> const resource_cache;
129
129
 
130
 
    std::unordered_map<SurfaceId,std::shared_ptr<graphics::Buffer>> client_buffer_resource;
 
130
    std::unordered_map<SurfaceId,graphics::Buffer*> client_buffer_resource;
131
131
    std::unordered_map<SurfaceId, std::shared_ptr<ClientBufferTracker>> client_buffer_tracker;
132
132
 
133
133
    std::mutex session_mutex;