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

Unified Diff: webkit/plugins/ppapi/ppb_websocket_impl.cc

Issue 9296001: WebSocket Pepper API: Remove binary type handling interfaces (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 11 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 | « webkit/plugins/ppapi/ppb_websocket_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_websocket_impl.cc
diff --git a/webkit/plugins/ppapi/ppb_websocket_impl.cc b/webkit/plugins/ppapi/ppb_websocket_impl.cc
index 760a4e4b13771f6baa7f975b9fc75cee40bf69aa..be42d7e760890a92e7989484b339c4ddf402fe86 100644
--- a/webkit/plugins/ppapi/ppb_websocket_impl.cc
+++ b/webkit/plugins/ppapi/ppb_websocket_impl.cc
@@ -80,7 +80,6 @@ namespace ppapi {
PPB_WebSocket_Impl::PPB_WebSocket_Impl(PP_Instance instance)
: Resource(instance),
state_(PP_WEBSOCKETREADYSTATE_INVALID_DEV),
- binary_type_(WebSocket::BinaryTypeBlob),
error_was_received_(false),
receive_callback_var_(NULL),
wait_for_receive_(false),
@@ -196,7 +195,7 @@ int32_t PPB_WebSocket_Impl::Connect(PP_Var url,
return PP_ERROR_NOTSUPPORTED;
// Set receiving binary object type.
- websocket_->setBinaryType(binary_type_);
+ websocket_->setBinaryType(WebSocket::BinaryTypeArrayBuffer);
websocket_->connect(web_url, web_protocols);
state_ = PP_WEBSOCKETREADYSTATE_CONNECTING_DEV;
@@ -413,38 +412,6 @@ PP_Var PPB_WebSocket_Impl::GetURL() {
return url_->GetPPVar();
}
-PP_Bool PPB_WebSocket_Impl::SetBinaryType(
- PP_WebSocketBinaryType_Dev binary_type) {
- switch (binary_type) {
- case PP_WEBSOCKETBINARYTYPE_BLOB_DEV:
- binary_type_ = WebSocket::BinaryTypeBlob;
- break;
- case PP_WEBSOCKETBINARYTYPE_ARRAYBUFFER_DEV:
- binary_type_ = WebSocket::BinaryTypeArrayBuffer;
- break;
- default:
- return PP_FALSE;
- }
- // WebKit API setBinaryType() is called when Connect() is called.
- // If the websocket_ contains an object; it means Connect() is already
- // called, call WebKit API here to reflect the setting as soon as possible.
- if (websocket_.get())
- websocket_->setBinaryType(binary_type_);
- return PP_TRUE;
-}
-
-PP_WebSocketBinaryType_Dev PPB_WebSocket_Impl::GetBinaryType() {
- switch (binary_type_) {
- case WebSocket::BinaryTypeBlob:
- return PP_WEBSOCKETBINARYTYPE_BLOB_DEV;
- case WebSocket::BinaryTypeArrayBuffer:
- return PP_WEBSOCKETBINARYTYPE_ARRAYBUFFER_DEV;
- default:
- NOTREACHED();
- return PP_WEBSOCKETBINARYTYPE_INVALID;
- }
-}
-
void PPB_WebSocket_Impl::didConnect() {
DCHECK_EQ(PP_WEBSOCKETREADYSTATE_CONNECTING_DEV, state_);
state_ = PP_WEBSOCKETREADYSTATE_OPEN_DEV;
« no previous file with comments | « webkit/plugins/ppapi/ppb_websocket_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698