diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 20:12:41 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 20:12:41 +0000 |
| commit | 218f4b67d527cf9249b0833f60efac9fe3c6736a (patch) | |
| tree | fb74b3b8dca78d0de23e8db1fc62dcc00bab6ce2 /net/spdy/spdy_websocket_stream.h | |
| parent | 4391963c0b9ef52e7f2b331ac01fba7efb8a445a (diff) | |
| download | chromium_src-218f4b67d527cf9249b0833f60efac9fe3c6736a.zip chromium_src-218f4b67d527cf9249b0833f60efac9fe3c6736a.tar.gz chromium_src-218f4b67d527cf9249b0833f60efac9fe3c6736a.tar.bz2 | |
Revert 147692 - Instead of enqueueing SPDY frames, instead enqueue SPDY streams that are ready to produce data. This allows us to lazily allocate a stream id.
This patch still brakes net_unittests
The CL was reverted because of memory leaks. Both SpdyIOBufferProducers leaked the SpdyFrame they owned. This version of the CL fixes this defect.
Attempting to re-land 144649
Revert 144655 - Revert 144649
BUG=111708
TEST=
Review URL: https://chromiumcodereview.appspot.com/10803041
TBR=rch@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10807057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_websocket_stream.h')
| -rw-r--r-- | net/spdy/spdy_websocket_stream.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/spdy/spdy_websocket_stream.h b/net/spdy/spdy_websocket_stream.h index 900232b..4adb37c 100644 --- a/net/spdy/spdy_websocket_stream.h +++ b/net/spdy/spdy_websocket_stream.h @@ -82,8 +82,6 @@ class NET_EXPORT_PRIVATE SpdyWebSocketStream virtual void OnClose(int status) OVERRIDE; private: - friend class SpdyWebSocketStreamSpdy2Test; - friend class SpdyWebSocketStreamSpdy3Test; FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamSpdy2Test, Basic); FRIEND_TEST_ALL_PREFIXES(SpdyWebSocketStreamSpdy3Test, Basic); |