← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/server/frontend/event_sender.cpp

  • Committer: Daniel van Vugt
  • Date: 2016-07-18 07:38:38 UTC
  • mfrom: (3595 development-branch)
  • mto: This revision was merged to the branch mainline in revision 3748.
  • Revision ID: daniel.van.vugt@canonical.com-20160718073838-tclt9c441h505wck
Merge latest trunk.  No conflicts in 7+ weeks?!

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/frontend/event_sender.cpp
136
136
    send_buffer(seq, buffer, mg::BufferIpcMsgType::full_msg);
137
137
}
138
138
 
 
139
void mfd::EventSender::error_buffer(graphics::BufferProperties const& properties, std::string const& error)
 
140
{
 
141
    mp::EventSequence seq;
 
142
    auto request = seq.mutable_buffer_request();
 
143
    request->set_operation(mir::protobuf::BufferOperation::add);
 
144
    request->mutable_buffer()->set_error(error);
 
145
    request->mutable_buffer()->set_width(properties.size.width.as_int());
 
146
    request->mutable_buffer()->set_height(properties.size.height.as_int());
 
147
    send_event_sequence(seq, {});
 
148
}
 
149
 
139
150
void mfd::EventSender::remove_buffer(graphics::Buffer& buffer)
140
151
{
141
152
    mp::EventSequence seq;