Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: blimp/net/blimp_connection.cc

Issue 2019463002: Reland: Added a debug info UI for Blimp (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed an ownership issue Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_connection.h" 5 #include "blimp/net/blimp_connection.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "base/message_loop/message_loop.h" 11 #include "base/message_loop/message_loop.h"
12 #include "blimp/common/logging.h" 12 #include "blimp/common/logging.h"
13 #include "blimp/common/proto/blimp_message.pb.h" 13 #include "blimp/common/proto/blimp_message.pb.h"
14 #include "blimp/net/blimp_message_processor.h" 14 #include "blimp/net/blimp_message_processor.h"
15 #include "blimp/net/blimp_message_pump.h" 15 #include "blimp/net/blimp_message_pump.h"
16 #include "blimp/net/common.h" 16 #include "blimp/net/common.h"
17 #include "blimp/net/connection_error_observer.h" 17 #include "blimp/net/connection_error_observer.h"
18 #include "blimp/net/packet_reader.h" 18 #include "blimp/net/packet_reader.h"
19 #include "blimp/net/packet_writer.h" 19 #include "blimp/net/packet_writer.h"
20 #include "net/base/completion_callback.h" 20 #include "net/base/completion_callback.h"
21 21
22 namespace blimp { 22 namespace blimp {
23 namespace {
24 23
25 // Forwards incoming blimp messages to PacketWriter. 24 // Forwards incoming blimp messages to PacketWriter.
26 class BlimpMessageSender : public BlimpMessageProcessor { 25 class BlimpMessageSender : public BlimpMessageProcessor {
27 public: 26 public:
28 explicit BlimpMessageSender(PacketWriter* writer); 27 explicit BlimpMessageSender(PacketWriter* writer);
29 ~BlimpMessageSender() override; 28 ~BlimpMessageSender() override;
30 29
31 void set_error_observer(ConnectionErrorObserver* observer) { 30 void set_error_observer(ConnectionErrorObserver* observer) {
32 error_observer_ = observer; 31 error_observer_ = observer;
33 } 32 }
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 net::CompletionCallback process_callback = 98 net::CompletionCallback process_callback =
100 base::ResetAndReturn(&pending_process_msg_callback_); 99 base::ResetAndReturn(&pending_process_msg_callback_);
101 100
102 if (result != net::OK) { 101 if (result != net::OK) {
103 error_observer_->OnConnectionError(result); 102 error_observer_->OnConnectionError(result);
104 } 103 }
105 104
106 process_callback.Run(result); 105 process_callback.Run(result);
107 } 106 }
108 107
109 } // namespace
110
111 BlimpConnection::BlimpConnection(std::unique_ptr<PacketReader> reader, 108 BlimpConnection::BlimpConnection(std::unique_ptr<PacketReader> reader,
112 std::unique_ptr<PacketWriter> writer) 109 std::unique_ptr<PacketWriter> writer)
113 : reader_(std::move(reader)), 110 : reader_(std::move(reader)),
114 message_pump_(new BlimpMessagePump(reader_.get())), 111 message_pump_(new BlimpMessagePump(reader_.get())),
115 writer_(std::move(writer)), 112 writer_(std::move(writer)),
116 outgoing_msg_processor_(new BlimpMessageSender(writer_.get())) { 113 outgoing_msg_processor_(new BlimpMessageSender(writer_.get())) {
117 DCHECK(writer_); 114 DCHECK(writer_);
118 DCHECK(reader_); 115 DCHECK(reader_);
119 116
120 message_pump_->set_error_observer(this); 117 message_pump_->set_error_observer(this);
121 BlimpMessageSender* sender = 118 outgoing_msg_processor_->set_error_observer(this);
122 static_cast<BlimpMessageSender*>(outgoing_msg_processor_.get());
123 sender->set_error_observer(this);
124 } 119 }
125 120
126 BlimpConnection::BlimpConnection() {} 121 BlimpConnection::BlimpConnection() {}
127 122
128 BlimpConnection::~BlimpConnection() { 123 BlimpConnection::~BlimpConnection() {
129 VLOG(1) << "BlimpConnection destroyed."; 124 VLOG(1) << "BlimpConnection destroyed.";
130 } 125 }
131 126
132 void BlimpConnection::AddConnectionErrorObserver( 127 void BlimpConnection::AddConnectionErrorObserver(
133 ConnectionErrorObserver* observer) { 128 ConnectionErrorObserver* observer) {
(...skipping 16 matching lines...) Expand all
150 145
151 void BlimpConnection::OnConnectionError(int error) { 146 void BlimpConnection::OnConnectionError(int error) {
152 VLOG(1) << "OnConnectionError, error=" << error; 147 VLOG(1) << "OnConnectionError, error=" << error;
153 148
154 // Propagate the error to all observers. 149 // Propagate the error to all observers.
155 FOR_EACH_OBSERVER(ConnectionErrorObserver, error_observers_, 150 FOR_EACH_OBSERVER(ConnectionErrorObserver, error_observers_,
156 OnConnectionError(error)); 151 OnConnectionError(error));
157 } 152 }
158 153
159 } // namespace blimp 154 } // namespace blimp
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698