Page cycler tests failed on Vista because our windowless plugin code fails to...

webkit/glue/plugins/webplugin_delegate_impl_win.cc

 // Copyright (c) 2006-2008 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 "webkit/glue/plugins/webplugin_delegate_impl.h"
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/iat_patch.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/stats_counters.h"
@@ skipping 13 matching lines @@
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 
 namespace {
 
 const wchar_t kWebPluginDelegateProperty[] = L"WebPluginDelegateProperty";
 const wchar_t kPluginNameAtomProperty[] = L"PluginNameAtom";
 const wchar_t kDummyActivationWindowName[] = L"DummyWindowForActivation";
-const wchar_t kPluginOrigProc[] = L"OriginalPtr";
 const wchar_t kPluginFlashThrottle[] = L"FlashThrottle";
 
 // The fastest we are willing to process WM_USER+1 events for Flash.
 // Flash can easily exceed the limits of our CPU if we don't throttle it.
 // The throttle has been chosen by testing various delays and compromising
 // on acceptable Flash performance and reasonable CPU consumption.
 //
 // I'd like to make the throttle delay variable, based on the amount of
 // time currently required to paint Flash plugins.  There isn't a good
 // way to count the time spent in aggregate plugin painting, however, so
 // this seems to work well enough.
 const int kFlashWMUSERMessageThrottleDelayMs = 5;
 
 // Flash displays popups in response to user clicks by posting a WM_USER
 // message to the plugin window. The handler for this message displays
 // the popup. To ensure that the popups allowed state is sent correctly
 // to the renderer we reset the popups allowed state in a timer.
 const int kWindowedPluginPopupTimerMs = 50;
 
 // The current instance of the plugin which entered the modal loop.
 WebPluginDelegateImpl* g_current_plugin_instance = NULL;
 
 typedef std::deque<MSG> ThrottleQueue;
 base::LazyInstance<ThrottleQueue> g_throttle_queue(base::LINKER_INITIALIZED);
+base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map(
+    base::LINKER_INITIALIZED);
+
 
 // Helper object for patching the TrackPopupMenu API.
 base::LazyInstance<iat_patch::IATPatchFunction> g_iat_patch_track_popup_menu(
     base::LINKER_INITIALIZED);
 
 // Helper object for patching the SetCursor API.
 base::LazyInstance<iat_patch::IATPatchFunction> g_iat_patch_set_cursor(
     base::LINKER_INITIALIZED);
 
 // Helper object for patching the RegEnumKeyExW API.
@@ skipping 562 matching lines @@
         kFlashWMUSERMessageThrottleDelayMs);
   }
 }
 
 // We go out of our way to find the hidden windows created by Flash for
 // windowless plugins.  We throttle the rate at which they deliver messages
 // so that they will not consume outrageous amounts of CPU.
 // static
 LRESULT CALLBACK WebPluginDelegateImpl::FlashWindowlessWndProc(HWND hwnd,
     UINT message, WPARAM wparam, LPARAM lparam) {
-  WNDPROC old_proc = reinterpret_cast<WNDPROC>(GetProp(hwnd, kPluginOrigProc));
+  std::map<HWND, WNDPROC>::iterator index =
+      g_window_handle_proc_map.Get().find(hwnd);
+
+  WNDPROC old_proc = (*index).second;
   DCHECK(old_proc);
 
   switch (message) {
     case WM_NCDESTROY: {
       WebPluginDelegateImpl::ClearThrottleQueueForWindow(hwnd);
+      g_window_handle_proc_map.Get().erase(index);
       break;
     }
     // Flash may flood the message queue with WM_USER+1 message causing 100% CPU
     // usage.  See https://bugzilla.mozilla.org/show_bug.cgi?id=132759.  We
     // prevent this by throttling the messages.
     case WM_USER + 1: {
       WebPluginDelegateImpl::ThrottleMessage(old_proc, hwnd, message, wparam,
                                              lparam);
       return TRUE;
     }
@@ skipping 17 matching lines @@
   if (wcscmp(class_name, L"SWFlash_PlaceholderX"))
     return TRUE;
 
   WNDPROC current_wnd_proc = reinterpret_cast<WNDPROC>(
         GetWindowLongPtr(window, GWLP_WNDPROC));
   if (current_wnd_proc != wnd_proc) {
     WNDPROC old_flash_proc = reinterpret_cast<WNDPROC>(SetWindowLongPtr(
         window, GWLP_WNDPROC,
         reinterpret_cast<LONG>(wnd_proc)));
     DCHECK(old_flash_proc);
-    BOOL result = SetProp(window, kPluginOrigProc, old_flash_proc);
-    if (!result) {
-      LOG(ERROR) << "SetProp failed, last error = " << GetLastError();
-      return FALSE;
-    }
+    g_window_handle_proc_map.Get()[window] = old_flash_proc;
   }
 
   return TRUE;
 }
 
 bool WebPluginDelegateImpl::CreateDummyWindowForActivation() {
   DCHECK(!dummy_window_for_activation_);
   dummy_window_for_activation_ = CreateWindowEx(
     0,
     L"Static",
@@ skipping 682 matching lines @@
     case WM_LBUTTONUP:
     case WM_MBUTTONUP:
     case WM_RBUTTONUP:
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }