Diff
Modified: trunk/Source/WebCore/ChangeLog (139773 => 139774)
--- trunk/Source/WebCore/ChangeLog 2013-01-15 20:44:25 UTC (rev 139773)
+++ trunk/Source/WebCore/ChangeLog 2013-01-15 20:46:19 UTC (rev 139774)
@@ -1,3 +1,22 @@
+2013-01-15 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Move SocketStreamHandle and SocketStreamHandleInternal to WebCore/platform
+ https://bugs.webkit.org/show_bug.cgi?id=106899
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series; see tracking bug 106829.
+
+ * WebCore.gypi:
+ * platform/network/chromium/SocketStreamHandle.cpp: Copied from Source/WebKit/chromium/src/SocketStreamHandle.cpp.
+ (WebCore::SocketStreamHandleInternal::send):
+ (WebCore::SocketStreamHandleInternal::didOpenStream):
+ (WebCore::SocketStreamHandleInternal::didSendData):
+ (WebCore::SocketStreamHandleInternal::didReceiveData):
+ (WebCore::SocketStreamHandleInternal::didClose):
+ (WebCore::SocketStreamHandleInternal::didFail):
+ * platform/network/chromium/SocketStreamHandleInternal.h: Copied from Source/WebKit/chromium/src/SocketStreamHandleInternal.h.
+
2013-01-15 Ojan Vafai <o...@chromium.org>
RenderText::computePreferredLogicalWidths does not need to be public
Modified: trunk/Source/WebCore/WebCore.gypi (139773 => 139774)
--- trunk/Source/WebCore/WebCore.gypi 2013-01-15 20:44:25 UTC (rev 139773)
+++ trunk/Source/WebCore/WebCore.gypi 2013-01-15 20:46:19 UTC (rev 139774)
@@ -4436,7 +4436,9 @@
'platform/network/chromium/ResourceResponse.cpp',
'platform/network/chromium/ResourceResponse.h',
'platform/network/chromium/SocketStreamError.h',
+ 'platform/network/chromium/SocketStreamHandle.cpp',
'platform/network/chromium/SocketStreamHandle.h',
+ 'platform/network/chromium/SocketStreamHandleInternal.h',
'platform/network/curl/AuthenticationChallenge.h',
'platform/network/curl/CookieJarCurl.cpp',
'platform/network/curl/DNSCurl.cpp',
Copied: trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp (from rev 139773, trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp) (0 => 139774)
--- trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp (rev 0)
+++ trunk/Source/WebCore/platform/network/chromium/SocketStreamHandle.cpp 2013-01-15 20:46:19 UTC (rev 139774)
@@ -0,0 +1,215 @@
+/*
+ * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "SocketStreamHandle.h"
+#include "SocketStreamHandleInternal.h"
+
+#if ENABLE(WEB_SOCKETS)
+
+#include "Logging.h"
+#include "NotImplemented.h"
+#include "SocketStreamHandleClient.h"
+#include <public/Platform.h>
+#include <public/WebData.h>
+#include <public/WebSocketStreamHandle.h>
+#include <wtf/PassOwnPtr.h>
+
+namespace WebCore {
+
+SocketStreamHandleInternal::SocketStreamHandleInternal(SocketStreamHandle* handle)
+ : m_handle(handle)
+ , m_maxPendingSendAllowed(0)
+ , m_pendingAmountSent(0)
+{
+}
+
+SocketStreamHandleInternal::~SocketStreamHandleInternal()
+{
+ m_handle = 0;
+}
+
+void SocketStreamHandleInternal::connect(const KURL& url)
+{
+ m_socket = adoptPtr(WebKit::Platform::current()->createSocketStreamHandle());
+ LOG(Network, "connect");
+ ASSERT(m_socket);
+ ASSERT(m_handle);
+ if (m_handle->m_client)
+ m_handle->m_client->willOpenSocketStream(m_handle);
+ m_socket->connect(url, this);
+}
+
+int SocketStreamHandleInternal::send(const char* data, int len)
+{
+ LOG(Network, "send len=%d", len);
+ // FIXME: |m_socket| should not be null here, but it seems that there is the
+ // case. We should figure out such a path and fix it rather than checking
+ // null here.
+ if (!m_socket) {
+ LOG(Network, "m_socket is null when sending. It should not be.");
+ return 0;
+ }
+ if (m_pendingAmountSent + len >= m_maxPendingSendAllowed)
+ len = m_maxPendingSendAllowed - m_pendingAmountSent - 1;
+
+ if (len <= 0)
+ return len;
+ WebKit::WebData webdata(data, len);
+ if (m_socket->send(webdata)) {
+ m_pendingAmountSent += len;
+ LOG(Network, "sent");
+ return len;
+ }
+ LOG(Network, "busy. buffering");
+ return 0;
+}
+
+void SocketStreamHandleInternal::close()
+{
+ LOG(Network, "close");
+ if (m_socket)
+ m_socket->close();
+}
+
+void SocketStreamHandleInternal::didOpenStream(WebKit::WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
+{
+ LOG(Network, "SocketStreamHandleInternal::didOpen %d",
+ maxPendingSendAllowed);
+ ASSERT(maxPendingSendAllowed > 0);
+ if (m_handle && m_socket) {
+ ASSERT(socketHandle == m_socket.get());
+ m_maxPendingSendAllowed = maxPendingSendAllowed;
+ m_handle->m_state = SocketStreamHandleBase::Open;
+ if (m_handle->m_client) {
+ m_handle->m_client->didOpenSocketStream(m_handle);
+ return;
+ }
+ }
+ LOG(Network, "no m_handle or m_socket?");
+}
+
+void SocketStreamHandleInternal::didSendData(WebKit::WebSocketStreamHandle* socketHandle, int amountSent)
+{
+ LOG(Network, "SocketStreamHandleInternal::didSendData %d", amountSent);
+ ASSERT(amountSent > 0);
+ if (m_handle && m_socket) {
+ ASSERT(socketHandle == m_socket.get());
+ m_pendingAmountSent -= amountSent;
+ ASSERT(m_pendingAmountSent >= 0);
+ m_handle->sendPendingData();
+ }
+}
+
+void SocketStreamHandleInternal::didReceiveData(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebData& data)
+{
+ LOG(Network, "didReceiveData");
+ if (m_handle && m_socket) {
+ ASSERT(socketHandle == m_socket.get());
+ if (m_handle->m_client)
+ m_handle->m_client->didReceiveSocketStreamData(m_handle, data.data(), data.size());
+ }
+}
+
+void SocketStreamHandleInternal::didClose(WebKit::WebSocketStreamHandle* socketHandle)
+{
+ LOG(Network, "didClose");
+ if (m_handle && m_socket) {
+ ASSERT(socketHandle == m_socket.get());
+ m_socket.clear();
+ SocketStreamHandle* h = m_handle;
+ m_handle = 0;
+ if (h->m_client)
+ h->m_client->didCloseSocketStream(h);
+ }
+}
+
+void SocketStreamHandleInternal::didFail(WebKit::WebSocketStreamHandle* socketHandle, const WebKit::WebSocketStreamError& err)
+{
+ LOG(Network, "didFail");
+ if (m_handle && m_socket) {
+ ASSERT(socketHandle == m_socket.get());
+ m_socket.clear();
+ SocketStreamHandle* h = m_handle;
+ m_handle = 0;
+ if (h->m_client)
+ h->m_client->didCloseSocketStream(h); // didFail(h, err);
+ }
+}
+
+// FIXME: auth
+
+// SocketStreamHandle ----------------------------------------------------------
+
+SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client)
+ : SocketStreamHandleBase(url, client)
+{
+ m_internal = SocketStreamHandleInternal::create(this);
+ m_internal->connect(m_url);
+}
+
+SocketStreamHandle::~SocketStreamHandle()
+{
+ setClient(0);
+ m_internal.clear();
+}
+
+int SocketStreamHandle::platformSend(const char* buf, int len)
+{
+ if (!m_internal)
+ return 0;
+ return m_internal->send(buf, len);
+}
+
+void SocketStreamHandle::platformClose()
+{
+ if (m_internal)
+ m_internal->close();
+}
+
+void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
+{
+ if (m_client)
+ m_client->didReceiveAuthenticationChallenge(this, challenge);
+}
+
+void SocketStreamHandle::receivedCredential(const AuthenticationChallenge& challenge, const Credential& credential)
+{
+ notImplemented();
+}
+
+void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge& challenge)
+{
+ notImplemented();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_SOCKETS)
Copied: trunk/Source/WebCore/platform/network/chromium/SocketStreamHandleInternal.h (from rev 139773, trunk/Source/WebKit/chromium/src/SocketStreamHandleInternal.h) (0 => 139774)
--- trunk/Source/WebCore/platform/network/chromium/SocketStreamHandleInternal.h (rev 0)
+++ trunk/Source/WebCore/platform/network/chromium/SocketStreamHandleInternal.h 2013-01-15 20:46:19 UTC (rev 139774)
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ * * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SocketStreamHandleInternal_h
+#define SocketStreamHandleInternal_h
+
+#if ENABLE(WEB_SOCKETS)
+
+#include "SocketStreamHandle.h"
+#include <public/WebSocketStreamHandleClient.h>
+#include <public/WebURL.h>
+#include <wtf/PassOwnPtr.h>
+
+namespace WebKit {
+
+class WebData;
+class WebSocketStreamError;
+class WebSocketStreamHandle;
+
+}
+
+namespace WebCore {
+
+class SocketStreamHandleInternal : public WebKit::WebSocketStreamHandleClient {
+public:
+ static PassOwnPtr<SocketStreamHandleInternal> create(SocketStreamHandle* handle)
+ {
+ return adoptPtr(new SocketStreamHandleInternal(handle));
+ }
+ virtual ~SocketStreamHandleInternal();
+
+ void connect(const KURL&);
+ int send(const char*, int);
+ void close();
+
+ virtual void didOpenStream(WebKit::WebSocketStreamHandle*, int);
+ virtual void didSendData(WebKit::WebSocketStreamHandle*, int);
+ virtual void didReceiveData(WebKit::WebSocketStreamHandle*, const WebKit::WebData&);
+ virtual void didClose(WebKit::WebSocketStreamHandle*);
+ virtual void didFail(WebKit::WebSocketStreamHandle*, const WebKit::WebSocketStreamError&);
+
+ static WebKit::WebSocketStreamHandle* toWebSocketStreamHandle(SocketStreamHandle* handle)
+ {
+ if (handle && handle->m_internal)
+ return handle->m_internal->m_socket.get();
+ return 0;
+ }
+
+private:
+ explicit SocketStreamHandleInternal(SocketStreamHandle*);
+
+ SocketStreamHandle* m_handle;
+ OwnPtr<WebKit::WebSocketStreamHandle> m_socket;
+ int m_maxPendingSendAllowed;
+ int m_pendingAmountSent;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(WEB_SOCKETS)
+
+#endif // SocketStreamHandleInternal_h
Modified: trunk/Source/WebKit/chromium/ChangeLog (139773 => 139774)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-15 20:44:25 UTC (rev 139773)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-15 20:46:19 UTC (rev 139774)
@@ -1,3 +1,16 @@
+2013-01-15 Mark Pilgrim <pilg...@chromium.org>
+
+ [Chromium] Move SocketStreamHandle and SocketStreamHandleInternal to WebCore/platform
+ https://bugs.webkit.org/show_bug.cgi?id=106899
+
+ Reviewed by Adam Barth.
+
+ Part of a larger refactoring series; see tracking bug 106829.
+
+ * WebKit.gyp:
+ * src/SocketStreamHandle.cpp: Removed.
+ * src/SocketStreamHandleInternal.h: Removed.
+
2013-01-15 Florin Malita <fmal...@chromium.org>
[Chromium] Incorrect opaque region tracking for PlatformContextSkia::drawRRect
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (139773 => 139774)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-15 20:44:25 UTC (rev 139773)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2013-01-15 20:46:19 UTC (rev 139774)
@@ -454,8 +454,6 @@
'src/ScrollbarGroup.cpp',
'src/ScrollbarGroup.h',
'src/SharedWorkerRepository.cpp',
- 'src/SocketStreamHandle.cpp',
- 'src/SocketStreamHandleInternal.h',
'src/SpeechInputClientImpl.cpp',
'src/SpeechInputClientImpl.h',
'src/SpeechRecognitionClientProxy.cpp',
Deleted: trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp (139773 => 139774)
--- trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp 2013-01-15 20:44:25 UTC (rev 139773)
+++ trunk/Source/WebKit/chromium/src/SocketStreamHandle.cpp 2013-01-15 20:46:19 UTC (rev 139774)
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "SocketStreamHandle.h"
-#include "SocketStreamHandleInternal.h"
-
-#if ENABLE(WEB_SOCKETS)
-
-#include "Logging.h"
-#include "NotImplemented.h"
-#include "SocketStreamHandleClient.h"
-#include <public/Platform.h>
-#include <public/WebData.h>
-#include <public/WebSocketStreamHandle.h>
-#include <wtf/PassOwnPtr.h>
-
-using namespace WebKit;
-
-namespace WebCore {
-
-SocketStreamHandleInternal::SocketStreamHandleInternal(SocketStreamHandle* handle)
- : m_handle(handle)
- , m_maxPendingSendAllowed(0)
- , m_pendingAmountSent(0)
-{
-}
-
-SocketStreamHandleInternal::~SocketStreamHandleInternal()
-{
- m_handle = 0;
-}
-
-void SocketStreamHandleInternal::connect(const KURL& url)
-{
- m_socket = adoptPtr(WebKit::Platform::current()->createSocketStreamHandle());
- LOG(Network, "connect");
- ASSERT(m_socket);
- ASSERT(m_handle);
- if (m_handle->m_client)
- m_handle->m_client->willOpenSocketStream(m_handle);
- m_socket->connect(url, this);
-}
-
-int SocketStreamHandleInternal::send(const char* data, int len)
-{
- LOG(Network, "send len=%d", len);
- // FIXME: |m_socket| should not be null here, but it seems that there is the
- // case. We should figure out such a path and fix it rather than checking
- // null here.
- if (!m_socket) {
- LOG(Network, "m_socket is null when sending. It should not be.");
- return 0;
- }
- if (m_pendingAmountSent + len >= m_maxPendingSendAllowed)
- len = m_maxPendingSendAllowed - m_pendingAmountSent - 1;
-
- if (len <= 0)
- return len;
- WebData webdata(data, len);
- if (m_socket->send(webdata)) {
- m_pendingAmountSent += len;
- LOG(Network, "sent");
- return len;
- }
- LOG(Network, "busy. buffering");
- return 0;
-}
-
-void SocketStreamHandleInternal::close()
-{
- LOG(Network, "close");
- if (m_socket)
- m_socket->close();
-}
-
-void SocketStreamHandleInternal::didOpenStream(WebSocketStreamHandle* socketHandle, int maxPendingSendAllowed)
-{
- LOG(Network, "SocketStreamHandleInternal::didOpen %d",
- maxPendingSendAllowed);
- ASSERT(maxPendingSendAllowed > 0);
- if (m_handle && m_socket) {
- ASSERT(socketHandle == m_socket.get());
- m_maxPendingSendAllowed = maxPendingSendAllowed;
- m_handle->m_state = SocketStreamHandleBase::Open;
- if (m_handle->m_client) {
- m_handle->m_client->didOpenSocketStream(m_handle);
- return;
- }
- }
- LOG(Network, "no m_handle or m_socket?");
-}
-
-void SocketStreamHandleInternal::didSendData(WebSocketStreamHandle* socketHandle, int amountSent)
-{
- LOG(Network, "SocketStreamHandleInternal::didSendData %d", amountSent);
- ASSERT(amountSent > 0);
- if (m_handle && m_socket) {
- ASSERT(socketHandle == m_socket.get());
- m_pendingAmountSent -= amountSent;
- ASSERT(m_pendingAmountSent >= 0);
- m_handle->sendPendingData();
- }
-}
-
-void SocketStreamHandleInternal::didReceiveData(WebSocketStreamHandle* socketHandle, const WebData& data)
-{
- LOG(Network, "didReceiveData");
- if (m_handle && m_socket) {
- ASSERT(socketHandle == m_socket.get());
- if (m_handle->m_client)
- m_handle->m_client->didReceiveSocketStreamData(m_handle, data.data(), data.size());
- }
-}
-
-void SocketStreamHandleInternal::didClose(WebSocketStreamHandle* socketHandle)
-{
- LOG(Network, "didClose");
- if (m_handle && m_socket) {
- ASSERT(socketHandle == m_socket.get());
- m_socket.clear();
- SocketStreamHandle* h = m_handle;
- m_handle = 0;
- if (h->m_client)
- h->m_client->didCloseSocketStream(h);
- }
-}
-
-void SocketStreamHandleInternal::didFail(WebSocketStreamHandle* socketHandle, const WebSocketStreamError& err)
-{
- LOG(Network, "didFail");
- if (m_handle && m_socket) {
- ASSERT(socketHandle == m_socket.get());
- m_socket.clear();
- SocketStreamHandle* h = m_handle;
- m_handle = 0;
- if (h->m_client)
- h->m_client->didCloseSocketStream(h); // didFail(h, err);
- }
-}
-
-// FIXME: auth
-
-// SocketStreamHandle ----------------------------------------------------------
-
-SocketStreamHandle::SocketStreamHandle(const KURL& url, SocketStreamHandleClient* client)
- : SocketStreamHandleBase(url, client)
-{
- m_internal = SocketStreamHandleInternal::create(this);
- m_internal->connect(m_url);
-}
-
-SocketStreamHandle::~SocketStreamHandle()
-{
- setClient(0);
- m_internal.clear();
-}
-
-int SocketStreamHandle::platformSend(const char* buf, int len)
-{
- if (!m_internal)
- return 0;
- return m_internal->send(buf, len);
-}
-
-void SocketStreamHandle::platformClose()
-{
- if (m_internal)
- m_internal->close();
-}
-
-void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
-{
- if (m_client)
- m_client->didReceiveAuthenticationChallenge(this, challenge);
-}
-
-void SocketStreamHandle::receivedCredential(const AuthenticationChallenge& challenge, const Credential& credential)
-{
- notImplemented();
-}
-
-void SocketStreamHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge& challenge)
-{
- notImplemented();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
Deleted: trunk/Source/WebKit/chromium/src/SocketStreamHandleInternal.h (139773 => 139774)
--- trunk/Source/WebKit/chromium/src/SocketStreamHandleInternal.h 2013-01-15 20:44:25 UTC (rev 139773)
+++ trunk/Source/WebKit/chromium/src/SocketStreamHandleInternal.h 2013-01-15 20:46:19 UTC (rev 139774)
@@ -1,89 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef SocketStreamHandleInternal_h
-#define SocketStreamHandleInternal_h
-
-#if ENABLE(WEB_SOCKETS)
-
-#include "SocketStreamHandle.h"
-#include <public/WebSocketStreamHandleClient.h>
-#include <public/WebURL.h>
-#include <wtf/PassOwnPtr.h>
-
-namespace WebKit {
-
-class WebData;
-class WebSocketStreamError;
-class WebSocketStreamHandle;
-
-}
-
-namespace WebCore {
-
-class SocketStreamHandleInternal : public WebKit::WebSocketStreamHandleClient {
-public:
- static PassOwnPtr<SocketStreamHandleInternal> create(SocketStreamHandle* handle)
- {
- return adoptPtr(new SocketStreamHandleInternal(handle));
- }
- virtual ~SocketStreamHandleInternal();
-
- void connect(const KURL&);
- int send(const char*, int);
- void close();
-
- virtual void didOpenStream(WebKit::WebSocketStreamHandle*, int);
- virtual void didSendData(WebKit::WebSocketStreamHandle*, int);
- virtual void didReceiveData(WebKit::WebSocketStreamHandle*, const WebKit::WebData&);
- virtual void didClose(WebKit::WebSocketStreamHandle*);
- virtual void didFail(WebKit::WebSocketStreamHandle*, const WebKit::WebSocketStreamError&);
-
- static WebKit::WebSocketStreamHandle* toWebSocketStreamHandle(SocketStreamHandle* handle)
- {
- if (handle && handle->m_internal)
- return handle->m_internal->m_socket.get();
- return 0;
- }
-
-private:
- explicit SocketStreamHandleInternal(SocketStreamHandle*);
-
- SocketStreamHandle* m_handle;
- OwnPtr<WebKit::WebSocketStreamHandle> m_socket;
- int m_maxPendingSendAllowed;
- int m_pendingAmountSent;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(WEB_SOCKETS)
-
-#endif // SocketStreamHandleInternal_h
