diff options
| author | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 07:21:26 +0000 |
|---|---|---|
| committer | tzik@chromium.org <tzik@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-16 07:21:26 +0000 |
| commit | 20068a0582ea4dd0bb1f7d0275315011e8f52439 (patch) | |
| tree | 1de9c3d394daa058fa48c15cab6a45b9f73f8ace /content/renderer/pepper/pepper_plugin_instance_impl.h | |
| parent | cadbc71e0b1d1c2e907e3fac183f9ace2304d899 (diff) | |
| download | chromium_src-20068a0582ea4dd0bb1f7d0275315011e8f52439.zip chromium_src-20068a0582ea4dd0bb1f7d0275315011e8f52439.tar.gz chromium_src-20068a0582ea4dd0bb1f7d0275315011e8f52439.tar.bz2 | |
Revert 277208 "[PPAPI] Compositor API implementation."
This CL seems to cause perf bot failure.
The log said nacl_helper-data size gained exceeds expectation.
http://build.chromium.org/p/chromium/builders/Linux/builds/50560
https://chromeperf.appspot.com/report?masters=Chromium&bots=chromium-rel-linux&tests=sizes%2Fnacl_helper-data&rev=277212&checked=core
> [PPAPI] Compositor API implementation.
>
> Implement the compositor API which allows a plugin to combine different sources of visual data efficiently, such as PPB_ImageData and OpengGL texture.
>
> API Proposal http://goo.gl/V7xcu3
>
> BUG=374383
>
> Review URL: https://codereview.chromium.org/298023004
TBR=penghuang@chromium.org
Review URL: https://codereview.chromium.org/331123003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277372 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/pepper_plugin_instance_impl.h')
| -rw-r--r-- | content/renderer/pepper/pepper_plugin_instance_impl.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 5fb61d8..1acce13 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 |