| Index: ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| index 07850d4216848429ee7d2284eba0336ccc8aa4dd..d86ff4d75c4835fd292e04aebc37e114ab5aaa97 100644
|
| --- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| +++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
|
| @@ -40,7 +40,6 @@ class FileIO;
|
| namespace plugin {
|
|
|
| class ErrorInfo;
|
| -class Manifest;
|
| class Plugin;
|
| class SrpcClient;
|
| class ServiceRuntime;
|
| @@ -140,7 +139,7 @@ class PluginReverseInterface: public nacl::ReverseInterface {
|
| public:
|
| PluginReverseInterface(nacl::WeakRefAnchor* anchor,
|
| Plugin* plugin,
|
| - const Manifest* manifest,
|
| + int32_t manifest_id,
|
| ServiceRuntime* service_runtime,
|
| pp::CompletionCallback init_done_cb,
|
| pp::CompletionCallback crash_cb);
|
| @@ -190,7 +189,7 @@ class PluginReverseInterface: public nacl::ReverseInterface {
|
| nacl::WeakRefAnchor* anchor_; // holds a ref
|
| Plugin* plugin_; // value may be copied, but should be used only in
|
| // main thread in WeakRef-protected callbacks.
|
| - const Manifest* manifest_;
|
| + int32_t manifest_id_;
|
| ServiceRuntime* service_runtime_;
|
| NaClMutex mu_;
|
| NaClCondVar cv_;
|
| @@ -207,7 +206,7 @@ class ServiceRuntime {
|
| // TODO(sehr): This class should also implement factory methods, using the
|
| // Start method below.
|
| ServiceRuntime(Plugin* plugin,
|
| - const Manifest* manifest,
|
| + int32_t manifest_id,
|
| bool main_service_runtime,
|
| bool uses_nonsfi_mode,
|
| pp::CompletionCallback init_done_cb,
|
|
|