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

Side by Side Diff: third_party/WebKit/Source/modules/websockets/DOMWebSocket.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 30 matching lines...) Expand all
41 #include "modules/websockets/WebSocketChannel.h" 41 #include "modules/websockets/WebSocketChannel.h"
42 #include "modules/websockets/WebSocketChannelClient.h" 42 #include "modules/websockets/WebSocketChannelClient.h"
43 #include "platform/Timer.h" 43 #include "platform/Timer.h"
44 #include "platform/heap/Handle.h" 44 #include "platform/heap/Handle.h"
45 #include "platform/weborigin/KURL.h" 45 #include "platform/weborigin/KURL.h"
46 #include "wtf/Deque.h" 46 #include "wtf/Deque.h"
47 #include "wtf/Forward.h" 47 #include "wtf/Forward.h"
48 #include "wtf/PassRefPtr.h" 48 #include "wtf/PassRefPtr.h"
49 #include "wtf/RefPtr.h" 49 #include "wtf/RefPtr.h"
50 #include "wtf/text/WTFString.h" 50 #include "wtf/text/WTFString.h"
51 #include <memory>
51 #include <stdint.h> 52 #include <stdint.h>
52 53
53 namespace blink { 54 namespace blink {
54 55
55 class Blob; 56 class Blob;
56 class DOMArrayBuffer; 57 class DOMArrayBuffer;
57 class DOMArrayBufferView; 58 class DOMArrayBufferView;
58 class ExceptionState; 59 class ExceptionState;
59 class ExecutionContext; 60 class ExecutionContext;
60 class StringOrStringSequence; 61 class StringOrStringSequence;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 void stop() override; 121 void stop() override;
121 122
122 // ActiveScriptWrappable 123 // ActiveScriptWrappable
123 // Prevent this instance from being collected while it's not in CLOSED 124 // Prevent this instance from being collected while it's not in CLOSED
124 // state. 125 // state.
125 bool hasPendingActivity() const final; 126 bool hasPendingActivity() const final;
126 127
127 // WebSocketChannelClient functions. 128 // WebSocketChannelClient functions.
128 void didConnect(const String& subprotocol, const String& extensions) overrid e; 129 void didConnect(const String& subprotocol, const String& extensions) overrid e;
129 void didReceiveTextMessage(const String& message) override; 130 void didReceiveTextMessage(const String& message) override;
130 void didReceiveBinaryMessage(PassOwnPtr<Vector<char>>) override; 131 void didReceiveBinaryMessage(std::unique_ptr<Vector<char>>) override;
131 void didError() override; 132 void didError() override;
132 void didConsumeBufferedAmount(uint64_t) override; 133 void didConsumeBufferedAmount(uint64_t) override;
133 void didStartClosingHandshake() override; 134 void didStartClosingHandshake() override;
134 void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const S tring& reason) override; 135 void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const S tring& reason) override;
135 136
136 DECLARE_VIRTUAL_TRACE(); 137 DECLARE_VIRTUAL_TRACE();
137 138
138 static bool isValidSubprotocolString(const String&); 139 static bool isValidSubprotocolString(const String&);
139 140
140 protected: 141 protected:
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 String m_subprotocol; 242 String m_subprotocol;
242 String m_extensions; 243 String m_extensions;
243 244
244 Member<EventQueue> m_eventQueue; 245 Member<EventQueue> m_eventQueue;
245 Timer<DOMWebSocket> m_bufferedAmountConsumeTimer; 246 Timer<DOMWebSocket> m_bufferedAmountConsumeTimer;
246 }; 247 };
247 248
248 } // namespace blink 249 } // namespace blink
249 250
250 #endif // DOMWebSocket_h 251 #endif // DOMWebSocket_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698