[WIP] ui/window: Master CL.

ui/events/platform/x11/x11_event_source.cc

 // Copyright 2014 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 "ui/events/platform/x11/x11_event_source.h"
 
 #include <X11/extensions/XInput2.h>
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ skipping 63 matching lines @@
     return false;
   }
 
   return true;
 }
 
 }  // namespace
 
 X11EventSource::X11EventSource(XDisplay* display)
     : display_(display) {
+  LOG(ERROR) << "Created " << this << " with " << display_;
   CHECK(display_);
   InitializeXInput2(display_);
   InitializeXkb(display_);
 }
 
 X11EventSource::~X11EventSource() {
 }
 
 // static
 X11EventSource* X11EventSource::GetInstance() {
@@ skipping 11 matching lines @@
   while (XPending(display_)) {
     XEvent xevent;
     XNextEvent(display_, &xevent);
     uint32_t action = DispatchEvent(&xevent);
     if (action & POST_DISPATCH_QUIT_LOOP)
       break;
   }
 }
 
 void X11EventSource::BlockUntilWindowMapped(XID window) {
+  LOG(ERROR) << "Blocking for " << window << " in " << this << " on "
+             << display_;
   XEvent event;
   do {
     // Block until there's a message of |event_mask| type on |w|. Then remove
     // it from the queue and stuff it in |event|.
     XWindowEvent(display_, window, StructureNotifyMask, &event);
     DispatchEvent(&event);
   } while (event.type != MapNotify);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 11 matching lines @@
       xevent->xgeneric.evtype == XI_HierarchyChanged) {
     ui::UpdateDeviceList();
   }
 
   if (have_cookie)
     XFreeEventData(xevent->xgeneric.display, &xevent->xcookie);
   return action;
 }
 
 }  // namespace ui