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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « Source/web/WebSocketChannelClientProxy.h ('k') | Source/web/WebTextCheckingCompletionImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 29 matching lines...) Expand all
40 #include "wtf/OwnPtr.h" 40 #include "wtf/OwnPtr.h"
41 #include "wtf/RefPtr.h" 41 #include "wtf/RefPtr.h"
42 42
43 namespace blink { 43 namespace blink {
44 44
45 class WebDocument; 45 class WebDocument;
46 class WebSocketChannel; 46 class WebSocketChannel;
47 class WebSocketChannelClientProxy; 47 class WebSocketChannelClientProxy;
48 class WebURL; 48 class WebURL;
49 49
50 class WebSocketImpl FINAL : public WebSocket { 50 class WebSocketImpl final : public WebSocket {
51 public: 51 public:
52 WebSocketImpl(const WebDocument&, WebSocketClient*); 52 WebSocketImpl(const WebDocument&, WebSocketClient*);
53 virtual ~WebSocketImpl(); 53 virtual ~WebSocketImpl();
54 54
55 bool isNull() const { return !m_private; } 55 bool isNull() const { return !m_private; }
56 56
57 virtual BinaryType binaryType() const OVERRIDE; 57 virtual BinaryType binaryType() const override;
58 virtual bool setBinaryType(BinaryType) OVERRIDE; 58 virtual bool setBinaryType(BinaryType) override;
59 virtual void connect(const WebURL&, const WebString& protocol) OVERRIDE; 59 virtual void connect(const WebURL&, const WebString& protocol) override;
60 virtual WebString subprotocol() OVERRIDE; 60 virtual WebString subprotocol() override;
61 virtual WebString extensions() OVERRIDE; 61 virtual WebString extensions() override;
62 virtual bool sendText(const WebString&) OVERRIDE; 62 virtual bool sendText(const WebString&) override;
63 virtual bool sendArrayBuffer(const WebArrayBuffer&) OVERRIDE; 63 virtual bool sendArrayBuffer(const WebArrayBuffer&) override;
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 methods proxied by WebSocketChannelClientProxy. 69 // WebSocketChannelClient methods proxied by WebSocketChannelClientProxy.
70 void didConnect(const String& subprotocol, const String& extensions); 70 void didConnect(const String& subprotocol, const String& extensions);
71 void didReceiveTextMessage(const String& payload); 71 void didReceiveTextMessage(const String& payload);
72 void didReceiveBinaryMessage(PassOwnPtr<Vector<char> > payload); 72 void didReceiveBinaryMessage(PassOwnPtr<Vector<char> > payload);
73 void didError(); 73 void didError();
74 void didConsumeBufferedAmount(unsigned long consumed); 74 void didConsumeBufferedAmount(unsigned long consumed);
75 void didStartClosingHandshake(); 75 void didStartClosingHandshake();
76 void didClose(WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsi gned short code, const String& reason); 76 void didClose(WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsi gned short code, const String& reason);
77 77
78 private: 78 private:
79 Persistent<WebSocketChannel> m_private; 79 Persistent<WebSocketChannel> m_private;
80 WebSocketClient* m_client; 80 WebSocketClient* m_client;
81 Persistent<WebSocketChannelClientProxy> m_channelProxy; 81 Persistent<WebSocketChannelClientProxy> m_channelProxy;
82 BinaryType m_binaryType; 82 BinaryType m_binaryType;
83 WebString m_subprotocol; 83 WebString m_subprotocol;
84 WebString m_extensions; 84 WebString m_extensions;
85 bool m_isClosingOrClosed; 85 bool m_isClosingOrClosed;
86 // m_bufferedAmount includes m_bufferedAmountAfterClose. 86 // m_bufferedAmount includes m_bufferedAmountAfterClose.
87 unsigned long m_bufferedAmount; 87 unsigned long m_bufferedAmount;
88 unsigned long m_bufferedAmountAfterClose; 88 unsigned long m_bufferedAmountAfterClose;
89 }; 89 };
90 90
91 } // namespace blink 91 } // namespace blink
92 92
93 #endif // WebWebSocketChannelImpl_h 93 #endif // WebWebSocketChannelImpl_h
OLDNEW
« no previous file with comments | « Source/web/WebSocketChannelClientProxy.h ('k') | Source/web/WebTextCheckingCompletionImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698