diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebCore/websockets | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebCore/websockets')
| -rw-r--r-- | WebCore/websockets/WebSocket.cpp | 4 | ||||
| -rw-r--r-- | WebCore/websockets/WebSocket.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/websockets/WebSocket.cpp b/WebCore/websockets/WebSocket.cpp index 91761fb..38629d7 100644 --- a/WebCore/websockets/WebSocket.cpp +++ b/WebCore/websockets/WebSocket.cpp @@ -78,8 +78,6 @@ static String encodeProtocolString(const String& protocol) return builder.toString(); } -#if USE(V8) - static bool webSocketsAvailable = false; void WebSocket::setIsAvailable(bool available) @@ -92,8 +90,6 @@ bool WebSocket::isAvailable() return webSocketsAvailable; } -#endif - WebSocket::WebSocket(ScriptExecutionContext* context) : ActiveDOMObject(context, this) , m_state(CONNECTING) diff --git a/WebCore/websockets/WebSocket.h b/WebCore/websockets/WebSocket.h index b2102d1..2c95ff9 100644 --- a/WebCore/websockets/WebSocket.h +++ b/WebCore/websockets/WebSocket.h @@ -50,10 +50,8 @@ namespace WebCore { class WebSocket : public RefCounted<WebSocket>, public EventTarget, public ActiveDOMObject, public WebSocketChannelClient { public: -#if USE(V8) static void setIsAvailable(bool); static bool isAvailable(); -#endif static PassRefPtr<WebSocket> create(ScriptExecutionContext* context) { return adoptRef(new WebSocket(context)); } virtual ~WebSocket(); |