Keep NaCl plugins used in app background pages alive when active.

content/browser/renderer_host/pepper/browser_ppapi_host_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
 #include "content/browser/renderer_host/pepper/ssl_context_helper.h"
 #include "content/common/content_export.h"
 #include "content/common/pepper_renderer_instance_data.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/common/process_type.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ppapi/host/ppapi_host.h"
 
 namespace content {
@@ skipping 20 matching lines @@
   virtual base::ProcessHandle GetPluginProcessHandle() const OVERRIDE;
   virtual bool IsValidInstance(PP_Instance instance) const OVERRIDE;
   virtual bool GetRenderViewIDsForInstance(PP_Instance instance,
                                            int* render_process_id,
                                            int* render_view_id) const OVERRIDE;
   virtual const std::string& GetPluginName() OVERRIDE;
   virtual const base::FilePath& GetPluginPath() OVERRIDE;
   virtual const base::FilePath& GetProfileDataDirectory() OVERRIDE;
   virtual GURL GetDocumentURLForInstance(PP_Instance instance) OVERRIDE;
   virtual GURL GetPluginURLForInstance(PP_Instance instance) OVERRIDE;
+  virtual void SetOnIdleChangeCallback(
+      const BrowserPpapiHost::OnIdleChangeCallback callback) OVERRIDE;

[dmichael (off chromium), 2013/11/15 18:26:22]

could be const&

[scheib, 2013/12/11 21:35:40]

Done.

+
 
   void set_plugin_process_handle(base::ProcessHandle handle) {
     plugin_process_handle_ = handle;
   }
 
   bool in_process() const { return in_process_; }
   bool external_plugin() const { return external_plugin_; }
 
   // These two functions are notifications that an instance has been created
   // or destroyed. They allow us to maintain a mapping of PP_Instance to data
@@ skipping 11 matching lines @@
   }
 
  private:
   friend class BrowserPpapiHostTest;
 
   // Implementing MessageFilter on BrowserPpapiHostImpl makes it ref-counted,
   // preventing us from returning these to embedders without holding a
   // reference. To avoid that, define a message filter object.
   class HostMessageFilter : public IPC::ChannelProxy::MessageFilter {
    public:
-    explicit HostMessageFilter(ppapi::host::PpapiHost* ppapi_host)
-        : ppapi_host_(ppapi_host) {}
+    typedef base::Callback<void (bool idle)> OnIdleChangeCallback;
+
+    HostMessageFilter(ppapi::host::PpapiHost* ppapi_host,
+                      const OnIdleChangeCallback on_idle_change_callback);
+
     // IPC::ChannelProxy::MessageFilter.
     virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
     void OnHostDestroyed();
 
    private:
-    virtual ~HostMessageFilter() {}
+    virtual ~HostMessageFilter();
+
+    void OnIdleStateChange(bool idle);
 
     ppapi::host::PpapiHost* ppapi_host_;
+    OnIdleChangeCallback on_idle_change_callback_;
   };
 
+  void OnIdleChange(bool idle);
+
   scoped_ptr<ppapi::host::PpapiHost> ppapi_host_;
   base::ProcessHandle plugin_process_handle_;
   std::string plugin_name_;
   base::FilePath plugin_path_;
   base::FilePath profile_data_directory_;
 
   // If true, this refers to a plugin running in the renderer process.
   bool in_process_;
 
   // If true, this is an external plugin, i.e. created by the embedder using
   // BrowserPpapiHost::CreateExternalPluginProcess.
   bool external_plugin_;
 
   scoped_refptr<SSLContextHelper> ssl_context_helper_;
 
   // Tracks all PP_Instances in this plugin and associated renderer-related
   // data.
   typedef std::map<PP_Instance, PepperRendererInstanceData> InstanceMap;
   InstanceMap instance_map_;
 
   scoped_refptr<HostMessageFilter> message_filter_;
 
+  BrowserPpapiHost::OnIdleChangeCallback on_idle_change_callback_;
+
+  // Member variables should appear before the WeakPtrFactory, see weak_ptr.h.
+  base::WeakPtrFactory<BrowserPpapiHostImpl> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserPpapiHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_PEPPER_BROWSER_PPAPI_HOST_IMPL_H_