base::Bind: Cleanup in automation.

chrome/browser/automation/ui_controls_gtk.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 "chrome/browser/automation/ui_controls.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/browser/automation/ui_controls_internal.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/automation_constants.h"
 #include "ui/base/gtk/event_synthesis_gtk.h"
 #include "ui/gfx/rect.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "views/view.h"
 #include "views/widget/widget.h"
 #endif
 
 namespace {
 
 // static
 guint32 XTimeNow() {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
   return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
 }
 
 class EventWaiter : public MessageLoopForUI::Observer {
  public:
-  EventWaiter(Task* task, GdkEventType type, int count)
+  EventWaiter(const base::Closure& task, GdkEventType type, int count)
       : task_(task),
         type_(type),
         count_(count) {
     MessageLoopForUI::current()->AddObserver(this);
   }
 
   virtual ~EventWaiter() {
     MessageLoopForUI::current()->RemoveObserver(this);
   }
 #if defined(TOUCH_UI)
@@ skipping 19 matching lines @@
       delete this;
     }
   }
 
   virtual void DidProcessEvent(GdkEvent* event) {
     // No-op.
   }
 #endif
 
  private:
-  // We pass ownership of task_ to MessageLoop when the current event is
-  // received.
-  Task* task_;
+  base::Closure task_;

[awong, 2011/10/11 01:18:04]

That comment scares me slightly.  Are we okay with releasing task_ on this
thread?

[James Hawkins, 2011/10/11 21:11:22]

Yes.

   GdkEventType type_;
   // The number of events of this type to wait for.
   int count_;
 };
 
 void FakeAMouseMotionEvent(gint x, gint y) {
   GdkEvent* event = gdk_event_new(GDK_MOTION_NOTIFY);
 
   event->motion.send_event = false;
   event->motion.time = XTimeNow();
@@ skipping 67 matching lines @@
 
   return true;
 }
 
 bool SendKeyPressNotifyWhenDone(gfx::NativeWindow window,
                                 ui::KeyboardCode key,
                                 bool control,
                                 bool shift,
                                 bool alt,
                                 bool command,
-                                Task* task) {
+                                const base::Closure& task) {
   DCHECK(!command);  // No command key on Linux
   int release_count = 1;
   if (control)
     release_count++;
   if (shift)
     release_count++;
   if (alt)
     release_count++;
   // This object will delete itself after running |task|.
   new EventWaiter(task, GDK_KEY_RELEASE, release_count);
   return SendKeyPress(window, key, control, shift, alt, command);
 }
 
 bool SendMouseMove(long x, long y) {
   gdk_display_warp_pointer(gdk_display_get_default(), gdk_screen_get_default(),
                            x, y);
   // Sometimes gdk_display_warp_pointer fails to send back any indication of
   // the move, even though it succesfully moves the server cursor. We fake it in
   // order to get drags to work.
   FakeAMouseMotionEvent(x, y);
   return true;
 }
 
-bool SendMouseMoveNotifyWhenDone(long x, long y, Task* task) {
+bool SendMouseMoveNotifyWhenDone(long x, long y, const base::Closure& task) {
   bool rv = SendMouseMove(x, y);
   new EventWaiter(task, GDK_MOTION_NOTIFY, 1);
   return rv;
 }
 
 bool SendMouseEvents(MouseButton type, int state) {
   GdkEvent* event = gdk_event_new(GDK_BUTTON_PRESS);
 
   event->button.send_event = false;
   event->button.time = XTimeNow();
@@ skipping 35 matching lines @@
   release_event->button.time++;
   if (state & UP)
     gdk_event_put(release_event);
 
   gdk_event_free(event);
   gdk_event_free(release_event);
 
   return false;
 }
 
-bool SendMouseEventsNotifyWhenDone(MouseButton type, int state, Task* task) {
+bool SendMouseEventsNotifyWhenDone(MouseButton type, int state,
+                                   const base::Closure& task) {
   bool rv = SendMouseEvents(type, state);
   GdkEventType wait_type;
   if (state & UP) {
     wait_type = GDK_BUTTON_RELEASE;
   } else {
     if (type == LEFT)
       wait_type = GDK_BUTTON_PRESS;
     else if (type == MIDDLE)
       wait_type = GDK_2BUTTON_PRESS;
     else
@@ skipping 29 matching lines @@
     // resized.
     GtkWidget* gtk_widget = widget->GetNativeView();
     g_signal_connect(gtk_widget, "configure-event",
                      G_CALLBACK(&OnConfigure), widget);
     MessageLoop::current()->Run();
   }
 }
 #endif
 
 void MoveMouseToCenterAndPress(views::View* view, MouseButton button,
-                               int state, Task* task) {
+                               int state, const base::Closure& task) {
 #if defined(OS_LINUX) && !defined(USE_AURA)
   // X is asynchronous and we need to wait until the window gets
   // resized to desired size.
   SynchronizeWidgetSize(view->GetWidget());
 #endif
 
   gfx::Point view_center(view->width() / 2, view->height() / 2);
   views::View::ConvertPointToScreen(view, &view_center);
-  SendMouseMoveNotifyWhenDone(view_center.x(), view_center.y(),
-                              new ClickTask(button, state, task));
+  SendMouseMoveNotifyWhenDone(
+      view_center.x(), view_center.y(),
+      base::Bind(ui_controls::ClickTask, button, state, task));
 }
 #else
 void MoveMouseToCenterAndPress(GtkWidget* widget,
                                MouseButton button,
                                int state,
-                               Task* task) {
+                               const base::Closure& task) {
   gfx::Rect bounds = gtk_util::GetWidgetScreenBounds(widget);
-  SendMouseMoveNotifyWhenDone(bounds.x() + bounds.width() / 2,
-                              bounds.y() + bounds.height() / 2,
-                              new ClickTask(button, state, task));
+  SendMouseMoveNotifyWhenDone(
+      bounds.x() + bounds.width() / 2,
+      bounds.y() + bounds.height() / 2,
+      base::Bind(&ui_controls::ClickTask, button, state, task));
 }
 #endif
 
 }  // namespace ui_controls