| Index: content/renderer/pepper_plugin_delegate_impl.cc
|
| ===================================================================
|
| --- content/renderer/pepper_plugin_delegate_impl.cc (revision 98865)
|
| +++ content/renderer/pepper_plugin_delegate_impl.cc (working copy)
|
| @@ -1299,6 +1299,13 @@
|
| webkit::ppapi::PPB_Flash_Menu_Impl* menu,
|
| const gfx::Point& position) {
|
| int32 render_widget_id = render_view_->routing_id();
|
| + if (instance->IsFullscreen(instance->pp_instance())) {
|
| + webkit::ppapi::FullscreenContainer* container =
|
| + instance->fullscreen_container();
|
| + DCHECK(container);
|
| + render_widget_id =
|
| + static_cast<RenderWidgetFullscreenPepper*>(container)->routing_id();
|
| + }
|
|
|
| int request_id = pending_context_menus_.Add(
|
| new scoped_refptr<webkit::ppapi::PPB_Flash_Menu_Impl>(menu));
|
| @@ -1362,6 +1369,12 @@
|
| saved_context_menu_action_ = action;
|
| }
|
|
|
| +webkit::ppapi::FullscreenContainer*
|
| +PepperPluginDelegateImpl::CreateFullscreenContainer(
|
| + webkit::ppapi::PluginInstance* instance) {
|
| + return render_view_->CreatePepperFullscreenContainer(instance);
|
| +}
|
| +
|
| gfx::Size PepperPluginDelegateImpl::GetScreenSize() {
|
| WebKit::WebScreenInfo info = render_view_->screenInfo();
|
| return gfx::Size(info.rect.width, info.rect.height);
|
|
|
| Property changes on: content/renderer/pepper_plugin_delegate_impl.cc
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|