Chromium Code Reviews| Index: content/renderer/pepper/pepper_plugin_instance_impl.h |
| diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h |
| index 9d067a94a0e51ca5e9623c02398ae02cc0f529f4..462e10577f7897b0b2498dfcc4f24debaf15f74e 100644 |
| --- a/content/renderer/pepper/pepper_plugin_instance_impl.h |
| +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h |
| @@ -17,6 +17,7 @@ |
| #include "base/memory/weak_ptr.h" |
| #include "base/strings/string16.h" |
| #include "cc/layers/content_layer_client.h" |
| +#include "cc/layers/layer.h" |
| #include "cc/layers/texture_layer_client.h" |
| #include "content/common/content_export.h" |
| #include "content/public/renderer/pepper_plugin_instance.h" |
| @@ -102,6 +103,7 @@ namespace content { |
| class ContentDecryptorDelegate; |
| class FullscreenContainer; |
| class MessageChannel; |
| +class PepperCompositorHost; |
| class PepperGraphics2DHost; |
| class PluginModule; |
| class PluginObject; |
| @@ -673,6 +675,7 @@ class CONTENT_EXPORT PepperPluginInstanceImpl |
| // NULL until we have been initialized. |
| blink::WebPluginContainer* container_; |
| + scoped_refptr<cc::Layer> compositor_layer_; |
| scoped_refptr<cc::TextureLayer> texture_layer_; |
| scoped_ptr<blink::WebLayer> web_layer_; |
| bool layer_bound_to_fullscreen_; |
| @@ -696,9 +699,10 @@ class CONTENT_EXPORT PepperPluginInstanceImpl |
| // same as the default values. |
| bool sent_initial_did_change_view_; |
| - // The current device context for painting in 2D and 3D. |
| + // The current device context for painting in 2D, 3D or compositor. |
| scoped_refptr<PPB_Graphics3D_Impl> bound_graphics_3d_; |
| PepperGraphics2DHost* bound_graphics_2d_platform_; |
| + PepperCompositorHost* bound_compositor_; |
|
piman
2014/06/04 13:19:43
should this be a scoped_refptr too?
Peng
2014/06/05 00:50:38
Done.
|
| // We track two types of focus, one from WebKit, which is the focus among |
| // all elements of the page, one one from the browser, which is whether the |