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

Unified Diff: ppapi/native_client/src/trusted/plugin/json_manifest.cc

Issue 16569002: Use HTTP response headers for PNaCl caching instead of bitcode hash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use RunAndClear Created 7 years, 6 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: ppapi/native_client/src/trusted/plugin/json_manifest.cc
diff --git a/ppapi/native_client/src/trusted/plugin/json_manifest.cc b/ppapi/native_client/src/trusted/plugin/json_manifest.cc
index 1aa8d23a15a5248788fa2e2fec2224f48c3e12fa..d77a07527c48045952965e7353b5eec86f1bbd32 100644
--- a/ppapi/native_client/src/trusted/plugin/json_manifest.cc
+++ b/ppapi/native_client/src/trusted/plugin/json_manifest.cc
@@ -41,7 +41,6 @@ const char* const kPnaclTranslateKey = "pnacl-translate";
const char* const kUrlKey = "url";
// Pnacl keys
-const char* const kCacheIdentityKey = "sha256";
const char* const kOptLevelKey = "-O";
const char* const kPnaclExperimentalFlags = "experimental_flags";
@@ -77,7 +76,6 @@ const char* const kPnaclExperimentalFlags = "experimental_flags";
// "portable": {
// "pnacl-translate": {
// "url": "myprogram.pexe",
-// "sha256": "...",
// "-O": 0
// }
// }
@@ -169,7 +167,6 @@ bool IsValidUrlSpec(const Json::Value& url_spec,
if (sandbox_isa == kPortableKey) {
static const char* kPnaclUrlSpecPlusOptional[] = {
kUrlKey,
- kCacheIdentityKey,
kOptLevelKey,
};
urlSpecPlusOptional = kPnaclUrlSpecPlusOptional;
@@ -206,15 +203,6 @@ bool IsValidUrlSpec(const Json::Value& url_spec,
*error_string = error_stream.str();
return false;
}
- Json::Value cache_identity = url_spec[kCacheIdentityKey];
- if (!cache_identity.empty() && !cache_identity.isString()) {
- nacl::stringstream error_stream;
- error_stream << parent_key << " property '" << container_key <<
- "' has non-string value '" << cache_identity.toStyledString() <<
- "' for key '" << kCacheIdentityKey << "'.";
- *error_string = error_stream.str();
- return false;
- }
Json::Value opt_level = url_spec[kOptLevelKey];
if (!opt_level.empty() && !opt_level.isNumeric()) {
nacl::stringstream error_stream;
@@ -375,9 +363,6 @@ void GrabUrlAndPnaclOptions(const Json::Value& url_spec,
nacl::string* url,
PnaclOptions* pnacl_options) {
*url = url_spec[kUrlKey].asString();
- if (url_spec.isMember(kCacheIdentityKey)) {
- pnacl_options->set_bitcode_hash(url_spec[kCacheIdentityKey].asString());
- }
if (url_spec.isMember(kOptLevelKey)) {
uint32_t opt_raw = url_spec[kOptLevelKey].asUInt();
// Clamp the opt value to fit into an int8_t.

Powered by Google App Engine
This is Rietveld 408576698