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 d1a9404ee75bb34ba3a99825aa106fc39a00def0..24880c4fe04e8f5e509d91f530b89cdc032a8806 100644 |
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.h |
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h |
@@ -37,6 +37,7 @@ |
#include "ppapi/c/private/ppp_instance_private.h" |
#include "ppapi/shared_impl/ppb_instance_shared.h" |
#include "ppapi/shared_impl/ppb_view_shared.h" |
+#include "ppapi/thunk/resource_creation_api.h" |
#include "third_party/skia/include/core/SkRefCnt.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCanvas.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
@@ -46,7 +47,6 @@ |
#include "webkit/plugins/ppapi/plugin_delegate.h" |
#include "webkit/plugins/ppapi/ppb_flash_impl.h" |
#include "webkit/plugins/ppapi/ppp_pdf.h" |
-#include "webkit/plugins/ppapi/resource_creation_impl.h" |
#include "webkit/plugins/webkit_plugins_export.h" |
struct PP_Point; |
@@ -120,7 +120,9 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
// nonzero. |
PP_Instance pp_instance() const { return pp_instance_; } |
- ResourceCreationImpl& resource_creation() { return resource_creation_; } |
+ ::ppapi::thunk::ResourceCreationAPI& resource_creation() { |
+ return *resource_creation_.get(); |
+ } |
// Does some pre-destructor cleanup on the instance. This is necessary |
// because some cleanup depends on the plugin instance still existing (like |
@@ -533,7 +535,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : |
int find_identifier_; |
// Helper object that creates resources. |
- ResourceCreationImpl resource_creation_; |
+ scoped_ptr< ::ppapi::thunk::ResourceCreationAPI> resource_creation_; |
// The plugin-provided interfaces. |
const PPP_Find_Dev* plugin_find_interface_; |