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

Unified Diff: Source/modules/websockets/WebSocket.h

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/websockets/MainThreadWebSocketChannel.cpp ('k') | Source/modules/websockets/WebSocket.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/websockets/WebSocket.h
diff --git a/Source/modules/websockets/WebSocket.h b/Source/modules/websockets/WebSocket.h
index 229f7f59c1fa80addb435894ea6ffcfd81beaa51..cafb267ab0ff746f810beeb2f8cbd1124a769035 100644
--- a/Source/modules/websockets/WebSocket.h
+++ b/Source/modules/websockets/WebSocket.h
@@ -47,15 +47,14 @@
namespace WebCore {
class Blob;
-class ExceptionState;
class WebSocket : public RefCounted<WebSocket>, public ScriptWrappable, public EventTarget, public ActiveDOMObject, public WebSocketChannelClient {
public:
static const char* subProtocolSeperator();
static PassRefPtr<WebSocket> create(ScriptExecutionContext*);
- static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, ExceptionState&);
- static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const String& protocol, ExceptionState&);
- static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const Vector<String>& protocols, ExceptionState&);
+ static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, ExceptionCode&);
+ static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const String& protocol, ExceptionCode&);
+ static PassRefPtr<WebSocket> create(ScriptExecutionContext*, const String& url, const Vector<String>& protocols, ExceptionCode&);
virtual ~WebSocket();
enum State {
@@ -65,23 +64,23 @@ public:
CLOSED = 3
};
- void connect(const String& url, ExceptionState&);
- void connect(const String& url, const String& protocol, ExceptionState&);
- void connect(const String& url, const Vector<String>& protocols, ExceptionState&);
+ void connect(const String& url, ExceptionCode&);
+ void connect(const String& url, const String& protocol, ExceptionCode&);
+ void connect(const String& url, const Vector<String>& protocols, ExceptionCode&);
- void send(const String& message, ExceptionState&);
- void send(ArrayBuffer*, ExceptionState&);
- void send(ArrayBufferView*, ExceptionState&);
- void send(Blob*, ExceptionState&);
+ void send(const String& message, ExceptionCode&);
+ void send(ArrayBuffer*, ExceptionCode&);
+ void send(ArrayBufferView*, ExceptionCode&);
+ void send(Blob*, ExceptionCode&);
// To distinguish close method call with the code parameter from one
// without, we have these three signatures. Use of
// Optional=DefaultIsUndefined in the IDL file doesn't help for now since
// it's bound to a value of 0 which is indistinguishable from the case 0
// is passed as code parameter.
- void close(unsigned short code, const String& reason, ExceptionState&);
- void close(ExceptionState&);
- void close(unsigned short code, ExceptionState&);
+ void close(unsigned short code, const String& reason, ExceptionCode&);
+ void close(ExceptionCode&);
+ void close(unsigned short code, ExceptionCode&);
const KURL& url() const;
State readyState() const;
@@ -127,7 +126,7 @@ private:
// Handle the JavaScript close method call. close() methods on this class
// are just for determining if the optional code argument is supplied or
// not.
- void closeInternal(int, const String&, ExceptionState&);
+ void closeInternal(int, const String&, ExceptionCode&);
virtual void refEventTarget() { ref(); }
virtual void derefEventTarget() { deref(); }
@@ -138,7 +137,7 @@ private:
// Checks the result of WebSocketChannel::send() method, and shows console
// message and sets ec appropriately.
- void handleSendResult(WebSocketChannel::SendResult, ExceptionState&);
+ void handleSendResult(WebSocketChannel::SendResult, ExceptionCode&);
// Updates m_bufferedAmountAfterClose given the amount of data passed to
// send() method after the state changed to CLOSING or CLOSED.
« no previous file with comments | « Source/modules/websockets/MainThreadWebSocketChannel.cpp ('k') | Source/modules/websockets/WebSocket.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698