| Index: webkit/plugins/ppapi/mock_plugin_delegate.h
|
| ===================================================================
|
| --- webkit/plugins/ppapi/mock_plugin_delegate.h (revision 112751)
|
| +++ webkit/plugins/ppapi/mock_plugin_delegate.h (working copy)
|
| @@ -104,30 +104,6 @@
|
| virtual int32_t ConnectTcpAddress(
|
| webkit::ppapi::PPB_Flash_NetConnector_Impl* connector,
|
| const PP_NetAddress_Private* addr);
|
| - virtual uint32 TCPSocketCreate();
|
| - virtual void TCPSocketConnect(PPB_TCPSocket_Private_Impl* socket,
|
| - uint32 socket_id,
|
| - const std::string& host,
|
| - uint16_t port);
|
| - virtual void TCPSocketConnectWithNetAddress(
|
| - PPB_TCPSocket_Private_Impl* socket,
|
| - uint32 socket_id,
|
| - const PP_NetAddress_Private& addr);
|
| - virtual void TCPSocketSSLHandshake(uint32 socket_id,
|
| - const std::string& server_name,
|
| - uint16_t server_port);
|
| - virtual void TCPSocketRead(uint32 socket_id, int32_t bytes_to_read);
|
| - virtual void TCPSocketWrite(uint32 socket_id, const std::string& buffer);
|
| - virtual void TCPSocketDisconnect(uint32 socket_id);
|
| - virtual uint32 UDPSocketCreate();
|
| - virtual void UDPSocketBind(PPB_UDPSocket_Private_Impl* socket,
|
| - uint32 socket_id,
|
| - const PP_NetAddress_Private& addr);
|
| - virtual void UDPSocketRecvFrom(uint32 socket_id, int32_t num_bytes);
|
| - virtual void UDPSocketSendTo(uint32 socket_id,
|
| - const std::string& buffer,
|
| - const PP_NetAddress_Private& addr);
|
| - virtual void UDPSocketClose(uint32 socket_id);
|
| virtual int32_t ShowContextMenu(
|
| PluginInstance* instance,
|
| webkit::ppapi::PPB_Flash_Menu_Impl* menu,
|
|
|
| Property changes on: webkit\plugins\ppapi\mock_plugin_delegate.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
| Reverse-merged /branches/chrome_webkit_merge_branch/src/webkit/plugins/ppapi/mock_plugin_delegate.h:r3734-4217,4606-5108,5177-5263
|
|
|
|
|