summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
authorjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-13 02:19:25 +0000
committerjschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-13 02:19:25 +0000
commit0bc6304b299656d42fe9c286bc897b892ebe4b6e (patch)
tree8d410421658d19746cd78a61dcc16deefc647782 /content/browser
parentbf3716aa16fd9fc39be2fcd661c9e8b14df4d054 (diff)
downloadchromium_src-0bc6304b299656d42fe9c286bc897b892ebe4b6e.zip
chromium_src-0bc6304b299656d42fe9c286bc897b892ebe4b6e.tar.gz
chromium_src-0bc6304b299656d42fe9c286bc897b892ebe4b6e.tar.bz2
Revert 96592 - Add scroll and gesture message filters for UIPI Flash.
Flash forwards some window messages when it has no handler set. The only ones I've observed are WM_MOUSEWHEEL and WM_GESTURE (gestures are supported only on Win7). So, we need to allow these messages through the UIPI boundary. One important note is that I use per-process message filters on Vista, but per-window filters on Win7 or later (because they're supported). BUG=86810 TEST=None. Review URL: http://codereview.chromium.org/7617019 TBR=jschuh@chromium.org Review URL: http://codereview.chromium.org/7648011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/plugin_process_host.cc10
1 files changed, 1 insertions, 9 deletions
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc
index 18d4493..863133f 100644
--- a/content/browser/plugin_process_host.cc
+++ b/content/browser/plugin_process_host.cc
@@ -44,8 +44,6 @@
#endif
#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"
namespace {
@@ -59,9 +57,6 @@ void ReparentPluginWindowHelper(HWND window, HWND parent) {
::SetWindowLongPtr(window, GWL_STYLE, window_style);
::SetParent(window, parent);
- // Allow the Flash plugin to forward some messages back to Chrome.
- if (base::win::GetVersion() >= base::win::VERSION_WIN7)
- ::SetPropW(parent, webkit::npapi::kNativeWindowClassFilterProp, HANDLE(-1));
}
} // namespace
@@ -83,11 +78,8 @@ void PluginProcessHost::AddWindow(HWND window) {
}
void PluginProcessHost::OnReparentPluginWindow(HWND window, HWND parent) {
- // Reparent only from the plugin process to our process.
+ // Reparent only to our process.
DWORD process_id = 0;
- ::GetWindowThreadProcessId(window, &process_id);
- if (process_id != ::GetProcessId(GetChildProcessHandle()))
- return;
::GetWindowThreadProcessId(parent, &process_id);
if (process_id != ::GetCurrentProcessId())
return;