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

Side by Side Diff: net/quic/chromium/quic_chromium_client_session.cc

Issue 2458793002: Server push cancellation: add PushPromiseHelper which reflects information on the push promise. (Closed)
Patch Set: address rch's comments Created 4 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/quic/chromium/quic_chromium_client_session.h" 5 #include "net/quic/chromium/quic_chromium_client_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 13 matching lines...) Expand all
24 #include "net/log/net_log_event_type.h" 24 #include "net/log/net_log_event_type.h"
25 #include "net/log/net_log_source_type.h" 25 #include "net/log/net_log_source_type.h"
26 #include "net/quic/chromium/crypto/proof_verifier_chromium.h" 26 #include "net/quic/chromium/crypto/proof_verifier_chromium.h"
27 #include "net/quic/chromium/quic_chromium_connection_helper.h" 27 #include "net/quic/chromium/quic_chromium_connection_helper.h"
28 #include "net/quic/chromium/quic_chromium_packet_writer.h" 28 #include "net/quic/chromium/quic_chromium_packet_writer.h"
29 #include "net/quic/chromium/quic_stream_factory.h" 29 #include "net/quic/chromium/quic_stream_factory.h"
30 #include "net/quic/core/crypto/quic_server_info.h" 30 #include "net/quic/core/crypto/quic_server_info.h"
31 #include "net/quic/core/quic_client_promised_info.h" 31 #include "net/quic/core/quic_client_promised_info.h"
32 #include "net/quic/core/quic_crypto_client_stream_factory.h" 32 #include "net/quic/core/quic_crypto_client_stream_factory.h"
33 #include "net/quic/core/spdy_utils.h" 33 #include "net/quic/core/spdy_utils.h"
34 #include "net/spdy/spdy_http_utils.h"
34 #include "net/spdy/spdy_session.h" 35 #include "net/spdy/spdy_session.h"
35 #include "net/ssl/channel_id_service.h" 36 #include "net/ssl/channel_id_service.h"
36 #include "net/ssl/ssl_connection_status_flags.h" 37 #include "net/ssl/ssl_connection_status_flags.h"
37 #include "net/ssl/ssl_info.h" 38 #include "net/ssl/ssl_info.h"
38 #include "net/ssl/token_binding.h" 39 #include "net/ssl/token_binding.h"
39 #include "net/udp/datagram_client_socket.h" 40 #include "net/udp/datagram_client_socket.h"
40 #include "third_party/boringssl/src/include/openssl/ssl.h" 41 #include "third_party/boringssl/src/include/openssl/ssl.h"
41 42
42 namespace net { 43 namespace net {
43 44
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 }; 156 };
156 157
157 class HpackDecoderDebugVisitor : public QuicHeadersStream::HpackDebugVisitor { 158 class HpackDecoderDebugVisitor : public QuicHeadersStream::HpackDebugVisitor {
158 void OnUseEntry(QuicTime::Delta elapsed) override { 159 void OnUseEntry(QuicTime::Delta elapsed) override {
159 UMA_HISTOGRAM_TIMES( 160 UMA_HISTOGRAM_TIMES(
160 "Net.QuicHpackDecoder.IndexedEntryAge", 161 "Net.QuicHpackDecoder.IndexedEntryAge",
161 base::TimeDelta::FromMicroseconds(elapsed.ToMicroseconds())); 162 base::TimeDelta::FromMicroseconds(elapsed.ToMicroseconds()));
162 } 163 }
163 }; 164 };
164 165
166 class QuicServerPushHelper : public ServerPushDelegate::ServerPushHelper {
167 public:
168 explicit QuicServerPushHelper(
169 base::WeakPtr<QuicChromiumClientSession> session,
170 const GURL& url)
171 : session_(session), request_url_(url) {}
172
173 void Cancel() override {
174 if (session_) {
175 session_->CancelPush(request_url_);
176 }
177 }
178
179 const GURL& GetURL() override { return request_url_; }
180
181 private:
182 base::WeakPtr<QuicChromiumClientSession> session_;
183 const GURL request_url_;
184 };
185
165 } // namespace 186 } // namespace
166 187
167 QuicChromiumClientSession::StreamRequest::StreamRequest() : stream_(nullptr) {} 188 QuicChromiumClientSession::StreamRequest::StreamRequest() : stream_(nullptr) {}
168 189
169 QuicChromiumClientSession::StreamRequest::~StreamRequest() { 190 QuicChromiumClientSession::StreamRequest::~StreamRequest() {
170 CancelRequest(); 191 CancelRequest();
171 } 192 }
172 193
173 int QuicChromiumClientSession::StreamRequest::StartRequest( 194 int QuicChromiumClientSession::StreamRequest::StartRequest(
174 const base::WeakPtr<QuicChromiumClientSession>& session, 195 const base::WeakPtr<QuicChromiumClientSession>& session,
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 num_total_streams_(0), 256 num_total_streams_(0),
236 task_runner_(task_runner), 257 task_runner_(task_runner),
237 net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::QUIC_SESSION)), 258 net_log_(NetLogWithSource::Make(net_log, NetLogSourceType::QUIC_SESSION)),
238 logger_(new QuicConnectionLogger(this, 259 logger_(new QuicConnectionLogger(this,
239 connection_description, 260 connection_description,
240 std::move(socket_performance_watcher), 261 std::move(socket_performance_watcher),
241 net_log_)), 262 net_log_)),
242 going_away_(false), 263 going_away_(false),
243 port_migration_detected_(false), 264 port_migration_detected_(false),
244 token_binding_signatures_(kTokenBindingSignatureMapSize), 265 token_binding_signatures_(kTokenBindingSignatureMapSize),
266 push_delegate_(nullptr),
245 streams_pushed_count_(0), 267 streams_pushed_count_(0),
246 streams_pushed_and_claimed_count_(0), 268 streams_pushed_and_claimed_count_(0),
247 bytes_pushed_count_(0), 269 bytes_pushed_count_(0),
248 bytes_pushed_and_unclaimed_count_(0), 270 bytes_pushed_and_unclaimed_count_(0),
249 migration_pending_(false), 271 migration_pending_(false),
250 weak_factory_(this) { 272 weak_factory_(this) {
251 sockets_.push_back(std::move(socket)); 273 sockets_.push_back(std::move(socket));
252 packet_readers_.push_back(base::MakeUnique<QuicChromiumPacketReader>( 274 packet_readers_.push_back(base::MakeUnique<QuicChromiumPacketReader>(
253 sockets_.back().get(), clock, this, yield_after_packets, 275 sockets_.back().get(), clock, this, yield_after_packets,
254 yield_after_duration, net_log_)); 276 yield_after_duration, net_log_));
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1405 bool QuicChromiumClientSession::HasNonMigratableStreams() const { 1427 bool QuicChromiumClientSession::HasNonMigratableStreams() const {
1406 for (const auto& stream : dynamic_streams()) { 1428 for (const auto& stream : dynamic_streams()) {
1407 if (!static_cast<QuicChromiumClientStream*>(stream.second.get()) 1429 if (!static_cast<QuicChromiumClientStream*>(stream.second.get())
1408 ->can_migrate()) { 1430 ->can_migrate()) {
1409 return true; 1431 return true;
1410 } 1432 }
1411 } 1433 }
1412 return false; 1434 return false;
1413 } 1435 }
1414 1436
1415 void QuicChromiumClientSession::HandlePromised(QuicStreamId id, 1437 bool QuicChromiumClientSession::HandlePromised(QuicStreamId id,
1416 QuicStreamId promised_id, 1438 QuicStreamId promised_id,
1417 const SpdyHeaderBlock& headers) { 1439 const SpdyHeaderBlock& headers) {
1418 QuicClientSessionBase::HandlePromised(id, promised_id, headers); 1440 bool result = QuicClientSessionBase::HandlePromised(id, promised_id, headers);
1441 if (result) {
1442 // The push promise is accepted, notify the push_delegate that a push
1443 // promise has been received.
1444 GURL pushed_url = GetUrlFromHeaderBlock(headers);
1445 if (push_delegate_) {
1446 push_delegate_->OnPush(base::MakeUnique<QuicServerPushHelper>(
1447 weak_factory_.GetWeakPtr(), pushed_url));
1448 }
1449 }
1419 net_log_.AddEvent(NetLogEventType::QUIC_SESSION_PUSH_PROMISE_RECEIVED, 1450 net_log_.AddEvent(NetLogEventType::QUIC_SESSION_PUSH_PROMISE_RECEIVED,
1420 base::Bind(&NetLogQuicPushPromiseReceivedCallback, &headers, 1451 base::Bind(&NetLogQuicPushPromiseReceivedCallback, &headers,
1421 id, promised_id)); 1452 id, promised_id));
1453 return result;
1422 } 1454 }
1423 1455
1424 void QuicChromiumClientSession::DeletePromised( 1456 void QuicChromiumClientSession::DeletePromised(
1425 QuicClientPromisedInfo* promised) { 1457 QuicClientPromisedInfo* promised) {
1426 if (IsOpenStream(promised->id())) 1458 if (IsOpenStream(promised->id()))
1427 streams_pushed_and_claimed_count_++; 1459 streams_pushed_and_claimed_count_++;
1428 QuicClientSessionBase::DeletePromised(promised); 1460 QuicClientSessionBase::DeletePromised(promised);
1429 } 1461 }
1430 1462
1431 void QuicChromiumClientSession::OnPushStreamTimedOut(QuicStreamId stream_id) { 1463 void QuicChromiumClientSession::OnPushStreamTimedOut(QuicStreamId stream_id) {
(...skipping 23 matching lines...) Expand all
1455 } 1487 }
1456 1488
1457 const LoadTimingInfo::ConnectTiming& 1489 const LoadTimingInfo::ConnectTiming&
1458 QuicChromiumClientSession::GetConnectTiming() { 1490 QuicChromiumClientSession::GetConnectTiming() {
1459 connect_timing_.ssl_start = connect_timing_.connect_start; 1491 connect_timing_.ssl_start = connect_timing_.connect_start;
1460 connect_timing_.ssl_end = connect_timing_.connect_end; 1492 connect_timing_.ssl_end = connect_timing_.connect_end;
1461 return connect_timing_; 1493 return connect_timing_;
1462 } 1494 }
1463 1495
1464 } // namespace net 1496 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698