| Index: ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| index 5af0c5183d76257937e8618d9efc11431d5d5e87..e7f8448144e3c7296cc8b0cea33bea5d02c806bc 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| @@ -11,6 +11,8 @@
|
| #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
|
| #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_
|
|
|
| +#include <map>
|
| +
|
| #include "native_client/src/include/nacl_macros.h"
|
| #include "native_client/src/include/nacl_scoped_ptr.h"
|
| #include "native_client/src/include/nacl_string.h"
|
| @@ -90,20 +92,35 @@ struct CloseManifestEntryResource {
|
| bool* op_result_ptr;
|
| };
|
|
|
| +enum QuotaDataType {
|
| + PepperQuotaType,
|
| + TempQuotaType
|
| +};
|
| +
|
| +struct QuotaData {
|
| + QuotaData(QuotaDataType type_, PP_Resource resource_)
|
| + : type(type_), resource(resource_) {}
|
| + QuotaData()
|
| + : type(PepperQuotaType), resource(0) {}
|
| +
|
| + QuotaDataType type;
|
| + PP_Resource resource;
|
| +};
|
| +
|
| struct QuotaRequest {
|
| public:
|
| - QuotaRequest(PP_Resource file_resource,
|
| + QuotaRequest(QuotaData quota_data,
|
| int64_t start_offset,
|
| int64_t quota_bytes_requested,
|
| int64_t* quota_bytes_granted,
|
| bool* op_complete)
|
| - : resource(file_resource),
|
| + : data(quota_data),
|
| offset(start_offset),
|
| bytes_requested(quota_bytes_requested),
|
| bytes_granted(quota_bytes_granted),
|
| op_complete_ptr(op_complete) { }
|
|
|
| - PP_Resource resource;
|
| + QuotaData data;
|
| int64_t offset;
|
| int64_t bytes_requested;
|
| int64_t* bytes_granted;
|
| @@ -151,6 +168,7 @@ class PluginReverseInterface: public nacl::ReverseInterface {
|
|
|
| void AddQuotaManagedFile(const nacl::string& file_id,
|
| const pp::FileIO& file_io);
|
| + void AddTempQuotaManagedFile(const nacl::string& file_id);
|
|
|
| protected:
|
| virtual void Log_MainThreadContinuation(LogToJavaScriptConsoleResource* p,
|
| @@ -191,7 +209,7 @@ class PluginReverseInterface: public nacl::ReverseInterface {
|
| ServiceRuntime* service_runtime_;
|
| NaClMutex mu_;
|
| NaClCondVar cv_;
|
| - std::map<int64_t, PP_Resource> quota_map_;
|
| + std::map<int64_t, QuotaData> quota_map_;
|
| bool shutting_down_;
|
|
|
| nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_;
|
|
|