Index: content/renderer/pepper/renderer_ppapi_host_impl.cc |
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc |
index da42d8598716b2bd6e595652656fa0839dad1c51..8697bcd3057b29d25102adede8ce56e07133f5c8 100644 |
--- a/content/renderer/pepper/renderer_ppapi_host_impl.cc |
+++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc |
@@ -20,6 +20,7 @@ |
#include "webkit/plugins/ppapi/ppapi_plugin_instance.h" |
using webkit::ppapi::HostGlobals; |
+using webkit::ppapi::PluginDelegate; |
using webkit::ppapi::PluginInstance; |
using webkit::ppapi::PluginModule; |
@@ -138,16 +139,24 @@ ppapi::host::PpapiHost* RendererPpapiHostImpl::GetPpapiHost() { |
return ppapi_host_.get(); |
} |
-RenderView* RendererPpapiHostImpl::GetRenderViewForInstance( |
+PluginDelegate* RendererPpapiHostImpl::GetDelegateForInstance( |
PP_Instance instance) const { |
PluginInstance* instance_object = GetAndValidateInstance(instance); |
if (!instance_object) |
return NULL; |
+ return instance_object->delegate(); |
+} |
+ |
+RenderView* RendererPpapiHostImpl::GetRenderViewForInstance( |
+ PP_Instance instance) const { |
+ webkit::ppapi::PluginDelegate* delegate = GetDelegateForInstance(instance); |
+ if (!delegate) |
+ return NULL; |
+ |
// Since we're the embedder, we can make assumptions about the delegate on |
// the instance and get back to our RenderView. |
- return static_cast<PepperPluginDelegateImpl*>( |
- instance_object->delegate())->render_view(); |
+ return static_cast<PepperPluginDelegateImpl*>(delegate)->render_view(); |
} |
bool RendererPpapiHostImpl::IsValidInstance( |