| 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 5fb61d8716c9931659a29b4a5a220ada56fe84e0..1acce138ffba3dff8af6ec0c77b48b7237c302e9 100644
|
| --- a/content/renderer/pepper/pepper_plugin_instance_impl.h
|
| +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
|
| @@ -17,7 +17,6 @@
|
| #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"
|
| @@ -103,7 +102,6 @@ namespace content {
|
| class ContentDecryptorDelegate;
|
| class FullscreenContainer;
|
| class MessageChannel;
|
| -class PepperCompositorHost;
|
| class PepperGraphics2DHost;
|
| class PluginModule;
|
| class PluginObject;
|
| @@ -689,7 +687,6 @@ 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_;
|
| @@ -713,10 +710,9 @@ class CONTENT_EXPORT PepperPluginInstanceImpl
|
| // same as the default values.
|
| bool sent_initial_did_change_view_;
|
|
|
| - // The current device context for painting in 2D, 3D or compositor.
|
| + // The current device context for painting in 2D and 3D.
|
| scoped_refptr<PPB_Graphics3D_Impl> bound_graphics_3d_;
|
| PepperGraphics2DHost* bound_graphics_2d_platform_;
|
| - PepperCompositorHost* bound_compositor_;
|
|
|
| // 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
|
|
|