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

Unified Diff: src/shared/ppapi_proxy/plugin_ppb_url_loader.cc

Issue 6177007: ppapi_proxy: Support loading and reading urls. Proxy URLLoader.... (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 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
Index: src/shared/ppapi_proxy/plugin_ppb_url_loader.cc
===================================================================
--- src/shared/ppapi_proxy/plugin_ppb_url_loader.cc (revision 4028)
+++ src/shared/ppapi_proxy/plugin_ppb_url_loader.cc (working copy)
@@ -4,68 +4,157 @@
* be found in the LICENSE file.
*/
-#include "native_client/src/shared/ppapi_proxy/plugin_url_loader.h"
+#include "native_client/src/shared/ppapi_proxy/plugin_ppb_url_loader.h"
#include <stdio.h>
#include <string.h>
-#include "srpcgen/ppb_rpc.h"
+#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/portability.h"
+#include "native_client/src/shared/ppapi_proxy/plugin_callback.h"
#include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
#include "native_client/src/shared/ppapi_proxy/utility.h"
#include "native_client/src/shared/srpc/nacl_srpc.h"
+#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/pp_errors.h"
-#include "ppapi/c/pp_completion_callback.h"
#include "ppapi/c/ppb_url_loader.h"
+#include "srpcgen/ppb_rpc.h"
namespace ppapi_proxy {
namespace {
+
PP_Resource Create(PP_Instance instance) {
- UNREFERENCED_PARAMETER(instance);
+ DebugPrintf("PPB_URLLoader::Create: instance=%"NACL_PRIx64"\n", instance);
+
+ PP_Resource resource;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_Create(
+ GetMainSrpcChannel(), instance, &resource);
+ DebugPrintf("PPB_URLLoader::Create: %s\n", NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK)
+ return resource;
return kInvalidResourceId;
}
PP_Bool IsURLLoader(PP_Resource resource) {
- UNREFERENCED_PARAMETER(resource);
+ DebugPrintf("PPB_URLLoader::IsURLLoader: resource=%"NACL_PRIx64"\n",
+ resource);
+
+ int32_t is_url_loader;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_IsURLLoader(
+ GetMainSrpcChannel(), resource, &is_url_loader);
+ DebugPrintf("PPB_URLLoader::IsURLLoader: %s\n",
+ NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK && is_url_loader)
+ return PP_TRUE;
return PP_FALSE;
}
int32_t Open(PP_Resource loader,
- PP_Resource request_info,
+ PP_Resource request,
struct PP_CompletionCallback callback) {
- UNREFERENCED_PARAMETER(loader);
- UNREFERENCED_PARAMETER(request_info);
- UNREFERENCED_PARAMETER(callback);
- return PP_ERROR_BADRESOURCE;
+ DebugPrintf("PPB_URLLoader::Open: loader=%"NACL_PRIx64"\n", loader);
+
+ int32_t callback_id =
+ CompletionCallbackTable::Get()->AddCallback(callback);
+ if (callback_id == 0) // Just like Chrome, for now disallow blocking calls.
+ return PP_ERROR_BADARGUMENT;
+
+ int32_t pp_error;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_Open(
+ GetMainSrpcChannel(), loader, request, callback_id, &pp_error);
+ DebugPrintf("PPB_URLLoader::Open: %s\n", NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK)
+ return pp_error;
+ return PP_ERROR_FAILED;
}
int32_t FollowRedirect(PP_Resource loader,
struct PP_CompletionCallback callback) {
- UNREFERENCED_PARAMETER(loader);
- UNREFERENCED_PARAMETER(callback);
- return PP_ERROR_BADRESOURCE;
+ DebugPrintf("PPB_URLLoader::FollowRedirect: loader=%"NACL_PRIx64"\n", loader);
+ NACL_UNTESTED();
+
+ int32_t callback_id =
+ CompletionCallbackTable::Get()->AddCallback(callback);
+ if (callback_id == 0) // Just like Chrome, for now disallow blocking calls.
+ return PP_ERROR_BADARGUMENT;
+
+ int32_t pp_error;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_FollowRedirect(
+ GetMainSrpcChannel(), loader, callback_id, &pp_error);
+ DebugPrintf("PPB_URLLoader::FollowRedirect: %s\n",
+ NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK)
+ return pp_error;
+ return PP_ERROR_FAILED;
}
PP_Bool GetUploadProgress(PP_Resource loader,
- int64_t* bytes_sent,
- int64_t* total_bytes_to_be_sent) {
- UNREFERENCED_PARAMETER(loader);
- UNREFERENCED_PARAMETER(bytes_sent);
- UNREFERENCED_PARAMETER(total_bytes_to_be_sent);
+ int64_t* bytes_sent,
+ int64_t* total_bytes_to_be_sent) {
+ DebugPrintf("PPB_URLLoader::GetUploadProgress: loader=%"NACL_PRIx64"\n",
+ loader);
+ NACL_UNTESTED();
+
+ int32_t success;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_GetUploadProgress(
+ GetMainSrpcChannel(),
+ loader,
+ bytes_sent,
+ total_bytes_to_be_sent,
+ &success);
+ DebugPrintf("PPB_URLLoader::GetUploadProgress: %s\n",
+ NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK && success)
+ return PP_TRUE;
return PP_FALSE;
}
PP_Bool GetDownloadProgress(PP_Resource loader,
- int64_t* bytes_received,
- int64_t* total_bytes_to_be_received) {
- UNREFERENCED_PARAMETER(loader);
- UNREFERENCED_PARAMETER(bytes_received);
- UNREFERENCED_PARAMETER(total_bytes_to_be_received);
+ int64_t* bytes_received,
+ int64_t* total_bytes_to_be_received) {
+ DebugPrintf("PPB_URLLoader::GetDownloadProgress: loader=%"NACL_PRIx64"\n",
+ loader);
+ NACL_UNTESTED();
+
+ int32_t success;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_GetDownloadProgress(
+ GetMainSrpcChannel(),
+ loader,
+ bytes_received,
+ total_bytes_to_be_received,
+ &success);
+ DebugPrintf("PPB_URLLoader::GetDownloadProgress: %s\n",
+ NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK && success)
+ return PP_TRUE;
return PP_FALSE;
}
PP_Resource GetResponseInfo(PP_Resource loader) {
- UNREFERENCED_PARAMETER(loader);
+ DebugPrintf("PPB_URLLoader::GetResponseInfo: loader=%"NACL_PRIx64"\n",
+ loader);
+
+ PP_Resource response;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_GetResponseInfo(
+ GetMainSrpcChannel(),
+ loader,
+ &response);
+
+ if (srpc_result == NACL_SRPC_RESULT_OK)
+ return response;
return kInvalidResourceId;
}
@@ -73,27 +162,69 @@
char* buffer,
int32_t bytes_to_read,
struct PP_CompletionCallback callback) {
- UNREFERENCED_PARAMETER(loader);
- UNREFERENCED_PARAMETER(buffer);
- UNREFERENCED_PARAMETER(bytes_to_read);
- UNREFERENCED_PARAMETER(callback);
- return PP_ERROR_BADRESOURCE;
+ DebugPrintf("PPB_URLLoader::ReadResponseBody: loader=%"NACL_PRIx64"\n",
+ loader);
+ if (bytes_to_read < 0)
+ bytes_to_read = 0;
+ nacl_abi_size_t buffer_size = bytes_to_read;
+
+ int32_t callback_id =
+ CompletionCallbackTable::Get()->AddCallback(callback, buffer);
+ if (callback_id == 0) // Just like Chrome, for now disallow blocking calls.
+ return PP_ERROR_BADARGUMENT;
+
+ int32_t pp_error_or_bytes;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_ReadResponseBody(
+ GetMainSrpcChannel(),
+ loader,
+ bytes_to_read,
+ callback_id,
+ &buffer_size,
+ buffer,
+ &pp_error_or_bytes);
+ DebugPrintf("PPB_URLLoader::ReadResponseBody: %s\n",
+ NaClSrpcErrorString(srpc_result));
+
+ if (srpc_result == NACL_SRPC_RESULT_OK)
+ return pp_error_or_bytes;
+ return PP_ERROR_FAILED;
}
int32_t FinishStreamingToFile(PP_Resource loader,
struct PP_CompletionCallback callback) {
- UNREFERENCED_PARAMETER(loader);
- UNREFERENCED_PARAMETER(callback);
- return PP_ERROR_BADRESOURCE;
+ DebugPrintf("PPB_URLLoader::FinishStreamingToFile: loader=%"NACL_PRIx64"\n",
+ loader);
+
+ int32_t callback_id =
+ CompletionCallbackTable::Get()->AddCallback(callback);
+ if (callback_id == 0) // Just like Chrome, for now disallow blocking calls.
+ return PP_ERROR_BADARGUMENT;
+
+ int32_t pp_error;
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_FinishStreamingToFile(
+ GetMainSrpcChannel(), loader, callback_id, &pp_error);
+
+ if (srpc_result == NACL_SRPC_RESULT_OK)
+ return pp_error;
+ return PP_ERROR_FAILED;
}
void Close(PP_Resource loader) {
- UNREFERENCED_PARAMETER(loader);
+ DebugPrintf("PPB_URLLoader::Close: loader=%"NACL_PRIx64"\n", loader);
+ NACL_UNTESTED();
+
+ NaClSrpcError srpc_result =
+ PpbURLLoaderRpcClient::PPB_URLLoader_Close(
+ GetMainSrpcChannel(), loader);
+ DebugPrintf("PPB_URLLoader::Close: %s\n", NaClSrpcErrorString(srpc_result));
}
+
} // namespace
const PPB_URLLoader* PluginURLLoader::GetInterface() {
- static const PPB_URLLoader intf = {
+ static const PPB_URLLoader url_loader_interface = {
Create,
IsURLLoader,
Open,
@@ -105,7 +236,7 @@
FinishStreamingToFile,
Close,
};
- return &intf;
+ return &url_loader_interface;
}
} // namespace ppapi_proxy
« no previous file with comments | « src/shared/ppapi_proxy/plugin_ppb_url_loader.h ('k') | src/shared/ppapi_proxy/plugin_ppb_url_request_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698