| Index: chrome/plugin/npobject_util.cc
|
| ===================================================================
|
| --- chrome/plugin/npobject_util.cc (revision 20181)
|
| +++ chrome/plugin/npobject_util.cc (working copy)
|
| @@ -138,7 +138,8 @@
|
| PluginChannelBase* channel,
|
| NPVariant_Param* param,
|
| bool release,
|
| - base::WaitableEvent* modal_dialog_event) {
|
| + base::WaitableEvent* modal_dialog_event,
|
| + const GURL& page_url) {
|
| switch (variant.type) {
|
| case NPVariantType_Void:
|
| param->type = NPVARIANT_PARAM_VOID;
|
| @@ -183,7 +184,8 @@
|
| param->type = NPVARIANT_PARAM_OBJECT_ROUTING_ID;
|
| int route_id = channel->GenerateRouteID();
|
| new NPObjectStub(
|
| - variant.value.objectValue, channel, route_id, modal_dialog_event);
|
| + variant.value.objectValue, channel, route_id, modal_dialog_event,
|
| + page_url);
|
| param->npobject_routing_id = route_id;
|
| param->npobject_pointer =
|
| reinterpret_cast<intptr_t>(variant.value.objectValue);
|
| @@ -204,7 +206,8 @@
|
| void CreateNPVariant(const NPVariant_Param& param,
|
| PluginChannelBase* channel,
|
| NPVariant* result,
|
| - base::WaitableEvent* modal_dialog_event) {
|
| + base::WaitableEvent* modal_dialog_event,
|
| + const GURL& page_url) {
|
| switch (param.type) {
|
| case NPVARIANT_PARAM_VOID:
|
| result->type = NPVariantType_Void;
|
| @@ -237,7 +240,8 @@
|
| NPObjectProxy::Create(channel,
|
| param.npobject_routing_id,
|
| param.npobject_pointer,
|
| - modal_dialog_event);
|
| + modal_dialog_event,
|
| + page_url);
|
| break;
|
| case NPVARIANT_PARAM_OBJECT_POINTER:
|
| result->type = NPVariantType_Object;
|
|
|