~chromium-team/chromium-browser/horizon

« back to all changes in this revision

Viewing changes to debian/patches/touch-v35

  • Committer: Chad MILLER
  • Date: 2017-02-06 16:22:08 UTC
  • Revision ID: chad.miller@canonical.com-20170206162208-v26o2zdwxy2t1hoh
Upstream beta: 57.0.2987.21.

Show diffs side-by-side

added added

removed removed

Lines of Context:
4
4
 
5
5
--- a/ui/events/devices/x11/touch_factory_x11.cc
6
6
+++ b/ui/events/devices/x11/touch_factory_x11.cc
7
 
@@ -122,7 +122,10 @@ void TouchFactory::UpdateDeviceList(XDis
 
7
@@ -108,7 +108,10 @@ void TouchFactory::UpdateDeviceList(XDis
8
8
           if (tci->mode == XIDirectTouch) {
9
9
             touch_device_lookup_[devinfo.deviceid] = true;
10
10
             touch_device_list_[devinfo.deviceid] = true;
16
16
         }
17
17
       }
18
18
       pointer_device_lookup_[devinfo.deviceid] = true;
19
 
@@ -347,8 +350,12 @@ void TouchFactory::CacheTouchscreenIds(i
 
19
@@ -329,8 +332,12 @@ void TouchFactory::CacheTouchscreenIds(i
20
20
                      return touchscreen.id == device_id;
21
21
                    });
22
22
   // Internal displays will have a vid and pid of 0. Ignore them.