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

Unified Diff: components/nacl/renderer/ppb_nacl_private_impl.cc

Issue 728113002: obsolete: SFI NaCl: Batch-open resource files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 6 years, 1 month 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
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | ppapi/api/private/ppb_nacl_private.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 6c406e1965c64f9c7912e029600711f896142247..d5d9d76f25780b90815657e34ca1b3f58fbd2303 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -1291,14 +1291,20 @@ void DownloadNexeCompletion(const DownloadNexeRequest& request,
void DownloadNexe(PP_Instance instance,
const char* url,
- PP_Bool download_resource_files,
PP_NaClFileInfo* out_file_info,
PP_NaClResourceFileHandle** out_resource_file_handles,
uint32_t* out_resource_file_handles_len,
PP_CompletionCallback callback) {
CHECK(url);
CHECK(out_file_info);
- CHECK(!download_resource_files || out_resource_file_handles);
+ CHECK(out_resource_file_handles);
+
+#if defined(OS_POSIX)
+ const bool kDownloadResourceFiles = true;
+#else
+ // TODO(yusukes): Support Windows.
+ const bool kDownloadResourceFiles = false;
+#endif
DownloadNexeRequest request;
request.instance = instance;
@@ -1310,7 +1316,7 @@ void DownloadNexe(PP_Instance instance,
std::pair<std::string /*url*/, std::string /*key*/> > resource_files;
std::vector<std::string> resource_file_urls;
- if (download_resource_files) {
+ if (kDownloadResourceFiles) {
JsonManifest* manifest = GetJsonManifest(instance);
if (manifest)
manifest->GetFiles(&resource_files);
« no previous file with comments | « components/nacl/loader/nacl_listener.cc ('k') | ppapi/api/private/ppb_nacl_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698