Reverting 9109.

webkit/glue/plugins/webplugin_delegate_impl.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 <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/stats_counters.h"
 #include "base/string_util.h"
-#include "base/win_util.h"
 #include "webkit/default_plugin/plugin_impl.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_instance.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/plugin_stream_url.h"
 #include "webkit/glue/webkit_glue.h"
 
@@ skipping 168 matching lines @@
     quirks_ |= PLUGIN_QUIRK_PATCH_TRACKPOPUP_MENU;
     quirks_ |= PLUGIN_QUIRK_PATCH_SETCURSOR;
   }
 
   plugin_module_handle_ = ::GetModuleHandle(plugin_info.path.value().c_str());
 }
 
 WebPluginDelegateImpl::~WebPluginDelegateImpl() {
   if (::IsWindow(dummy_window_for_activation_)) {
     ::DestroyWindow(dummy_window_for_activation_);
-    TRACK_HWND_DESTRUCTION(dummy_window_for_activation_);
   }
 
   DestroyInstance();
 
   if (!windowless_)
     WindowedDestroyWindow();
 
   if (handle_event_pump_messages_event_) {
     CloseHandle(handle_event_pump_messages_event_);
   }
@@ skipping 226 matching lines @@
     0,
     WS_POPUP | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
     0,
     0,
     0,
     0,
     parent_,
     0,
     GetModuleHandle(NULL),
     0);
-  TRACK_HWND_CREATION(windowed_handle_);
   if (windowed_handle_ == 0)
     return false;
 
   if (IsWindow(parent_)) {
     // This is a tricky workaround for Issue 2673 in chromium "Flash: IME not
     // available". To use IMEs in this window, we have to make Windows attach
     // IMEs to this window (i.e. load IME DLLs, attach them to this process,
     // and add their message hooks to this window). Windows attaches IMEs while
     // this process creates a top-level window. On the other hand, to layout
     // this window correctly in the given parent window (RenderWidgetHostHWND),
@@ skipping 39 matching lines @@
     // Unsubclass the window.
     WNDPROC current_wnd_proc = reinterpret_cast<WNDPROC>(
         GetWindowLongPtr(windowed_handle_, GWLP_WNDPROC));
     if (current_wnd_proc == NativeWndProc) {
       SetWindowLongPtr(windowed_handle_,
                        GWLP_WNDPROC,
                        reinterpret_cast<LONG>(plugin_wnd_proc_));
     }
 
     DestroyWindow(windowed_handle_);
-    TRACK_HWND_DESTRUCTION(windowed_handle_);
     windowed_handle_ = 0;
   }
 }
 
 // Erase all messages in the queue destined for a particular window.
 // When windows are closing, callers should use this function to clear
 // the queue.
 // static
 void WebPluginDelegateImpl::ClearThrottleQueueForWindow(HWND window) {
   std::list<MSG>* throttle_queue = g_throttle_queue.Pointer();
@@ skipping 132 matching lines @@
     kDummyActivationWindowName,
     WS_CHILD,
     0,
     0,
     0,
     0,
     parent_,
     0,
     GetModuleHandle(NULL),
     0);
-  TRACK_HWND_CREATION(dummy_window_for_activation_);
 
   if (dummy_window_for_activation_ == 0)
     return false;
 
   // Flash creates background windows which use excessive CPU in our
   // environment; we wrap these windows and throttle them so that they don't
   // get out of hand.
   if (!EnumThreadWindows(::GetCurrentThreadId(), EnumFlashWindows,
       reinterpret_cast<LPARAM>(
       &WebPluginDelegateImpl::FlashWindowlessWndProc))) {
@@ skipping 504 matching lines @@
 
   // It is ok to pass NULL here to GetCursor as we are not looking for cursor
   // types defined by Webkit.
   HCURSOR previous_cursor =
       g_current_plugin_instance->current_windowless_cursor_.GetCursor(NULL);
 
   g_current_plugin_instance->current_windowless_cursor_.InitFromExternalCursor(
       cursor);
   return previous_cursor;
 }