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

Side by Side Diff: content/renderer/pepper/pepper_plugin_instance_impl.h

Issue 167393002: PPAPI: Always inform RenderViewImpl of instance deletion (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: wrap this in base::Unretained Created 6 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/callback.h"
13 #include "base/compiler_specific.h" 14 #include "base/compiler_specific.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/weak_ptr.h" 17 #include "base/memory/weak_ptr.h"
17 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
18 #include "cc/layers/content_layer_client.h" 19 #include "cc/layers/content_layer_client.h"
19 #include "cc/layers/texture_layer_client.h" 20 #include "cc/layers/texture_layer_client.h"
20 #include "content/common/content_export.h" 21 #include "content/common/content_export.h"
21 #include "content/public/renderer/pepper_plugin_instance.h" 22 #include "content/public/renderer/pepper_plugin_instance.h"
22 #include "content/public/renderer/render_frame_observer.h" 23 #include "content/public/renderer/render_frame_observer.h"
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 MouseLockDispatcher* GetMouseLockDispatcher(); 658 MouseLockDispatcher* GetMouseLockDispatcher();
658 MouseLockDispatcher::LockTarget* GetOrCreateLockTargetAdapter(); 659 MouseLockDispatcher::LockTarget* GetOrCreateLockTargetAdapter();
659 void UnSetAndDeleteLockTargetAdapter(); 660 void UnSetAndDeleteLockTargetAdapter();
660 661
661 void DidDataFromWebURLResponse( 662 void DidDataFromWebURLResponse(
662 const blink::WebURLResponse& response, 663 const blink::WebURLResponse& response,
663 int pending_host_id, 664 int pending_host_id,
664 const ppapi::URLResponseInfoData& data); 665 const ppapi::URLResponseInfoData& data);
665 666
666 RenderFrameImpl* render_frame_; 667 RenderFrameImpl* render_frame_;
668 base::Closure instance_deleted_callback_;
667 scoped_refptr<PluginModule> module_; 669 scoped_refptr<PluginModule> module_;
668 scoped_ptr<ppapi::PPP_Instance_Combined> instance_interface_; 670 scoped_ptr<ppapi::PPP_Instance_Combined> instance_interface_;
669 // If this is the NaCl plugin, we create a new module when we switch to the 671 // If this is the NaCl plugin, we create a new module when we switch to the
670 // IPC-based PPAPI proxy. Store the original module and instance interface 672 // IPC-based PPAPI proxy. Store the original module and instance interface
671 // so we can shut down properly. 673 // so we can shut down properly.
672 scoped_refptr<PluginModule> original_module_; 674 scoped_refptr<PluginModule> original_module_;
673 scoped_ptr<ppapi::PPP_Instance_Combined> original_instance_interface_; 675 scoped_ptr<ppapi::PPP_Instance_Combined> original_instance_interface_;
674 676
675 PP_Instance pp_instance_; 677 PP_Instance pp_instance_;
676 678
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_; 883 base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_;
882 base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_; 884 base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_;
883 885
884 friend class PpapiPluginInstanceTest; 886 friend class PpapiPluginInstanceTest;
885 DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl); 887 DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl);
886 }; 888 };
887 889
888 } // namespace content 890 } // namespace content
889 891
890 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 892 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_plugin_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698