trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h - Issue 264143002: Revert 268250 "Pepper: Move manifest logic to components/nacl."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h

Issue 264143002: Revert 268250 "Pepper: Move manifest logic to components/nacl." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 7 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 | « trunk/src/ppapi/native_client/src/trusted/plugin/pnacl_translate_thread.cc ('k') | trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h

===================================================================

--- trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h (revision 268257)

+++ trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h (working copy)

@@ -40,6 +40,7 @@

namespace plugin {

class ErrorInfo;

+class Manifest;

class OpenManifestEntryAsyncCallback;

class Plugin;

class SrpcClient;

@@ -146,7 +147,7 @@

public:

PluginReverseInterface(nacl::WeakRefAnchor* anchor,

Plugin* plugin,

- int32_t manifest_id,

+ const Manifest* manifest,

ServiceRuntime* service_runtime,

pp::CompletionCallback init_done_cb,

pp::CompletionCallback crash_cb);

@@ -205,7 +206,7 @@

nacl::WeakRefAnchor* anchor_; // holds a ref

Plugin* plugin_; // value may be copied, but should be used only in

// main thread in WeakRef-protected callbacks.

- int32_t manifest_id_;

+ const Manifest* manifest_;

ServiceRuntime* service_runtime_;

NaClMutex mu_;

NaClCondVar cv_;

@@ -222,7 +223,7 @@

// TODO(sehr): This class should also implement factory methods, using the

// Start method below.

ServiceRuntime(Plugin* plugin,

- int32_t manifest_id,

+ const Manifest* manifest,

bool main_service_runtime,

bool uses_nonsfi_mode,

pp::CompletionCallback init_done_cb,