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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/pnacl_coordinator.cc

Issue 177113009: Support non-SFI mode in NaCl manifest file. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 9 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 unified diff | Download patch
OLDNEW
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
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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 temp_nexe_file_.get(), 690 temp_nexe_file_.get(),
689 invalid_desc_wrapper_.get(), 691 invalid_desc_wrapper_.get(),
690 &error_info_, 692 &error_info_,
691 resources_.get(), 693 resources_.get(),
692 &pnacl_options_, 694 &pnacl_options_,
693 this, 695 this,
694 plugin_); 696 plugin_);
695 } 697 }
696 698
697 } // namespace plugin 699 } // namespace plugin
OLDNEW
« no previous file with comments | « ppapi/native_client/src/trusted/plugin/plugin.cc ('k') | ppapi/native_client/src/trusted/plugin/sel_ldr_launcher_chrome.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698