Merge 96876 - Add scroll and gesture message filters for UIPI Flash.

content/browser/plugin_process_host.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_POSIX)
 #include <utility>  // for pair<>
@@ skipping 28 matching lines @@
 #include "ui/gfx/gtk_native_view_id_manager.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "content/common/plugin_carbon_interpose_constants_mac.h"
 #include "ui/gfx/rect.h"
 #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 {
 
 void ReparentPluginWindowHelper(HWND window, HWND parent) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   int window_style = WS_CHILD;
   if (!webkit::npapi::WebPluginDelegateImpl::IsDummyActivationWindow(window))
     window_style |= WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
 
   ::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
 
 void PluginProcessHost::OnPluginWindowDestroyed(HWND window, HWND parent) {
   // The window is destroyed at this point, we just care about its parent, which
   // is the intermediate window we created.
   std::set<HWND>::iterator window_index =
       plugin_parent_windows_set_.find(parent);
   if (window_index == plugin_parent_windows_set_.end())
     return;
 
   plugin_parent_windows_set_.erase(window_index);
   PostMessage(parent, WM_CLOSE, 0, 0);
 }
 
 void PluginProcessHost::AddWindow(HWND window) {
   plugin_parent_windows_set_.insert(window);
 }
 
 void PluginProcessHost::OnReparentPluginWindow(HWND window, HWND parent) {
-  // Reparent only to our process.
+  // Reparent only from the plugin process 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;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableFunction(ReparentPluginWindowHelper, window, parent));
 }
 #endif  // defined(OS_WIN)
 
@@ skipping 261 matching lines @@
   }
 }
 
 void PluginProcessHost::OnChannelCreated(
     const IPC::ChannelHandle& channel_handle) {
   Client* client = sent_requests_.front();
 
   client->OnChannelOpened(channel_handle);
   sent_requests_.pop();
 }