base::Bind fixes

content/plugin/webplugin_proxy.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/plugin/webplugin_proxy.h"
 
 #include "build/build_config.h"
 
+#include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_handle.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
 #include "content/common/npobject_proxy.h"
 #include "content/common/npobject_util.h"
 #include "content/common/plugin_messages.h"
 #include "content/plugin/plugin_channel.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_client.h"
@@ skipping 37 matching lines @@
       route_id_(route_id),
       window_npobject_(NULL),
       plugin_element_(NULL),
       delegate_(NULL),
       waiting_for_paint_(false),
       containing_window_(containing_window),
       page_url_(page_url),
       transparent_(false),
       windowless_buffer_index_(0),
       host_render_view_routing_id_(host_render_view_routing_id),
-      ALLOW_THIS_IN_INITIALIZER_LIST(runnable_method_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 #if defined(USE_X11)
   windowless_shm_pixmaps_[0] = None;
   windowless_shm_pixmaps_[1] = None;
   use_shm_pixmap_ = false;
 
   // If the X server supports SHM pixmaps
   // and the color depth and masks match,
   // then consider using SHM pixmaps for windowless plugin painting.
   Display* display = ui::GetXDisplay();
   if (ui::QuerySharedMemorySupport(display) == ui::SHARED_MEMORY_PIXMAP &&
@@ skipping 114 matching lines @@
       !delegate_->GetClipRect().Intersects(damaged_rect_))
     return;
 
   // Only send a single InvalidateRect message at a time.  From DidPaint we
   // will dispatch an additional InvalidateRect message if necessary.
   if (!waiting_for_paint_) {
     waiting_for_paint_ = true;
     // Invalidates caused by calls to NPN_InvalidateRect/NPN_InvalidateRgn
     // need to be painted asynchronously as per the NPAPI spec.
     MessageLoop::current()->PostTask(FROM_HERE,
-        runnable_method_factory_.NewRunnableMethod(
-            &WebPluginProxy::OnPaint, damaged_rect_));
+        base::Bind(&WebPluginProxy::OnPaint, weak_factory_.GetWeakPtr(),
+            damaged_rect_));
     damaged_rect_ = gfx::Rect();
   }
 }
 
 NPObject* WebPluginProxy::GetWindowScriptNPObject() {
   if (window_npobject_)
     return window_npobject_;
 
   int npobject_route_id = channel_->GenerateRouteID();
   bool success = false;
@@ skipping 543 matching lines @@
   // Retrieve the IME status from a plug-in and send it to a renderer process
   // when the plug-in has updated it.
   int input_type;
   gfx::Rect caret_rect;
   if (!delegate_->GetIMEStatus(&input_type, &caret_rect))
     return;
 
   Send(new PluginHostMsg_NotifyIMEStatus(route_id_, input_type, caret_rect));
 }
 #endif