diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 18:40:14 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 18:40:14 +0000 |
| commit | 6ce7abc518969dfa1699a71ae87fda611012abd9 (patch) | |
| tree | aa34ed9e6d1fbf23bc7868b394f7ff032116017c /chrome/renderer | |
| parent | 9732c032ed9b6664149f03472475d31844a1c8ba (diff) | |
| download | chromium_src-6ce7abc518969dfa1699a71ae87fda611012abd9.zip chromium_src-6ce7abc518969dfa1699a71ae87fda611012abd9.tar.gz chromium_src-6ce7abc518969dfa1699a71ae87fda611012abd9.tar.bz2 | |
Hide plugins in minimized/hidden windows on the Mac
Watch for window minizing and app hiding so we know when pages aren't visible for reasons other than being in background tabs. Manually hide plugins in non-visible windows, as a temporary workaround for bug 34266.
BUG=30838
TEST=Minimize a window or hide the application while a Flash or Quicktime movie is playing; CPU usage should be the same as if it were in a background tab.
Review URL: http://codereview.chromium.org/563010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/render_view.cc | 14 | ||||
| -rw-r--r-- | chrome/renderer/render_view.h | 4 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.cc | 3 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_proxy.h | 1 |
4 files changed, 21 insertions, 1 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index c474e72..0594162 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -574,6 +574,9 @@ void RenderView::OnMessageReceived(const IPC::Message& message) { OnNotifyRendererViewType) IPC_MESSAGE_HANDLER(ViewMsg_MediaPlayerActionAt, OnMediaPlayerActionAt) IPC_MESSAGE_HANDLER(ViewMsg_SetActive, OnSetActive) +#if defined(OS_MACOSX) + IPC_MESSAGE_HANDLER(ViewMsg_SetWindowVisibility, OnSetWindowVisibility) +#endif IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent, OnSetEditCommandsForNextKeyEvent) IPC_MESSAGE_HANDLER(ViewMsg_ExecuteCode, @@ -3765,6 +3768,17 @@ void RenderView::OnSetActive(bool active) { #endif } +#if defined(OS_MACOSX) +void RenderView::OnSetWindowVisibility(bool visible) { + // Inform plugins that their container has changed visibility. + std::set<WebPluginDelegateProxy*>::iterator plugin_it; + for (plugin_it = plugin_delegates_.begin(); + plugin_it != plugin_delegates_.end(); ++plugin_it) { + (*plugin_it)->SetContainerVisibility(visible); + } +} +#endif // OS_MACOSX + void RenderView::SendExtensionRequest(const std::string& name, const ListValue& args, int request_id, diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h index 0c5ad52..7545654 100644 --- a/chrome/renderer/render_view.h +++ b/chrome/renderer/render_view.h @@ -716,6 +716,10 @@ class RenderView : public RenderWidget, // accordingly, etc.). void OnSetActive(bool active); +#if defined(OS_MACOSX) + void OnSetWindowVisibility(bool visible); +#endif + // Execute custom context menu action. void OnCustomContextMenuAction(unsigned action); diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index da19300..b71798e 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -872,7 +872,8 @@ void WebPluginDelegateProxy::SetContainerVisibility(bool is_visible) { // TODO(stuartmorgan): Split this into two messages, and send location and // focus information with the "became visible" version since the plugins in a // hidden tab will not have been getting live updates. - IPC::Message* msg = new PluginMsg_SetWindowFocus(instance_id_, is_visible); + IPC::Message* msg = new PluginMsg_SetContainerVisibility(instance_id_, + is_visible); // Make sure visibility events are delivered in the right order relative to // sync messages they might interact with (Paint, HandleEvent, etc.). msg->set_unblock(true); diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h index c0ce498..6a71bdb 100644 --- a/chrome/renderer/webplugin_delegate_proxy.h +++ b/chrome/renderer/webplugin_delegate_proxy.h @@ -73,6 +73,7 @@ class WebPluginDelegateProxy #if defined(OS_MACOSX) virtual void SetWindowFocus(bool window_has_focus); + // Inform the plugin that its container (window/tab) has changed visibility. virtual void SetContainerVisibility(bool is_visible); #endif |