Pointer/hover media query support: platform-dependent changes #2

ui/base/touch/touch_device_aurax11.cc

 // Copyright (c) 2013 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/base/touch/touch_device.h"
 #include "ui/events/devices/x11/touch_factory_x11.h"
 
 namespace ui {
 
 bool IsTouchDevicePresent() {
   return ui::TouchFactory::GetInstance()->IsTouchDevicePresent();
 }
 
 int MaxTouchPoints() {
   return ui::TouchFactory::GetInstance()->GetMaxTouchPoints();
 }
 
 int GetAvailablePointerTypes() {
-  // TODO(mustaq): Replace the stub below
-  return POINTER_TYPE_NONE;
+  // Assume a touch-device with a keyboard
+  return POINTER_TYPE_COARSE | POINTER_TYPE_NONE;

[sadrul, 2014/12/07 17:46:18]

Should this look at IsTouchDevicePresent() before returning _COARSE?

I assume we want to set the FINE bit too if there's a mouse-device present?

What's the implication of setting POINTER_TYPE_NONE? What happens if this is not
set? (I ask since it's confusing to set the NONE bit when also setting non-NONE
bits)

[mustaq, 2014/12/09 20:46:19]

Done adding a check for the presence of a touch-device.

POINTER_TYPE_NONE means there is an input device w/o pointers. Similar for
HOVER_TYPE_NONE.
  http://dev.w3.org/csswg/mediaqueries-4/#pointer
Ideally we should check all possible input devices, as we did for Android in
ui/android/java/src/org/chromium/ui/base/TouchDevice.java. To support a similar
level of granularity here, we need to dig into TouchFactory. I filed a bug to
track that: crbug.com/440503.

 }
 
 PointerType GetPrimaryPointerType() {
-  // TODO(mustaq): Replace the stub below
-  return POINTER_TYPE_NONE;
+  // Assume a touch-device with a keyboard
+  return POINTER_TYPE_COARSE;
 }
 
 int GetAvailableHoverTypes() {
-  // TODO(mustaq): Replace the stub below
-  return HOVER_TYPE_NONE;
+  // Assume a touch-device with a keyboard
+  return HOVER_TYPE_ON_DEMAND  | HOVER_TYPE_NONE;
 }
 
 HoverType GetPrimaryHoverType() {
-  // TODO(mustaq): Replace the stub below
-  return HOVER_TYPE_NONE;
+  // Assume a touch-device with a keyboard
+  return HOVER_TYPE_ON_DEMAND;

[sadrul, 2014/12/07 17:46:18]

Shouldn't all these look at IsTouchDevicePresent() instead of always assuming
touch-device?

[mustaq, 2014/12/09 20:46:19]

Done. See my comment above.

 }
 
 }  // namespace ui