Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "blimp/common/create_blimp_message.h" | 5 #include "blimp/common/create_blimp_message.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "blimp/common/proto/blimp_message.pb.h" | 10 #include "blimp/common/proto/blimp_message.pb.h" |
| 11 #include "blimp/common/proto/blob_channel.pb.h" | |
| 11 #include "blimp/common/proto/compositor.pb.h" | 12 #include "blimp/common/proto/compositor.pb.h" |
| 12 #include "blimp/common/proto/input.pb.h" | 13 #include "blimp/common/proto/input.pb.h" |
| 13 #include "blimp/common/proto/render_widget.pb.h" | 14 #include "blimp/common/proto/render_widget.pb.h" |
| 14 #include "blimp/common/proto/settings.pb.h" | 15 #include "blimp/common/proto/settings.pb.h" |
| 15 #include "blimp/common/proto/tab_control.pb.h" | 16 #include "blimp/common/proto/tab_control.pb.h" |
| 16 | 17 |
| 17 namespace blimp { | 18 namespace blimp { |
| 18 | 19 |
| 19 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 20 std::unique_ptr<BlimpMessage> CreateBlimpMessage( |
| 20 CompositorMessage** compositor_message, | 21 CompositorMessage** compositor_message, |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 87 | 88 |
| 88 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | 89 std::unique_ptr<BlimpMessage> CreateBlimpMessage( |
| 89 EngineSettingsMessage** engine_settings) { | 90 EngineSettingsMessage** engine_settings) { |
| 90 DCHECK(engine_settings); | 91 DCHECK(engine_settings); |
| 91 std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 92 std::unique_ptr<BlimpMessage> output(new BlimpMessage); |
| 92 output->set_type(BlimpMessage::SETTINGS); | 93 output->set_type(BlimpMessage::SETTINGS); |
| 93 *engine_settings = output->mutable_settings()->mutable_engine_settings(); | 94 *engine_settings = output->mutable_settings()->mutable_engine_settings(); |
| 94 return output; | 95 return output; |
| 95 } | 96 } |
| 96 | 97 |
| 98 std::unique_ptr<BlimpMessage> CreateBlimpMessage( | |
|
haibinlu
2016/05/12 18:20:09
add a unit test case?
Kevin M
2016/05/13 18:40:23
Done.
| |
| 99 std::unique_ptr<BlobChannelMessage> blob_channel_message) { | |
| 100 std::unique_ptr<BlimpMessage> output(new BlimpMessage); | |
| 101 output->set_type(BlimpMessage::BLOB_CHANNEL); | |
| 102 output->set_allocated_blob_channel(blob_channel_message.release()); | |
| 103 return output; | |
| 104 } | |
| 105 | |
| 97 std::unique_ptr<BlimpMessage> CreateStartConnectionMessage( | 106 std::unique_ptr<BlimpMessage> CreateStartConnectionMessage( |
| 98 const std::string& client_token, | 107 const std::string& client_token, |
| 99 int protocol_version) { | 108 int protocol_version) { |
| 100 std::unique_ptr<BlimpMessage> output(new BlimpMessage); | 109 std::unique_ptr<BlimpMessage> output(new BlimpMessage); |
| 101 output->set_type(BlimpMessage::PROTOCOL_CONTROL); | 110 output->set_type(BlimpMessage::PROTOCOL_CONTROL); |
| 102 | 111 |
| 103 ProtocolControlMessage* control_message = output->mutable_protocol_control(); | 112 ProtocolControlMessage* control_message = output->mutable_protocol_control(); |
| 104 control_message->set_type(ProtocolControlMessage::START_CONNECTION); | 113 control_message->set_type(ProtocolControlMessage::START_CONNECTION); |
| 105 | 114 |
| 106 StartConnectionMessage* start_connection_message = | 115 StartConnectionMessage* start_connection_message = |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 120 control_message->set_type(ProtocolControlMessage::CHECKPOINT_ACK); | 129 control_message->set_type(ProtocolControlMessage::CHECKPOINT_ACK); |
| 121 | 130 |
| 122 CheckpointAckMessage* checkpoint_ack_message = | 131 CheckpointAckMessage* checkpoint_ack_message = |
| 123 control_message->mutable_checkpoint_ack(); | 132 control_message->mutable_checkpoint_ack(); |
| 124 checkpoint_ack_message->set_checkpoint_id(checkpoint_id); | 133 checkpoint_ack_message->set_checkpoint_id(checkpoint_id); |
| 125 | 134 |
| 126 return output; | 135 return output; |
| 127 } | 136 } |
| 128 | 137 |
| 129 } // namespace blimp | 138 } // namespace blimp |
| OLD | NEW |