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

Unified Diff: components/nacl/browser/nacl_process_host.h

Issue 332463003: Pepper: Remove LOAD_MODULE SRPC call in SFI mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment to forward declaration Created 6 years, 5 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
« no previous file with comments | « components/nacl/browser/nacl_host_message_filter.cc ('k') | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/browser/nacl_process_host.h
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index a5e3e52c2997e0e26c8194ccdb1b75875f1496c4..c4de1253026460dd84fe0b6e5da1dc5c325055e2 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -22,6 +22,13 @@
#include "ppapi/shared_impl/ppapi_permissions.h"
#include "url/gurl.h"
+// NaClFileToken here is forward declared here instead of including
+// nacl_file_info.h because that file isn't safe to include for disable_nacl=1
+// builds.
+// TODO(teravest): Stop building this header in disable_nacl=1 builds and
+// include nacl_file_info.h instead of forward declaring NaClFileToken.
+struct NaClFileToken;
+
namespace content {
class BrowserChildProcessHost;
class BrowserPpapiHost;
@@ -46,6 +53,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
public:
// manifest_url: the URL of the manifest of the Native Client plugin being
// executed.
+ // nexe_file: A file that corresponds to the nexe module to be loaded.
+ // nexe_token: A cache validation token for nexe_file.
// permissions: PPAPI permissions, to control access to private APIs.
// render_view_id: RenderView routing id, to control access to private APIs.
// permission_bits: controls which interfaces the NaCl plugin can use.
@@ -63,6 +72,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
// profile_directory: is the path of current profile directory.
NaClProcessHost(const GURL& manifest_url,
base::File nexe_file,
+ const NaClFileToken& nexe_token,
ppapi::PpapiPermissions permissions,
int render_view_id,
uint32 permission_bits,
@@ -190,6 +200,11 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
GURL manifest_url_;
base::File nexe_file_;
+ // TODO(teravest): Use NaClFileInfo here, but without breaking the
+ // disable_nacl=1 build. (Why is this file even built with disable_nacl=1?)
+ uint64_t nexe_token_lo_;
+ uint64_t nexe_token_hi_;
+
ppapi::PpapiPermissions permissions_;
#if defined(OS_WIN)
« no previous file with comments | « components/nacl/browser/nacl_host_message_filter.cc ('k') | components/nacl/browser/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698