| Index: components/nacl/renderer/pnacl_translation_resource_host.h
|
| diff --git a/components/nacl/renderer/pnacl_translation_resource_host.h b/components/nacl/renderer/pnacl_translation_resource_host.h
|
| index 3bd521bc35a2b2e974149e0143cb2fb5d2859273..7078eaff9504dacee242e7fb09315e72b65a13a0 100644
|
| --- a/components/nacl/renderer/pnacl_translation_resource_host.h
|
| +++ b/components/nacl/renderer/pnacl_translation_resource_host.h
|
| @@ -11,16 +11,11 @@
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| -#include "ipc/ipc_platform_file.h"
|
| -#include "ipc/message_filter.h"
|
| +#include "components/nacl/common/nacl.mojom.h"
|
| #include "ppapi/c/pp_bool.h"
|
| #include "ppapi/c/pp_instance.h"
|
| #include "ppapi/c/private/pp_file_handle.h"
|
|
|
| -namespace base {
|
| -class SingleThreadTaskRunner;
|
| -}
|
| -
|
| namespace nacl {
|
| struct PnaclCacheInfo;
|
| }
|
| @@ -31,49 +26,23 @@ struct PnaclCacheInfo;
|
|
|
| // "Resource" might not be the best name for the various things that pnacl
|
| // needs from the browser since "Resource" is a Pepper thing...
|
| -class PnaclTranslationResourceHost : public IPC::MessageFilter {
|
| +class PnaclTranslationResourceHost {
|
| public:
|
| typedef base::Callback<void(int32_t, bool, PP_FileHandle)>
|
| RequestNexeFdCallback;
|
|
|
| - explicit PnaclTranslationResourceHost(
|
| - scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
|
| + explicit PnaclTranslationResourceHost(nacl::mojom::NaClHost* host);
|
| + ~PnaclTranslationResourceHost();
|
| +
|
| void RequestNexeFd(int render_view_id,
|
| PP_Instance instance,
|
| const nacl::PnaclCacheInfo& cache_info,
|
| RequestNexeFdCallback callback);
|
| void ReportTranslationFinished(PP_Instance instance, PP_Bool success);
|
|
|
| - protected:
|
| - ~PnaclTranslationResourceHost() override;
|
| -
|
| private:
|
| - // Maps the instance with an outstanding cache request to the info
|
| - // about that request.
|
| - typedef std::map<PP_Instance, RequestNexeFdCallback> CacheRequestInfoMap;
|
| -
|
| - // IPC::MessageFilter implementation.
|
| - bool OnMessageReceived(const IPC::Message& message) override;
|
| - void OnFilterAdded(IPC::Channel* channel) override;
|
| - void OnFilterRemoved() override;
|
| - void OnChannelClosing() override;
|
| -
|
| - void SendRequestNexeFd(int render_view_id,
|
| - PP_Instance instance,
|
| - const nacl::PnaclCacheInfo& cache_info,
|
| - RequestNexeFdCallback callback);
|
| - void SendReportTranslationFinished(PP_Instance instance,
|
| - PP_Bool success);
|
| - void OnNexeTempFileReply(PP_Instance instance,
|
| - bool is_hit,
|
| - IPC::PlatformFileForTransit file);
|
| - void CleanupCacheRequests();
|
| -
|
| - scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
|
| + nacl::mojom::NaClHost* const host_;
|
|
|
| - // Should be accessed on the io thread.
|
| - IPC::Sender* sender_;
|
| - CacheRequestInfoMap pending_cache_requests_;
|
| DISALLOW_COPY_AND_ASSIGN(PnaclTranslationResourceHost);
|
| };
|
|
|
|
|