Non-SFI NaCl: Batch-open resource files

components/nacl/renderer/json_manifest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/nacl/renderer/json_manifest.h"
 
 #include <set>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 424 matching lines @@
     error_info->string =
         "could not resolve url '" + nexe_url +
         "' relative to manifest base url '" + manifest_base_url_.c_str() +
         "'.";
     return false;
   }
   *full_url = resolved_gurl.possibly_invalid_spec();
   return true;
 }
 
+void JsonManifest::GetFiles(
+    std::vector<std::pair<std::string, std::string> >* out_files,
+    const std::string& scheme) const {

[Mark Seaborn, 2015/02/12 03:57:34]

If this arg is always the same, you might as well remove it, and rename the
function to GetPrefetchableFiles().

[Yusuke Sato, 2015/02/13 23:01:17]

Done.

+  const Json::Value& files = dictionary_[kFilesKey];
+  if (!files.isObject())
+    return;
+
+  const std::vector<std::string>& 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 (scheme.empty() || GURL(full_url).SchemeIs(scheme.c_str()))

[Mark Seaborn, 2015/02/12 03:57:34]

scheme is always passed as "chrome-extension", so you could drop the
scheme.empty() check.

[Yusuke Sato, 2015/02/13 23:01:17]

Done.

+        out_files->push_back(std::make_pair(full_url, keys[i]));
+    }
+  }
+}
+
 bool JsonManifest::ResolveKey(const std::string& key,
                               std::string* full_url,
                               PP_PNaClOptions* pnacl_options) const {
   // key must be one of kProgramKey or kFileKey '/' file-section-key
   if (full_url == NULL || pnacl_options == NULL)
     return false;
 
   if (key == kProgramKey)
     return GetKeyUrl(dictionary_, key, full_url, pnacl_options);
 
@@ skipping 190 matching lines @@
   } else {
     // NaCl
     *url = isa_spec[kUrlKey].asString();
     pnacl_options->translate = PP_FALSE;
   }
 
   return true;
 }
 
 }  // namespace nacl