Migrate Graphics2D to new design.

webkit/plugins/ppapi/ppapi_plugin_instance.h

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 d14e7b28cce7159d82ce01482d4f69c3147a2411..97aab7b57410f1efab7943682011f485aaa5b5d2 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -72,6 +72,10 @@ struct WebCursorInfo;
 struct WebPrintParams;
 }
 
+namespace content {
+class PepperGraphics2DHost;
+}
+
 namespace media {
 class DecoderBuffer;
 class DecryptorClient;
@@ -97,7 +101,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;
@@ -549,7 +552,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.
@@ -629,8 +632,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_;

[brettw, 2012/10/19 21:44:13]

Can you call this "bound_graphics_2d_platform_"?

[victorhsieh, 2012/10/22 02:18:53]

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