OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" | 5 #include "ppapi/native_client/src/trusted/plugin/pnacl_coordinator.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "native_client/src/include/checked_cast.h" | 10 #include "native_client/src/include/checked_cast.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 // Normally, that manifest is an NMF containing mappings for shared libraries. | 35 // Normally, that manifest is an NMF containing mappings for shared libraries. |
36 // Here, we provide a manifest that redirects to PNaCl component files | 36 // Here, we provide a manifest that redirects to PNaCl component files |
37 // that are part of Chrome. | 37 // that are part of Chrome. |
38 class PnaclManifest : public Manifest { | 38 class PnaclManifest : public Manifest { |
39 public: | 39 public: |
40 PnaclManifest() : manifest_base_url_(PnaclUrls::GetBaseUrl()) { } | 40 PnaclManifest() : manifest_base_url_(PnaclUrls::GetBaseUrl()) { } |
41 virtual ~PnaclManifest() { } | 41 virtual ~PnaclManifest() { } |
42 | 42 |
43 virtual bool GetProgramURL(nacl::string* full_url, | 43 virtual bool GetProgramURL(nacl::string* full_url, |
44 PnaclOptions* pnacl_options, | 44 PnaclOptions* pnacl_options, |
| 45 bool* uses_nonsfi_mode, |
45 ErrorInfo* error_info) const { | 46 ErrorInfo* error_info) const { |
46 // Does not contain program urls. | 47 // Does not contain program urls. |
47 UNREFERENCED_PARAMETER(full_url); | 48 UNREFERENCED_PARAMETER(full_url); |
48 UNREFERENCED_PARAMETER(pnacl_options); | 49 UNREFERENCED_PARAMETER(pnacl_options); |
| 50 UNREFERENCED_PARAMETER(uses_nonsfi_mode); |
49 UNREFERENCED_PARAMETER(error_info); | 51 UNREFERENCED_PARAMETER(error_info); |
50 PLUGIN_PRINTF(("PnaclManifest does not contain a program\n")); | 52 PLUGIN_PRINTF(("PnaclManifest does not contain a program\n")); |
51 error_info->SetReport(PP_NACL_ERROR_MANIFEST_GET_NEXE_URL, | 53 error_info->SetReport(PP_NACL_ERROR_MANIFEST_GET_NEXE_URL, |
52 "pnacl manifest does not contain a program."); | 54 "pnacl manifest does not contain a program."); |
53 return false; | 55 return false; |
54 } | 56 } |
55 | 57 |
56 virtual bool ResolveURL(const nacl::string& relative_url, | 58 virtual bool ResolveURL(const nacl::string& relative_url, |
57 nacl::string* full_url, | 59 nacl::string* full_url, |
58 ErrorInfo* error_info) const { | 60 ErrorInfo* error_info) const { |
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
682 temp_nexe_file_.get(), | 684 temp_nexe_file_.get(), |
683 invalid_desc_wrapper_.get(), | 685 invalid_desc_wrapper_.get(), |
684 &error_info_, | 686 &error_info_, |
685 resources_.get(), | 687 resources_.get(), |
686 &pnacl_options_, | 688 &pnacl_options_, |
687 this, | 689 this, |
688 plugin_); | 690 plugin_); |
689 } | 691 } |
690 | 692 |
691 } // namespace plugin | 693 } // namespace plugin |
OLD | NEW |