diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 19:12:36 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-11 19:12:36 +0000 |
| commit | 3e076a8cc7a0f858b6ba3f563fca6716f889e1fe (patch) | |
| tree | 02093584c074ae513f486683f585b82969901a3b /content/browser/plugin_process_host.cc | |
| parent | e9c180b08c7464bfa37268175f9dac862c7eaac7 (diff) | |
| download | chromium_src-3e076a8cc7a0f858b6ba3f563fca6716f889e1fe.zip chromium_src-3e076a8cc7a0f858b6ba3f563fca6716f889e1fe.tar.gz chromium_src-3e076a8cc7a0f858b6ba3f563fca6716f889e1fe.tar.bz2 | |
Initial NPAPI plugin support in Win Aura.
Scrolling jank is noticable because the plugin moves at a different time than the content is updated. There are also a couple of other functions in RenderWidgetHostViewWin that enumerate plugin Windows that need to be shared, but I'm leaving these for a future change.
The code in render_widget_host_view_base.cc is all moved from render_widget_host_view_win.cc with the exception of the lines between the USE_AURA ifdef.
Review URL: https://codereview.chromium.org/10905122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_process_host.cc')
| -rw-r--r-- | content/browser/plugin_process_host.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc index 23cac73..ec96877 100644 --- a/content/browser/plugin_process_host.cc +++ b/content/browser/plugin_process_host.cc @@ -4,7 +4,7 @@ #include "content/browser/plugin_process_host.h" -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) #include <windows.h> #elif defined(OS_POSIX) #include <utility> // for pair<> @@ -53,7 +53,7 @@ using content::ChildProcessHost; #include "ui/gfx/rect.h" #endif -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) #include "base/win/windows_version.h" #include "webkit/plugins/npapi/plugin_constants_win.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" @@ -133,7 +133,7 @@ PluginProcessHost::PluginProcessHost() } PluginProcessHost::~PluginProcessHost() { -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) // We erase HWNDs from the plugin_parent_windows_set_ when we receive a // notification that the window is being destroyed. If we don't receive this // notification and the PluginProcessHost instance is being destroyed, it @@ -311,7 +311,7 @@ bool PluginProcessHost::OnMessageReceived(const IPC::Message& msg) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(PluginProcessHost, msg) IPC_MESSAGE_HANDLER(PluginProcessHostMsg_ChannelCreated, OnChannelCreated) -#if defined(OS_WIN) && !defined(USE_AURA) +#if defined(OS_WIN) IPC_MESSAGE_HANDLER(PluginProcessHostMsg_PluginWindowDestroyed, OnPluginWindowDestroyed) IPC_MESSAGE_HANDLER(PluginProcessHostMsg_ReparentPluginWindow, |