Run event executor on the ui thread to remove the need to explicitly XFlush() the XTest calls.

base/message_pump_glib.cc

 // Copyright (c) 2010 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 "base/message_pump_glib.h"
 
 #include <fcntl.h>
 #include <math.h>
 
 #include <gtk/gtk.h>
 #include <glib.h>
 
+#include <string>
+#include <vector>
+
 #include "base/eintr_wrapper.h"
 #include "base/logging.h"
+#include "base/command_line.h"
 #include "base/threading/platform_thread.h"
 
 namespace {
 
+// TODO(jamiewalch): This is pretty much a direct copy of
+// gfx::GtkInitFromCommandLine. The fact that it calls gdk_init instead of
+// gtk_init is probably unimportant as the latter calls the former, but
+// we can't have base depending on ui so we can't use the function directly.
+void GdkInitFromCommandLine(const CommandLine& command_line) {
+  const std::vector<std::string>& args = command_line.argv();
+  int argc = args.size();
+  scoped_array<char *> argv(new char *[argc + 1]);
+  for (size_t i = 0; i < args.size(); ++i) {
+    // gdk_init makes no const-ness guarantees so best to be safe here. If it
+    // doesn't delete the arguments it consumes, then there is a small memory
+    // leak, but the alternative is far more severe.
+    argv[i] = strdup(args[i].c_str());
+  }
+  argv[argc] = NULL;
+  char **argv_pointer = argv.get();
+
+  gdk_init(&argc, &argv_pointer);
+  // gfx::GtkInitFromCommandLine uses args.size() instead of argc for the loop
+  // limit, which I believe is wrong, though probably benign.
+  for (int i = 0; i < argc; ++i) {
+    free(argv[i]);
+  }
+}
+
 // We send a byte across a pipe to wakeup the event loop.
 const char kWorkScheduled = '\0';
 
 // Return a timeout suitable for the glib loop, -1 to block forever,
 // 0 to return right away, or a timeout in milliseconds from now.
 int GetTimeIntervalMilliseconds(const base::TimeTicks& from) {
   if (from.is_null())
     return -1;
 
   // Be careful here.  TimeDelta has a precision of microseconds, but we want a
@@ skipping 108 matching lines @@
   // This keeps the state of whether the pump got signaled that there was new
   // work to be done. Since we eat the message on the wake up pipe as soon as
   // we get it, we keep that state here to stay consistent.
   bool has_work;
 };
 
 MessagePumpForUI::MessagePumpForUI()
     : state_(NULL),
       context_(g_main_context_default()),
       wakeup_gpollfd_(new GPollFD) {
+  // Initialize gdk.

[Dean McNamee, 2011/02/15 17:06:26]

This is the classic style of comment:

// Add one to x.
x += 1;

Why are we initializing GDK?  I haven't looked that deeply at the patch, but I
definitely don't know why it's being added.

[Jamie, 2011/02/15 17:17:03]

Yes, I put the comment in before I factored out the function. I'll remove it.
I need to be able to get the Display reference that GDK is internally passing to
XPending (or equivalent) so that another class can use it (actually, in a
revision to this CL it will most likely be pulled into this class).
MessagePumpGlibX uses gdk_display_get_default(), but that only works if gdk_init
has been called. Also, it seems that if we don't initialize gdk then we're not
respecting command-line arguments such as "-display".

+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  GdkInitFromCommandLine(*command_line);
   // Create our wakeup pipe, which is used to flag when work was scheduled.
   int fds[2];
   CHECK_EQ(pipe(fds), 0);
   wakeup_pipe_read_  = fds[0];
   wakeup_pipe_write_ = fds[1];
   wakeup_gpollfd_->fd = wakeup_pipe_read_;
   wakeup_gpollfd_->events = G_IO_IN;
 
   work_source_ = g_source_new(&WorkSourceFuncs, sizeof(WorkSource));
   static_cast<WorkSource*>(work_source_)->pump = this;
@@ skipping 198 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, DidProcessEvent(event));
 }
 
 // static
 void MessagePumpForUI::EventDispatcher(GdkEvent* event, gpointer data) {
   MessagePumpForUI* message_pump = reinterpret_cast<MessagePumpForUI*>(data);
   message_pump->DispatchEvents(event);
 }
 
 }  // namespace base