Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(104)

Unified Diff: webkit/plugins/ppapi/ppapi_plugin_instance.h

Issue 11053003: Migrate Graphics2D to new design. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0a8949ecf4afc5b51a19f8ee2be1ae86c2bf6458..97fff3945e44a2f239e8d4b5d01465cf26f5f085 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h
@@ -88,7 +88,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;
@@ -517,7 +516,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.
@@ -600,8 +599,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* bound_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
« no previous file with comments | « webkit/plugins/ppapi/plugin_module.cc ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698