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

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

Issue 1962923002: Fix rendering of flash content inside an out-of-process iframe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing unneded includes Created 4 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 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 <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 728
729 // This method should be called each time |texture_layer_| finishes consuming 729 // This method should be called each time |texture_layer_| finishes consuming
730 // a cc::TextureMailbox. It decrements an internal reference count. Returns 730 // a cc::TextureMailbox. It decrements an internal reference count. Returns
731 // whether the last reference was removed. 731 // whether the last reference was removed.
732 bool DecrementTextureReferenceCount(const cc::TextureMailbox& mailbox); 732 bool DecrementTextureReferenceCount(const cc::TextureMailbox& mailbox);
733 733
734 // Whether a given cc::TextureMailbox is in use by |texture_layer_|. 734 // Whether a given cc::TextureMailbox is in use by |texture_layer_|.
735 bool IsTextureInUse(const cc::TextureMailbox& mailbox) const; 735 bool IsTextureInUse(const cc::TextureMailbox& mailbox) const;
736 736
737 RenderFrameImpl* render_frame_; 737 RenderFrameImpl* render_frame_;
738 base::Closure instance_deleted_callback_;
739 scoped_refptr<PluginModule> module_; 738 scoped_refptr<PluginModule> module_;
740 std::unique_ptr<ppapi::PPP_Instance_Combined> instance_interface_; 739 std::unique_ptr<ppapi::PPP_Instance_Combined> instance_interface_;
741 // If this is the NaCl plugin, we create a new module when we switch to the 740 // If this is the NaCl plugin, we create a new module when we switch to the
742 // IPC-based PPAPI proxy. Store the original module and instance interface 741 // IPC-based PPAPI proxy. Store the original module and instance interface
743 // so we can shut down properly. 742 // so we can shut down properly.
744 scoped_refptr<PluginModule> original_module_; 743 scoped_refptr<PluginModule> original_module_;
745 std::unique_ptr<ppapi::PPP_Instance_Combined> original_instance_interface_; 744 std::unique_ptr<ppapi::PPP_Instance_Combined> original_instance_interface_;
746 745
747 PP_Instance pp_instance_; 746 PP_Instance pp_instance_;
748 747
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
990 // view change events. 989 // view change events.
991 base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_; 990 base::WeakPtrFactory<PepperPluginInstanceImpl> view_change_weak_ptr_factory_;
992 base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_; 991 base::WeakPtrFactory<PepperPluginInstanceImpl> weak_factory_;
993 992
994 DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl); 993 DISALLOW_COPY_AND_ASSIGN(PepperPluginInstanceImpl);
995 }; 994 };
996 995
997 } // namespace content 996 } // namespace content
998 997
999 #endif // CONTENT_RENDERER_PEPPER_PEPPER_PLUGIN_INSTANCE_IMPL_H_ 998 #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