| 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 bf132d78ff23701d86d34ac19ff8f300eb23353f..62faf51e12df571aa5221ccb536826dba6efc4af 100644
|
| --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc
|
| +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
|
| @@ -259,11 +259,19 @@ void RendererPpapiHostImpl::CreateBrowserResourceHosts(
|
| }
|
|
|
| GURL RendererPpapiHostImpl::GetDocumentURL(PP_Instance instance) const {
|
| - PepperPluginInstanceImpl* instance_object = GetAndValidateInstance(instance);
|
| - if (!instance_object || !instance_object->container())
|
| + blink::WebPluginContainer* container = GetContainerForInstance(instance);
|
| + if (!container)
|
| + return GURL();
|
| +
|
| + blink::WebElement element = container->element();
|
| + if (element.isNull())
|
| + return GURL();
|
| +
|
| + blink::WebDocument document = element.document();
|
| + if (document.isNull())
|
| return GURL();
|
|
|
| - return instance_object->container()->element().document().url();
|
| + return document.url();
|
| }
|
|
|
| PepperPluginInstanceImpl* RendererPpapiHostImpl::GetAndValidateInstance(
|
|
|