trunk/Source/web/WebSocketImpl.h - Issue 338243006: Revert 176298 "[WebSocket] bufferedAmount should not decrease in..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/Source/web/WebSocketImpl.h

Issue 338243006: Revert 176298 "[WebSocket] bufferedAmount should not decrease in..." (Closed) Base URL: svn://svn.chromium.org/blink/

Patch Set: Created 6 years, 6 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 virtual unsigned long bufferedAmount() const OVERRIDE;	64 virtual unsigned long bufferedAmount() const OVERRIDE;

65 virtual void close(int code, const WebString& reason) OVERRIDE;	65 virtual void close(int code, const WebString& reason) OVERRIDE;

66 virtual void fail(const WebString& reason) OVERRIDE;	66 virtual void fail(const WebString& reason) OVERRIDE;

67 virtual void disconnect() OVERRIDE;	67 virtual void disconnect() OVERRIDE;

68	68

69 // WebSocketChannelClient	69 // WebSocketChannelClient

70 virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;	70 virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;

71 virtual void didReceiveMessage(const String& message) OVERRIDE;	71 virtual void didReceiveMessage(const String& message) OVERRIDE;

72 virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVER RIDE;	72 virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVER RIDE;

73 virtual void didReceiveMessageError() OVERRIDE;	73 virtual void didReceiveMessageError() OVERRIDE;

74 virtual void didConsumeBufferedAmount(unsigned long consumed) OVERRIDE;	74 virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) OVERRIDE;

75 virtual void didStartClosingHandshake() OVERRIDE;	75 virtual void didStartClosingHandshake() OVERRIDE;

76 virtual void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;	76 virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompleti onStatus, unsigned short code, const String& reason) OVERRIDE;

77	77

78 private:	78 private:

79 RefPtrWillBePersistent<WebCore::WebSocketChannel> m_private;	79 RefPtrWillBePersistent<WebCore::WebSocketChannel> m_private;

80 WebSocketClient* m_client;	80 WebSocketClient* m_client;

81 BinaryType m_binaryType;	81 BinaryType m_binaryType;

82 WebString m_subprotocol;	82 WebString m_subprotocol;

83 WebString m_extensions;	83 WebString m_extensions;

84 unsigned long m_bufferedAmount;

85 };	84 };

86	85

87 } // namespace blink	86 } // namespace blink

88	87

89 #endif // WebWebSocketChannelImpl_h	88 #endif // WebWebSocketChannelImpl_h

OLD	NEW

« no previous file with comments | « trunk/Source/platform/network/SocketStreamHandleClient.h ('k') | trunk/Source/web/WebSocketImpl.cpp » ('j') | no next file with comments »