Title: [101614] trunk/Source/WebKit/chromium
- Revision
- 101614
- Author
- [email protected]
- Date
- 2011-11-30 23:01:47 -0800 (Wed, 30 Nov 2011)
Log Message
Add didUpdateBufferedAmount callback to WebSocketClient API
https://bugs.webkit.org/show_bug.cgi?id=73306
Patch by Takashi Toyoshima <[email protected]> on 2011-11-30
Reviewed by Darin Fisher.
* public/WebSocketClient.h: Add didUpdateBufferedAmount and default implementations for all callbacks.
(WebKit::WebSocketClient::didConnect):
(WebKit::WebSocketClient::didReceiveMessage):
(WebKit::WebSocketClient::didReceiveBinaryData):
(WebKit::WebSocketClient::didReceiveMessageError):
(WebKit::WebSocketClient::didUpdateBufferedAmount):
(WebKit::WebSocketClient::didStartClosingHandshake):
(WebKit::WebSocketClient::didClose):
* src/WebSocketImpl.cpp:
(WebKit::WebSocketImpl::didUpdateBufferedAmount):
* src/WebSocketImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101613 => 101614)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-01 06:54:22 UTC (rev 101613)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-01 07:01:47 UTC (rev 101614)
@@ -1,3 +1,22 @@
+2011-11-30 Takashi Toyoshima <[email protected]>
+
+ Add didUpdateBufferedAmount callback to WebSocketClient API
+ https://bugs.webkit.org/show_bug.cgi?id=73306
+
+ Reviewed by Darin Fisher.
+
+ * public/WebSocketClient.h: Add didUpdateBufferedAmount and default implementations for all callbacks.
+ (WebKit::WebSocketClient::didConnect):
+ (WebKit::WebSocketClient::didReceiveMessage):
+ (WebKit::WebSocketClient::didReceiveBinaryData):
+ (WebKit::WebSocketClient::didReceiveMessageError):
+ (WebKit::WebSocketClient::didUpdateBufferedAmount):
+ (WebKit::WebSocketClient::didStartClosingHandshake):
+ (WebKit::WebSocketClient::didClose):
+ * src/WebSocketImpl.cpp:
+ (WebKit::WebSocketImpl::didUpdateBufferedAmount):
+ * src/WebSocketImpl.h:
+
2011-11-30 Scott Violet <[email protected]>
[chromium] Expose WebLayerTreeView::setRootLayer as a call through
Modified: trunk/Source/WebKit/chromium/public/WebSocketClient.h (101613 => 101614)
--- trunk/Source/WebKit/chromium/public/WebSocketClient.h 2011-12-01 06:54:22 UTC (rev 101613)
+++ trunk/Source/WebKit/chromium/public/WebSocketClient.h 2011-12-01 07:01:47 UTC (rev 101614)
@@ -46,12 +46,13 @@
};
virtual ~WebSocketClient() { }
- virtual void didConnect() = 0;
- virtual void didReceiveMessage(const WebString& message) = 0;
- virtual void didReceiveBinaryData(const WebData& binaryData) = 0;
- virtual void didReceiveMessageError() = 0;
- virtual void didStartClosingHandshake() = 0;
- virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const WebString& reason) = 0;
+ virtual void didConnect() { }
+ virtual void didReceiveMessage(const WebString& message) { }
+ virtual void didReceiveBinaryData(const WebData& binaryData) { }
+ virtual void didReceiveMessageError() { }
+ virtual void didUpdateBufferedAmount(unsigned long bufferedAmount) { }
+ virtual void didStartClosingHandshake() { }
+ virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const WebString& reason) { }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebSocketImpl.cpp (101613 => 101614)
--- trunk/Source/WebKit/chromium/src/WebSocketImpl.cpp 2011-12-01 06:54:22 UTC (rev 101613)
+++ trunk/Source/WebKit/chromium/src/WebSocketImpl.cpp 2011-12-01 07:01:47 UTC (rev 101614)
@@ -181,6 +181,15 @@
#endif
}
+void WebSocketImpl::didUpdateBufferedAmount(unsigned long bufferedAmount)
+{
+#if ENABLE(WEB_SOCKETS)
+ m_client->didUpdateBufferedAmount(bufferedAmount);
+#else
+ ASSERT_NOT_REACHED();
+#endif
+}
+
void WebSocketImpl::didStartClosingHandshake()
{
#if ENABLE(WEB_SOCKETS)
Modified: trunk/Source/WebKit/chromium/src/WebSocketImpl.h (101613 => 101614)
--- trunk/Source/WebKit/chromium/src/WebSocketImpl.h 2011-12-01 06:54:22 UTC (rev 101613)
+++ trunk/Source/WebKit/chromium/src/WebSocketImpl.h 2011-12-01 07:01:47 UTC (rev 101614)
@@ -68,6 +68,7 @@
virtual void didReceiveMessage(const String& message);
virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData);
virtual void didReceiveMessageError();
+ virtual void didUpdateBufferedAmount(unsigned long bufferedAmount);
virtual void didStartClosingHandshake();
virtual void didClose(unsigned long bufferedAmount, ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
