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

Unified Diff: src/native_client/src/trusted/plugin/srpc/plugin.cc

Issue 2961004: Plugin: Remove __socketAddressFactory() and toString() on SocketAddresses (Closed)
Patch Set: Apply HTML changes to copies in "prebuilt" too Created 10 years, 5 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
Index: src/native_client/src/trusted/plugin/srpc/plugin.cc
diff --git a/src/native_client/src/trusted/plugin/srpc/plugin.cc b/src/native_client/src/trusted/plugin/srpc/plugin.cc
index 1e1d379c05cb61a5fff7aabde3828e4f593fddd7..c4436afd74450f976044bb0698ab3b340f128a5f 100644
--- a/src/native_client/src/trusted/plugin/srpc/plugin.cc
+++ b/src/native_client/src/trusted/plugin/srpc/plugin.cc
@@ -87,35 +87,6 @@ bool NullPluginMethod(void* obj, plugin::SrpcParams* params) {
return true;
}
-bool SocketAddressFactory(void* obj, plugin::SrpcParams* params) {
- plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
- // Type check the input parameter.
- if (NACL_SRPC_ARG_TYPE_STRING != params->ins()[0]->tag) {
- return false;
- }
- char* str = params->ins()[0]->u.sval;
- nacl::DescWrapper* wrapper =
- plugin->wrapper_factory()->MakeSocketAddress(str);
- if (NULL == wrapper) {
- return false;
- }
- // Create a scriptable object to return.
- plugin::SocketAddress* portable_socket_address =
- plugin::SocketAddress::New(plugin, wrapper);
- plugin::ScriptableHandle* socket_address =
- plugin->browser_interface()->NewScriptableHandle(portable_socket_address);
- if (NULL == socket_address) {
- wrapper->Delete();
- params->set_exception_string("out of memory");
- portable_socket_address->Delete();
- return false;
- }
- // Plug the scriptable object into the return values.
- params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_OBJECT;
- params->outs()[0]->u.oval = socket_address;
- return true;
-}
-
bool GetModuleReadyProperty(void* obj, plugin::SrpcParams* params) {
plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
if (plugin->socket()) {
@@ -216,7 +187,6 @@ static int const kAbiHeaderBuffer = 256; // must be at least EI_ABIVERSION + 1
void Plugin::LoadMethods() {
// Methods supported by Plugin.
AddMethodCall(ShmFactory, "__shmFactory", "i", "h");
- AddMethodCall(SocketAddressFactory, "__socketAddressFactory", "s", "h");
AddMethodCall(DefaultSocketAddress, "__defaultSocketAddress", "", "h");
AddMethodCall(NullPluginMethod, "__nullPluginMethod", "s", "i");
// Properties implemented by Plugin.
« no previous file with comments | « src/native_client/src/trusted/desc/nacl_desc_wrapper.cc ('k') | src/native_client/src/trusted/plugin/srpc/socket_address.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698