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

Side by Side Diff: net/websockets/websocket_job.cc

Issue 7047003: Add --enable-websocket-over-spdy command-line flag (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fixed problems yutak addressed Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/websockets/websocket_job.h" 5 #include "net/websockets/websocket_job.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/string_tokenizer.h" 10 #include "base/string_tokenizer.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 } 46 }
47 }; 47 };
48 48
49 static base::LazyInstance<WebSocketJobInitSingleton> g_websocket_job_init( 49 static base::LazyInstance<WebSocketJobInitSingleton> g_websocket_job_init(
50 base::LINKER_INITIALIZED); 50 base::LINKER_INITIALIZED);
51 51
52 } // anonymous namespace 52 } // anonymous namespace
53 53
54 namespace net { 54 namespace net {
55 55
56 bool WebSocketJob::websocket_over_spdy_enabled_ = false;
57
56 // static 58 // static
57 void WebSocketJob::EnsureInit() { 59 void WebSocketJob::EnsureInit() {
58 g_websocket_job_init.Get(); 60 g_websocket_job_init.Get();
59 } 61 }
60 62
63 // static
64 void WebSocketJob::set_websocket_over_spdy_enabled(bool enable) {
Yuta Kitamura 2011/05/20 08:30:33 enable -> enabled
Takashi Toyoshima 2011/05/20 09:46:52 Done.
65 websocket_over_spdy_enabled_ = enable;
66 }
67
61 WebSocketJob::WebSocketJob(SocketStream::Delegate* delegate) 68 WebSocketJob::WebSocketJob(SocketStream::Delegate* delegate)
62 : delegate_(delegate), 69 : delegate_(delegate),
63 state_(INITIALIZED), 70 state_(INITIALIZED),
64 waiting_(false), 71 waiting_(false),
65 callback_(NULL), 72 callback_(NULL),
66 handshake_request_(new WebSocketHandshakeRequestHandler), 73 handshake_request_(new WebSocketHandshakeRequestHandler),
67 handshake_response_(new WebSocketHandshakeResponseHandler), 74 handshake_response_(new WebSocketHandshakeResponseHandler),
68 handshake_request_sent_(0), 75 handshake_request_sent_(0),
69 response_cookies_save_index_(0), 76 response_cookies_save_index_(0),
70 send_frame_handler_(new WebSocketFrameHandler), 77 send_frame_handler_(new WebSocketFrameHandler),
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 socket_->Close(); 476 socket_->Close();
470 return; 477 return;
471 } 478 }
472 current_buffer_ = new DrainableIOBuffer( 479 current_buffer_ = new DrainableIOBuffer(
473 send_frame_handler_->GetCurrentBuffer(), 480 send_frame_handler_->GetCurrentBuffer(),
474 send_frame_handler_->GetCurrentBufferSize()); 481 send_frame_handler_->GetCurrentBufferSize());
475 socket_->SendData(current_buffer_->data(), current_buffer_->BytesRemaining()); 482 socket_->SendData(current_buffer_->data(), current_buffer_->BytesRemaining());
476 } 483 }
477 484
478 } // namespace net 485 } // namespace net
OLDNEW
« net/websockets/websocket_job.h ('K') | « net/websockets/websocket_job.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698