diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 14:41:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 14:41:41 +0000 |
| commit | 611687564dbe98218211b73a4a83e24992a9c43f (patch) | |
| tree | f88e64f553fbce623377fe86816692ba1189bd94 /content/plugin | |
| parent | 294dc62b2e603a64feeb8226452d31775606b4d2 (diff) | |
| download | chromium_src-611687564dbe98218211b73a4a83e24992a9c43f.zip chromium_src-611687564dbe98218211b73a4a83e24992a9c43f.tar.gz chromium_src-611687564dbe98218211b73a4a83e24992a9c43f.tar.bz2 | |
Make "dummy window" which is used for windowless plugins be parented in the browser. This is a step towards removing usage of parent hwnd in the renderer which is problematic on aura since that hwnd changes. In non-aura builds, this doesn't change so caching worked.
Review URL: https://codereview.chromium.org/11361024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/webplugin_proxy.cc | 9 | ||||
| -rw-r--r-- | content/plugin/webplugin_proxy.h | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index 0d5ed27..a403dc0 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -140,14 +140,15 @@ void WebPluginProxy::WillDestroyWindow(gfx::PluginWindowHandle window) { } #if defined(OS_WIN) -void WebPluginProxy::SetWindowlessPumpEvent(HANDLE pump_messages_event) { +void WebPluginProxy::SetWindowlessData( + HANDLE pump_messages_event, gfx::NativeViewId dummy_activation_window) { HANDLE pump_messages_event_for_renderer = NULL; BrokerDuplicateHandle(pump_messages_event, channel_->peer_pid(), &pump_messages_event_for_renderer, SYNCHRONIZE | EVENT_MODIFY_STATE, 0); - DCHECK(pump_messages_event_for_renderer != NULL); - Send(new PluginHostMsg_SetWindowlessPumpEvent( - route_id_, pump_messages_event_for_renderer)); + DCHECK(pump_messages_event_for_renderer); + Send(new PluginHostMsg_SetWindowlessData( + route_id_, pump_messages_event_for_renderer, dummy_activation_window)); } #endif diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h index 6141f3a..686c7c4 100644 --- a/content/plugin/webplugin_proxy.h +++ b/content/plugin/webplugin_proxy.h @@ -67,7 +67,8 @@ class WebPluginProxy : public webkit::npapi::WebPlugin { virtual void WillDestroyWindow(gfx::PluginWindowHandle window) OVERRIDE; #if defined(OS_WIN) - void SetWindowlessPumpEvent(HANDLE pump_messages_event); + void SetWindowlessData(HANDLE pump_messages_event, + gfx::NativeViewId dummy_activation_window); #endif virtual void CancelResource(unsigned long id) OVERRIDE; |