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

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

Issue 649603004: Non-SFI NaCl: Batch-open resource files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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
« no previous file with comments | « components/nacl/renderer/json_manifest.h ('k') | components/nacl/renderer/ppb_nacl_private_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/renderer/json_manifest.cc
diff --git a/components/nacl/renderer/json_manifest.cc b/components/nacl/renderer/json_manifest.cc
index 951894679760a82f6db2cf8f0afe7de9da57bbce..15425a531e514a2a27a08cf476465aadc1432dea 100644
--- a/components/nacl/renderer/json_manifest.cc
+++ b/components/nacl/renderer/json_manifest.cc
@@ -442,6 +442,24 @@ bool JsonManifest::GetProgramURL(std::string* full_url,
return true;
}
+void JsonManifest::GetPrefetchableFiles(
+ std::vector<std::pair<std::string, std::string> >* out_files) const {
+ const Json::Value& files = dictionary_[kFilesKey];
+ if (!files.isObject())
+ return;
+
+ Json::Value::Members keys = files.getMemberNames();
+ for (size_t i = 0; i < keys.size(); ++i) {
+ std::string full_url;
+ PP_PNaClOptions unused_pnacl_options; // pnacl does not support "files".
+ // We skip invalid entries in "files".
+ if (GetKeyUrl(files, keys[i], &full_url, &unused_pnacl_options)) {
+ if (GURL(full_url).SchemeIs("chrome-extension"))
+ out_files->push_back(std::make_pair(keys[i], full_url));
+ }
+ }
+}
+
bool JsonManifest::ResolveKey(const std::string& key,
std::string* full_url,
PP_PNaClOptions* pnacl_options) const {
« no previous file with comments | « components/nacl/renderer/json_manifest.h ('k') | components/nacl/renderer/ppb_nacl_private_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698