diff options
| author | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 20:21:55 +0000 |
|---|---|---|
| committer | jvoung@google.com <jvoung@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-17 20:21:55 +0000 |
| commit | 32cfcd2f68e6960d5d25a01f6e4d90be58311173 (patch) | |
| tree | ae1ccdf1888e940c4e0d14edd6cb3063f2fe49dd /ppapi | |
| parent | 981e06a668466746e6735239ce2bb046a4e681ef (diff) | |
| download | chromium_src-32cfcd2f68e6960d5d25a01f6e4d90be58311173.zip chromium_src-32cfcd2f68e6960d5d25a01f6e4d90be58311173.tar.gz chromium_src-32cfcd2f68e6960d5d25a01f6e4d90be58311173.tar.bz2 | |
Reinstate ResolveURL step in nacl manifest resolver -- mistake from 122409.
R=sehr@google.com
BUG= none
TEST= nacl_integration (should add one for this manifest lookup issue though)
Review URL: https://chromiumcodereview.appspot.com/9422006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/src/trusted/plugin/json_manifest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/json_manifest.cc b/ppapi/native_client/src/trusted/plugin/json_manifest.cc index 4db6923..af38a2f 100644 --- a/ppapi/native_client/src/trusted/plugin/json_manifest.cc +++ b/ppapi/native_client/src/trusted/plugin/json_manifest.cc @@ -300,14 +300,15 @@ bool GetKeyUrl(const Json::Value& dictionary, } const Json::Value& isa_dict = dictionary[key]; nacl::string error_string; + nacl::string relative_url; if (!GetURLFromISADictionary(isa_dict, key, sandbox_isa, prefer_portable, - full_url, &error_string, pnacl_translate)) { + &relative_url, &error_string, pnacl_translate)) { error_info->SetReport(ERROR_MANIFEST_RESOLVE_URL, key + nacl::string(" manifest resolution error: ") + error_string); return false; } - return true; + return manifest->ResolveURL(relative_url, full_url, error_info); } } // namespace |