Index: webkit/plugins/ppapi/ppapi_plugin_instance.h |
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h |
index 10c55f56ead19f3737c46b947e4a6fca37418ce5..aede48c26a3b7cf95258c9c3a6f27e5cb917e94b 100644 |
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h |
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h |
@@ -71,6 +71,10 @@ struct WebCursorInfo; |
struct WebPrintParams; |
} |
+namespace content { |
+class PepperGraphics2DHost; |
+} |
+ |
namespace media { |
class DecoderBuffer; |
class DecryptorClient; |
@@ -95,7 +99,6 @@ class MessageChannel; |
class PluginDelegate; |
class PluginModule; |
class PluginObject; |
-class PPB_Graphics2D_Impl; |
class PPB_Graphics3D_Impl; |
class PPB_ImageData_Impl; |
class PPB_URLLoader_Impl; |
@@ -523,7 +526,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
// Get the bound graphics context as a concrete 2D graphics context or returns |
// null if the context is not 2D. |
- PPB_Graphics2D_Impl* GetBoundGraphics2D() const; |
+ PluginDelegate::PlatformGraphics2D* GetBoundGraphics2D() const; |
// Get the bound 3D graphics context. |
// Returns NULL if bound graphics is not a 3D context. |
@@ -603,8 +606,9 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
// view change events. |
base::WeakPtrFactory<PluginInstance> view_change_weak_ptr_factory_; |
- // The current device context for painting in 2D or 3D. |
- scoped_refptr< ::ppapi::Resource> bound_graphics_; |
+ // The current device context for painting in 2D and 3D. |
+ scoped_refptr< ::ppapi::Resource> bound_graphics_3d_; |
+ PluginDelegate::PlatformGraphics2D* graphics_2d_platform_; |
// 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 |