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/net/blimp_message_pump.h" | 5 #include "blimp/net/blimp_message_pump.h" |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "blimp/common/proto/blimp_message.pb.h" | 8 #include "blimp/common/proto/blimp_message.pb.h" |
9 #include "blimp/net/blimp_message_processor.h" | 9 #include "blimp/net/blimp_message_processor.h" |
10 #include "blimp/net/common.h" | 10 #include "blimp/net/common.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 reader_->ReadPacket(buffer_.get(), read_callback_.callback()); | 52 reader_->ReadPacket(buffer_.get(), read_callback_.callback()); |
53 } | 53 } |
54 | 54 |
55 void BlimpMessagePump::OnReadPacketComplete(int result) { | 55 void BlimpMessagePump::OnReadPacketComplete(int result) { |
56 DVLOG(2) << "OnReadPacketComplete, result=" << result; | 56 DVLOG(2) << "OnReadPacketComplete, result=" << result; |
57 DCHECK(read_inflight_); | 57 DCHECK(read_inflight_); |
58 read_inflight_ = false; | 58 read_inflight_ = false; |
59 if (result == net::OK) { | 59 if (result == net::OK) { |
60 scoped_ptr<BlimpMessage> message(new BlimpMessage); | 60 scoped_ptr<BlimpMessage> message(new BlimpMessage); |
61 if (message->ParseFromArray(buffer_->StartOfBuffer(), buffer_->offset())) { | 61 if (message->ParseFromArray(buffer_->StartOfBuffer(), buffer_->offset())) { |
| 62 DVLOG(2) << "Parsed message: " << *message; |
62 processor_->ProcessMessage(std::move(message), | 63 processor_->ProcessMessage(std::move(message), |
63 process_msg_callback_.callback()); | 64 process_msg_callback_.callback()); |
64 } else { | 65 } else { |
65 result = net::ERR_FAILED; | 66 result = net::ERR_FAILED; |
66 } | 67 } |
67 } | 68 } |
68 | 69 |
69 if (result != net::OK) { | 70 if (result != net::OK) { |
70 error_observer_->OnConnectionError(result); | 71 error_observer_->OnConnectionError(result); |
71 } | 72 } |
72 } | 73 } |
73 | 74 |
74 void BlimpMessagePump::OnProcessMessageComplete(int result) { | 75 void BlimpMessagePump::OnProcessMessageComplete(int result) { |
75 DVLOG(2) << "OnProcessMessageComplete, result=" << result; | 76 DVLOG(2) << "OnProcessMessageComplete, result=" << result; |
76 | 77 |
77 if (result != net::OK) { | 78 if (result != net::OK) { |
78 error_observer_->OnConnectionError(result); | 79 error_observer_->OnConnectionError(result); |
79 return; | 80 return; |
80 } | 81 } |
81 | 82 |
82 if (processor_) | 83 if (processor_) |
83 ReadNextPacket(); | 84 ReadNextPacket(); |
84 } | 85 } |
85 | 86 |
86 } // namespace blimp | 87 } // namespace blimp |
OLD | NEW |