diff options
Diffstat (limited to 'ppapi/native_client/src')
9 files changed, 23 insertions, 23 deletions
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc index 284e56d..9eb4215bd 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.cc @@ -416,10 +416,10 @@ const PPB_View* PPBViewInterface() { return ppb; } -const PPB_WebSocket_Dev* PPBWebSocketInterface() { - static const PPB_WebSocket_Dev* ppb = - static_cast<const PPB_WebSocket_Dev*>( - GetBrowserInterfaceSafe(PPB_WEBSOCKET_DEV_INTERFACE)); +const PPB_WebSocket* PPBWebSocketInterface() { + static const PPB_WebSocket* ppb = + static_cast<const PPB_WebSocket*>( + GetBrowserInterfaceSafe(PPB_WEBSOCKET_INTERFACE)); return ppb; } diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h index 913cf10..19ffd4f 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_globals.h @@ -12,7 +12,6 @@ #include "ppapi/c/dev/ppb_memory_dev.h" #include "ppapi/c/dev/ppb_scrollbar_dev.h" #include "ppapi/c/dev/ppb_testing_dev.h" -#include "ppapi/c/dev/ppb_websocket_dev.h" #include "ppapi/c/dev/ppb_widget_dev.h" #include "ppapi/c/dev/ppb_zoom_dev.h" #include "ppapi/c/pp_instance.h" @@ -36,6 +35,7 @@ #include "ppapi/c/ppb_var.h" #include "ppapi/c/ppb_var_array_buffer.h" #include "ppapi/c/ppb_view.h" +#include "ppapi/c/ppb_websocket.h" #include "ppapi/c/private/ppb_net_address_private.h" #include "ppapi/c/private/ppb_pdf.h" #include "ppapi/c/private/ppb_tcp_socket_private.h" @@ -133,7 +133,7 @@ const PPB_Var* PPBVarInterface(); // shared const PPB_VarArrayBuffer* PPBVarArrayBufferInterface(); // shared const PPB_View* PPBViewInterface(); const PPB_WheelInputEvent* PPBWheelInputEventInterface(); -const PPB_WebSocket_Dev* PPBWebSocketInterface(); +const PPB_WebSocket* PPBWebSocketInterface(); const PPB_Widget_Dev* PPBWidgetInterface(); const PPB_Zoom_Dev* PPBZoomInterface(); diff --git a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc index d59997b..65c0877 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/browser_ppb_websocket_rpc_server.cc @@ -11,8 +11,8 @@ #include "native_client/src/shared/ppapi_proxy/utility.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" -#include "ppapi/c/dev/ppb_websocket_dev.h" #include "srpcgen/ppb_rpc.h" +#include "ppapi/c/ppb_websocket.h" using ppapi_proxy::DebugPrintf; using ppapi_proxy::DeleteRemoteCallbackInfo; diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc index 493cacb..b8ef392 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.cc @@ -90,9 +90,9 @@ const PPB_VarArrayBuffer* PPBVarArrayBufferInterface() { GetBrowserInterfaceSafe(PPB_VAR_ARRAY_BUFFER_INTERFACE)); } -const PPB_WebSocket_Dev* PPBWebSocketInterface() { - return static_cast<const PPB_WebSocket_Dev*>( - GetBrowserInterfaceSafe(PPB_WEBSOCKET_DEV_INTERFACE)); +const PPB_WebSocket* PPBWebSocketInterface() { + return static_cast<const PPB_WebSocket*>( + GetBrowserInterfaceSafe(PPB_WEBSOCKET_INTERFACE)); } // Plugin interface helpers diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h index fbcba2d..600f098 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_globals.h @@ -6,7 +6,6 @@ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_GLOBALS_H_ #include "ppapi/c/dev/ppb_memory_dev.h" -#include "ppapi/c/dev/ppb_websocket_dev.h" #include "ppapi/c/dev/ppp_find_dev.h" #include "ppapi/c/dev/ppp_printing_dev.h" #include "ppapi/c/dev/ppp_scrollbar_dev.h" @@ -18,6 +17,7 @@ #include "ppapi/c/ppb_core.h" #include "ppapi/c/ppb_var.h" #include "ppapi/c/ppb_var_array_buffer.h" +#include "ppapi/c/ppb_websocket.h" #include "ppapi/c/ppp_input_event.h" #include "ppapi/c/ppp_instance.h" #include "ppapi/c/ppp_messaging.h" @@ -56,7 +56,7 @@ const PPB_Core* PPBCoreInterface(); // shared const PPB_Memory_Dev* PPBMemoryInterface(); // shared const PPB_Var* PPBVarInterface(); // shared const PPB_VarArrayBuffer* PPBVarArrayBufferInterface(); // shared -const PPB_WebSocket_Dev* PPBWebSocketInterface(); +const PPB_WebSocket* PPBWebSocketInterface(); // Support for getting PPP_ plugin interfaces. // Safe version CHECK's for NULL. diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc index 1efbab9..8d1734d 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb.cc @@ -103,7 +103,7 @@ InterfaceMapElement interface_map[] = { { PPB_VAR_INTERFACE, PluginVar::GetInterface(), true }, { PPB_VAR_INTERFACE_1_0, PluginVar::GetInterface1_0(), true }, { PPB_VIEW_INTERFACE, PluginView::GetInterface(), true }, - { PPB_WEBSOCKET_DEV_INTERFACE, PluginWebSocket::GetInterface(), + { PPB_WEBSOCKET_INTERFACE, PluginWebSocket::GetInterface(), true }, { PPB_WHEEL_INPUT_EVENT_INTERFACE, PluginInputEvent::GetWheelInterface(), true }, diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.cc b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.cc index 56b4de2..1fdbf2c 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.cc +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.cc @@ -13,7 +13,7 @@ #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_var.h" -#include "ppapi/c/dev/ppb_websocket_dev.h" +#include "ppapi/c/ppb_websocket.h" #include "srpcgen/ppb_rpc.h" namespace ppapi_proxy { @@ -267,7 +267,7 @@ PP_Var GetProtocol(PP_Resource ws) { return PP_MakeUndefined(); } -PP_WebSocketReadyState_Dev GetReadyState(PP_Resource ws) { +PP_WebSocketReadyState GetReadyState(PP_Resource ws) { DebugPrintf( "PPB_WebSocket::GetReadyState: ws=%"NACL_PRId32"\n", ws); @@ -279,8 +279,8 @@ PP_WebSocketReadyState_Dev GetReadyState(PP_Resource ws) { NaClSrpcErrorString(srpc_result)); if (srpc_result != NACL_SRPC_RESULT_OK) - return PP_WEBSOCKETREADYSTATE_INVALID_DEV; - return static_cast<PP_WebSocketReadyState_Dev>(ready_state); + return PP_WEBSOCKETREADYSTATE_INVALID; + return static_cast<PP_WebSocketReadyState>(ready_state); } PP_Var GetURL(PP_Resource ws) { @@ -305,8 +305,8 @@ PP_Var GetURL(PP_Resource ws) { } // namespace -const PPB_WebSocket_Dev* PluginWebSocket::GetInterface() { - static const PPB_WebSocket_Dev websocket_interface = { +const PPB_WebSocket* PluginWebSocket::GetInterface() { + static const PPB_WebSocket websocket_interface = { &Create, &IsWebSocket, &Connect, diff --git a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.h b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.h index fb209ac..285ec36 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.h +++ b/ppapi/native_client/src/shared/ppapi_proxy/plugin_ppb_websocket.h @@ -6,14 +6,14 @@ #define NATIVE_CLIENT_SRC_SHARED_PPAPI_PROXY_PLUGIN_WEBSOCKET_H_ #include "native_client/src/include/nacl_macros.h" -#include "ppapi/c/dev/ppb_websocket_dev.h" +#include "ppapi/c/ppb_websocket.h" namespace ppapi_proxy { // Implements the untrusted side of the PPB_WebSocket interface. class PluginWebSocket { public: - static const PPB_WebSocket_Dev* GetInterface(); + static const PPB_WebSocket* GetInterface(); private: NACL_DISALLOW_COPY_AND_ASSIGN(PluginWebSocket); diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_websocket.srpc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_websocket.srpc index 6c6fe49..9b9c665 100644 --- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_websocket.srpc +++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_websocket.srpc @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # -# RPC methods used to implement PPB_WebSocket_Dev calls from the plugin. -# See ppapi/c/dev/ppb_websocket_dev.h for interface details. +# RPC methods used to implement PPB_WebSocket calls from the plugin. +# See ppapi/c/ppb_websocket.h for interface details. { 'name': 'PpbWebSocketRpc', |