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

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

Issue 7669055: Remove webkit::ppapi::Resource. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nulls auditeed Created 9 years, 4 months 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/ppb_buffer_impl.cc ('k') | webkit/plugins/ppapi/ppb_context_3d_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/ppapi/ppb_context_3d_impl.h
diff --git a/webkit/plugins/ppapi/ppb_context_3d_impl.h b/webkit/plugins/ppapi/ppb_context_3d_impl.h
index f1340e21e19f286126f464955b0f63116903789d..5b564821f21d330e5b2f8d8cf4dca95561c6a67e 100644
--- a/webkit/plugins/ppapi/ppb_context_3d_impl.h
+++ b/webkit/plugins/ppapi/ppb_context_3d_impl.h
@@ -7,9 +7,9 @@
#include "base/memory/scoped_callback_factory.h"
#include "base/memory/scoped_ptr.h"
+#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_context_3d_api.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
-#include "webkit/plugins/ppapi/resource.h"
struct PPB_Context3DTrusted_Dev;
@@ -26,7 +26,7 @@ namespace ppapi {
class PPB_Surface3D_Impl;
-class PPB_Context3D_Impl : public Resource,
+class PPB_Context3D_Impl : public ::ppapi::Resource,
public ::ppapi::thunk::PPB_Context3D_API {
public:
virtual ~PPB_Context3D_Impl();
@@ -86,7 +86,7 @@ class PPB_Context3D_Impl : public Resource,
}
private:
- explicit PPB_Context3D_Impl(PluginInstance* instance);
+ explicit PPB_Context3D_Impl(PP_Instance instance);
bool Init(PP_Config3D_Dev config,
PP_Resource share_context,
@@ -99,9 +99,6 @@ class PPB_Context3D_Impl : public Resource,
void Destroy();
void OnContextLost();
- // Plugin instance this context is associated with.
- PluginInstance* instance_;
-
// PluginDelegate's 3D Context. Responsible for providing the command buffer.
// Possibly NULL.
scoped_ptr<PluginDelegate::PlatformContext3D> platform_context_;
« no previous file with comments | « webkit/plugins/ppapi/ppb_buffer_impl.cc ('k') | webkit/plugins/ppapi/ppb_context_3d_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698