Revert 71879 due to compile failure - touch: Allow grabbing/ungrabbing touch ...

views/focus/accelerator_handler_touch.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 "views/focus/accelerator_handler.h"
 
 #include <bitset>
 #include <gtk/gtk.h>
 #if defined(HAVE_XINPUT2)
 #include <X11/extensions/XInput2.h>
 #else
 #include <X11/Xlib.h>
 #endif
 
 #include "views/accelerator.h"
 #include "views/event.h"
 #include "views/focus/focus_manager.h"
-#include "views/touchui/touch_factory.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
 namespace views {
 
+#if defined(HAVE_XINPUT2)
+// Functions related to determining touch devices.
+class TouchFactory {
+ public:
+  // Keep a list of touch devices so that it is possible to determine if a
+  // pointer event is a touch-event or a mouse-event.
+  static void SetTouchDeviceListInternal(
+      const std::vector<unsigned int>& devices) {
+    for (std::vector<unsigned int>::const_iterator iter = devices.begin();
+        iter != devices.end(); ++iter) {
+      DCHECK(*iter < touch_devices.size());
+      touch_devices[*iter] = true;
+    }
+  }
+
+  // Is the device a touch-device?
+  static bool IsTouchDevice(unsigned int deviceid) {
+    return deviceid < touch_devices.size() ? touch_devices[deviceid] : false;
+  }
+
+ private:
+  // A quick lookup table for determining if a device is a touch device.
+  static std::bitset<128> touch_devices;
+
+  DISALLOW_COPY_AND_ASSIGN(TouchFactory);
+};
+
+std::bitset<128> TouchFactory::touch_devices;
+#endif
+
 namespace {
 
 RootView* FindRootViewForGdkWindow(GdkWindow* gdk_window) {
   gpointer data = NULL;
   gdk_window_get_user_data(gdk_window, &data);
   GtkWidget* gtk_widget = reinterpret_cast<GtkWidget*>(data);
   if (!gtk_widget || !GTK_IS_WIDGET(gtk_widget)) {
     DLOG(WARNING) << "no GtkWidget found for that GdkWindow";
     return NULL;
   }
   WidgetGtk* widget_gtk = WidgetGtk::GetViewForNative(gtk_widget);
 
   if (!widget_gtk) {
     DLOG(WARNING) << "no WidgetGtk found for that GtkWidget";
     return NULL;
   }
   return widget_gtk->GetRootView();
 }
 
 #if defined(HAVE_XINPUT2)
 bool X2EventIsTouchEvent(XEvent* xev) {
   // TODO(sad): Determine if the captured event is a touch-event.
   XGenericEventCookie* cookie = &xev->xcookie;
   switch (cookie->evtype) {
     case XI_ButtonPress:
     case XI_ButtonRelease:
     case XI_Motion: {
       // Is the event coming from a touch device?
-      return TouchFactory::GetInstance()->IsTouchDevice(
+      return TouchFactory::IsTouchDevice(
           static_cast<XIDeviceEvent*>(cookie->data)->sourceid);
     }
     default:
       return false;
   }
 }
 #endif  // HAVE_XINPUT2
 
 }  // namespace
 
@@ skipping 101 matching lines @@
       }
 #endif
     }
   }
 
   return false;
 }
 
 #if defined(HAVE_XINPUT2)
 void SetTouchDeviceList(std::vector<unsigned int>& devices) {
-  TouchFactory::GetInstance()->SetTouchDeviceList(devices);
+  TouchFactory::SetTouchDeviceListInternal(devices);
 }
 #endif
 
 AcceleratorHandler::AcceleratorHandler() {}
 
 bool AcceleratorHandler::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
   return true;
 }
 
 base::MessagePumpGlibXDispatcher::DispatchStatus AcceleratorHandler::Dispatch(
     XEvent* xev) {
   return DispatchXEvent(xev) ?
       base::MessagePumpGlibXDispatcher::EVENT_PROCESSED :
       base::MessagePumpGlibXDispatcher::EVENT_IGNORED;
 }
 
 }  // namespace views