summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_widget_fullscreen_pepper.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 18:04:32 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-25 18:04:32 +0000
commitadab2337689e8be9e1298ac01278876b3468a823 (patch)
tree1f0cf6b75255a9dec6e1fff2c3d9429a33f6e0f5 /content/renderer/render_widget_fullscreen_pepper.h
parente20a6c216c041e057ebccc5974ca9042796ff8a2 (diff)
downloadchromium_src-adab2337689e8be9e1298ac01278876b3468a823.zip
chromium_src-adab2337689e8be9e1298ac01278876b3468a823.tar.gz
chromium_src-adab2337689e8be9e1298ac01278876b3468a823.tar.bz2
Put the pepper files which were moved in r213578 to the content namespace.
I added a "Pepper" prefix to WebPlugin and PluginInstance to avoid collision with the NPAPI versions. BUG=263054 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/20358002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213657 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget_fullscreen_pepper.h')
-rw-r--r--content/renderer/render_widget_fullscreen_pepper.h24
1 files changed, 8 insertions, 16 deletions
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index 840a979..29980e8 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -11,30 +11,22 @@
#include "content/renderer/render_widget_fullscreen.h"
#include "third_party/WebKit/public/web/WebWidget.h"
-namespace webkit {
-namespace ppapi {
-
-class PluginInstanceImpl;
-
-} // namespace ppapi
-} // namespace webkit
-
namespace WebKit {
class WebLayer;
}
namespace content {
+class PepperPluginInstanceImpl;
// A RenderWidget that hosts a fullscreen pepper plugin. This provides a
// FullscreenContainer that the plugin instance can callback into to e.g.
// invalidate rects.
-class RenderWidgetFullscreenPepper :
- public RenderWidgetFullscreen,
- public webkit::ppapi::FullscreenContainer {
+class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
+ public FullscreenContainer {
public:
static RenderWidgetFullscreenPepper* Create(
int32 opener_id,
- webkit::ppapi::PluginInstanceImpl* plugin,
+ PepperPluginInstanceImpl* plugin,
const GURL& active_url,
const WebKit::WebScreenInfo& screen_info);
@@ -51,7 +43,7 @@ class RenderWidgetFullscreenPepper :
virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
// Could be NULL when this widget is closing.
- webkit::ppapi::PluginInstanceImpl* plugin() const { return plugin_; }
+ PepperPluginInstanceImpl* plugin() const { return plugin_; }
MouseLockDispatcher* mouse_lock_dispatcher() const {
return mouse_lock_dispatcher_.get();
@@ -60,7 +52,7 @@ class RenderWidgetFullscreenPepper :
bool is_compositing() const { return !!layer_; }
protected:
- RenderWidgetFullscreenPepper(webkit::ppapi::PluginInstanceImpl* plugin,
+ RenderWidgetFullscreenPepper(PepperPluginInstanceImpl* plugin,
const GURL& active_url,
const WebKit::WebScreenInfo& screen_info);
virtual ~RenderWidgetFullscreenPepper();
@@ -70,7 +62,7 @@ class RenderWidgetFullscreenPepper :
virtual void DidInitiatePaint() OVERRIDE;
virtual void DidFlushPaint() OVERRIDE;
virtual void Close() OVERRIDE;
- virtual webkit::ppapi::PluginInstanceImpl* GetBitmapForOptimizedPluginPaint(
+ virtual PepperPluginInstanceImpl* GetBitmapForOptimizedPluginPaint(
const gfx::Rect& paint_bounds,
TransportDIB** dib,
gfx::Rect* location,
@@ -90,7 +82,7 @@ class RenderWidgetFullscreenPepper :
GURL active_url_;
// The plugin instance this widget wraps.
- webkit::ppapi::PluginInstanceImpl* plugin_;
+ PepperPluginInstanceImpl* plugin_;
WebKit::WebLayer* layer_;