diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 06:07:25 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-27 06:07:25 +0000 |
| commit | dc909a9e56db63a207f21d2056c86f531aedc18f (patch) | |
| tree | 91e9c7df3d8ff83b94e7528f28be4f15478b0188 /ppapi/thunk | |
| parent | 1c6027f1ae1f33a7ead07bfb767843a1170b8da7 (diff) | |
| download | chromium_src-dc909a9e56db63a207f21d2056c86f531aedc18f.zip chromium_src-dc909a9e56db63a207f21d2056c86f531aedc18f.tar.gz chromium_src-dc909a9e56db63a207f21d2056c86f531aedc18f.tar.bz2 | |
WebSocket Pepper API: Remove binary type handling interfaces
In an API discussion, we decide to remove binary type handling interfaces
from the first release. This change just fix the interface. The change to
make the interface out of dev will follow this change.
BUG=87310
TEST=ui_test --gtest_filter='*WebSocket*'
Review URL: https://chromiumcodereview.appspot.com/9296001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/thunk')
| -rw-r--r-- | ppapi/thunk/interfaces_ppb_public_dev.h | 4 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_websocket_api.h | 2 | ||||
| -rw-r--r-- | ppapi/thunk/ppb_websocket_thunk.cc | 38 |
3 files changed, 2 insertions, 42 deletions
diff --git a/ppapi/thunk/interfaces_ppb_public_dev.h b/ppapi/thunk/interfaces_ppb_public_dev.h index e4bc1b8..bfc828e 100644 --- a/ppapi/thunk/interfaces_ppb_public_dev.h +++ b/ppapi/thunk/interfaces_ppb_public_dev.h @@ -64,8 +64,8 @@ PROXIED_IFACE(PPB_VideoDecoder, PPB_VIDEODECODER_DEV_INTERFACE_0_16, PPB_VideoDecoder_Dev_0_16) UNPROXIED_IFACE(PPB_VideoLayer, PPB_VIDEOLAYER_DEV_INTERFACE_0_1, PPB_VideoLayer_Dev_0_1) -UNPROXIED_IFACE(PPB_WebSocket, PPB_WEBSOCKET_DEV_INTERFACE_0_9, - PPB_WebSocket_Dev_0_9) +UNPROXIED_IFACE(PPB_WebSocket, PPB_WEBSOCKET_DEV_INTERFACE_0_1, + PPB_WebSocket_Dev_0_1) UNPROXIED_IFACE(PPB_Widget, PPB_WIDGET_DEV_INTERFACE_0_3, PPB_Widget_Dev_0_3) #include "ppapi/thunk/interfaces_postamble.h" diff --git a/ppapi/thunk/ppb_websocket_api.h b/ppapi/thunk/ppb_websocket_api.h index 4012582..867550d 100644 --- a/ppapi/thunk/ppb_websocket_api.h +++ b/ppapi/thunk/ppb_websocket_api.h @@ -33,8 +33,6 @@ class PPB_WebSocket_API { virtual PP_Var GetProtocol() = 0; virtual PP_WebSocketReadyState_Dev GetReadyState() = 0; virtual PP_Var GetURL() = 0; - virtual PP_Bool SetBinaryType(PP_WebSocketBinaryType_Dev) = 0; - virtual PP_WebSocketBinaryType_Dev GetBinaryType() = 0; }; } // namespace thunk diff --git a/ppapi/thunk/ppb_websocket_thunk.cc b/ppapi/thunk/ppb_websocket_thunk.cc index ca12d6b..ea67f84 100644 --- a/ppapi/thunk/ppb_websocket_thunk.cc +++ b/ppapi/thunk/ppb_websocket_thunk.cc @@ -124,21 +124,6 @@ PP_Var GetURL(PP_Resource resource) { return enter.object()->GetURL(); } -PP_Bool SetBinaryType(PP_Resource resource, - PP_WebSocketBinaryType_Dev binary_type) { - EnterResource<PPB_WebSocket_API> enter(resource, false); - if (enter.failed()) - return PP_FALSE; - return enter.object()->SetBinaryType(binary_type); -} - -PP_WebSocketBinaryType_Dev GetBinaryType(PP_Resource resource) { - EnterResource<PPB_WebSocket_API> enter(resource, false); - if (enter.failed()) - return PP_WEBSOCKETBINARYTYPE_INVALID; - return enter.object()->GetBinaryType(); -} - const PPB_WebSocket_Dev_0_1 g_ppb_websocket_0_1_thunk = { &Create, &IsWebSocket, @@ -156,34 +141,11 @@ const PPB_WebSocket_Dev_0_1 g_ppb_websocket_0_1_thunk = { &GetURL }; -const PPB_WebSocket_Dev_0_9 g_ppb_websocket_0_9_thunk = { - &Create, - &IsWebSocket, - &Connect, - &Close, - &ReceiveMessage, - &SendMessage, - &GetBufferedAmount, - &GetCloseCode, - &GetCloseReason, - &GetCloseWasClean, - &GetExtensions, - &GetProtocol, - &GetReadyState, - &GetURL, - &SetBinaryType, - &GetBinaryType -}; - } // namespace const PPB_WebSocket_Dev_0_1* GetPPB_WebSocket_Dev_0_1_Thunk() { return &g_ppb_websocket_0_1_thunk; } -const PPB_WebSocket_Dev_0_9* GetPPB_WebSocket_Dev_0_9_Thunk() { - return &g_ppb_websocket_0_9_thunk; -} - } // namespace thunk } // namespace ppapi |