base::Bind: Conversions in webkit/plugins/npapi.

webkit/plugins/npapi/webplugin_delegate_impl_win.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 "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/version.h"
@@ skipping 296 matching lines @@
       windowed_handle_(NULL),
       windowed_did_set_window_(false),
       plugin_wnd_proc_(NULL),
       last_message_(0),
       is_calling_wndproc(false),
       dummy_window_for_activation_(NULL),
       parent_proxy_window_(NULL),
       handle_event_message_filter_hook_(NULL),
       handle_event_pump_messages_event_(NULL),
       user_gesture_message_posted_(false),
-#pragma warning(suppress: 4355)  // can use this
-      user_gesture_msg_factory_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(user_gesture_msg_factory_(this)),
       handle_event_depth_(0),
       mouse_hook_(NULL),
       first_set_window_call_(true),
       plugin_has_focus_(false),
       has_webkit_focus_(false),
       containing_view_has_focus_(true),
       creation_succeeded_(false) {
   memset(&window_, 0, sizeof(window_));
 
   const WebPluginInfo& plugin_info = instance_->plugin_lib()->plugin_info();
@@ skipping 352 matching lines @@
     const MSG& msg = *it;
     WNDPROC proc = reinterpret_cast<WNDPROC>(msg.time);
     // It is possible that the window was closed after we queued
     // this message.  This is a rare event; just verify the window
     // is alive.  (see also bug 1259488)
     if (IsWindow(msg.hwnd))
       CallWindowProc(proc, msg.hwnd, msg.message, msg.wParam, msg.lParam);
   }
 
   if (!throttle_queue_was_empty) {
-    MessageLoop::current()->PostDelayedTask(FROM_HERE,
-        NewRunnableFunction(&WebPluginDelegateImpl::OnThrottleMessage),
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE, base::Bind(&WebPluginDelegateImpl::OnThrottleMessage),
         kFlashWMUSERMessageThrottleDelayMs);
   }
 }
 
 // Schedule a windows message for delivery later.
 // static
 void WebPluginDelegateImpl::ThrottleMessage(WNDPROC proc, HWND hwnd,
                                             UINT message, WPARAM wParam,
                                             LPARAM lParam) {
   MSG msg;
   msg.time = reinterpret_cast<DWORD>(proc);
   msg.hwnd = hwnd;
   msg.message = message;
   msg.wParam = wParam;
   msg.lParam = lParam;
 
   ThrottleQueue* throttle_queue = g_throttle_queue.Pointer();
 
   throttle_queue->push_back(msg);
 
   if (throttle_queue->size() == 1) {
-    MessageLoop::current()->PostDelayedTask(FROM_HERE,
-        NewRunnableFunction(&WebPluginDelegateImpl::OnThrottleMessage),
+    MessageLoop::current()->PostDelayedTask(
+        FROM_HERE, base::Bind(&WebPluginDelegateImpl::OnThrottleMessage),
         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) {
@@ skipping 337 matching lines @@
     result = FALSE;
   } else {
     delegate->is_calling_wndproc = true;
 
     if (!delegate->user_gesture_message_posted_ &&
         IsUserGestureMessage(message)) {
       delegate->user_gesture_message_posted_ = true;
 
       delegate->instance()->PushPopupsEnabledState(true);
 
-      MessageLoop::current()->PostDelayedTask(FROM_HERE,
-          delegate->user_gesture_msg_factory_.NewRunnableMethod(
-              &WebPluginDelegateImpl::OnUserGestureEnd),
+      MessageLoop::current()->PostDelayedTask(
+          FROM_HERE,
+          base::Bind(&WebPluginDelegateImpl::OnUserGestureEnd,
+                     delegate->user_gesture_msg_factory_.GetWeakPtr()),
           kWindowedPluginPopupTimerMs);
     }
 
     HandleCaptureForMessage(hwnd, message);
 
     // Maintain a local/global stack for the g_current_plugin_instance variable
     // as this may be a nested invocation.
     WebPluginDelegateImpl* last_plugin_instance = g_current_plugin_instance;
 
     g_current_plugin_instance = delegate;
@@ skipping 467 matching lines @@
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit