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

Side by Side Diff: ppapi/native_client/src/trusted/plugin/json_manifest.h

Issue 181153002: Have PNaCl use debug pexe URL instead of stripped pexe w/ kEnableNaClDebug (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nosandbox win 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 * Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 * Use of this source code is governed by a BSD-style license that can be 3 * Use of this source code is governed by a BSD-style license that can be
4 * found in the LICENSE file. 4 * found in the LICENSE file.
5 */ 5 */
6 6
7 // Manifest processing for JSON manifests. 7 // Manifest processing for JSON manifests.
8 8
9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_ 9 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_
10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_ 10 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_
(...skipping 12 matching lines...) Expand all
23 } // namespace pp 23 } // namespace pp
24 24
25 namespace plugin { 25 namespace plugin {
26 26
27 class ErrorInfo; 27 class ErrorInfo;
28 class PnaclOptions; 28 class PnaclOptions;
29 29
30 class JsonManifest : public Manifest { 30 class JsonManifest : public Manifest {
31 public: 31 public:
32 JsonManifest(const pp::URLUtil_Dev* url_util, 32 JsonManifest(const pp::URLUtil_Dev* url_util,
33 const nacl::string& manifest_base_url, 33 const nacl::string& manifest_base_url,
34 const nacl::string& sandbox_isa) 34 const nacl::string& sandbox_isa,
35 bool pnacl_debug)
35 : url_util_(url_util), 36 : url_util_(url_util),
36 manifest_base_url_(manifest_base_url), 37 manifest_base_url_(manifest_base_url),
37 sandbox_isa_(sandbox_isa), 38 sandbox_isa_(sandbox_isa),
38 dictionary_(Json::nullValue) { } 39 dictionary_(Json::nullValue),
40 pnacl_debug_(pnacl_debug) { }
39 virtual ~JsonManifest() { } 41 virtual ~JsonManifest() { }
40 42
41 // Initialize the manifest object for use by later lookups. The return 43 // Initialize the manifest object for use by later lookups. The return
42 // value is true if the manifest parses correctly and matches the schema. 44 // value is true if the manifest parses correctly and matches the schema.
43 bool Init(const nacl::string& json, ErrorInfo* error_info); 45 bool Init(const nacl::string& json, ErrorInfo* error_info);
44 46
45 // Gets the full program URL for the current sandbox ISA from the 47 // Gets the full program URL for the current sandbox ISA from the
46 // manifest file. 48 // manifest file.
47 virtual bool GetProgramURL(nacl::string* full_url, 49 virtual bool GetProgramURL(nacl::string* full_url,
48 PnaclOptions* pnacl_options, 50 PnaclOptions* pnacl_options,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 const nacl::string& parent_key, 88 const nacl::string& parent_key,
87 nacl::string* url, 89 nacl::string* url,
88 PnaclOptions* pnacl_options, 90 PnaclOptions* pnacl_options,
89 ErrorInfo* error_info) const; 91 ErrorInfo* error_info) const;
90 92
91 const pp::URLUtil_Dev* url_util_; 93 const pp::URLUtil_Dev* url_util_;
92 nacl::string manifest_base_url_; 94 nacl::string manifest_base_url_;
93 nacl::string sandbox_isa_; 95 nacl::string sandbox_isa_;
94 96
95 Json::Value dictionary_; 97 Json::Value dictionary_;
98 bool pnacl_debug_; // Search for a pnacl-debug entry.
96 }; 99 };
97 100
98 101
99 } // namespace plugin 102 } // namespace plugin
100 103
101 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_ 104 #endif // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_JSON_MANIFEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698