| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2008, The Android Open Source Project | 2 * Copyright 2008, The Android Open Source Project |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * * Redistributions of source code must retain the above copyright | 7 * * Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * * Redistributions in binary form must reproduce the above copyright | 9 * * Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 // http://rawgit.com/w3c/touch-events/v1-errata/touchevents.html#touch-interface |
| 27 |
| 26 [ | 28 [ |
| 27 WillBeGarbageCollected, | 29 WillBeGarbageCollected, |
| 28 ] interface Touch { | 30 ] interface Touch { |
| 29 readonly attribute double clientX; | 31 // FIXME: identifier should be long, not unsigned long. |
| 30 readonly attribute double clientY; | 32 readonly attribute unsigned long identifier; |
| 31 readonly attribute double screenX; | 33 readonly attribute EventTarget target; |
| 32 readonly attribute double screenY; | 34 readonly attribute double screenX; |
| 33 readonly attribute double pageX; | 35 readonly attribute double screenY; |
| 34 readonly attribute double pageY; | 36 readonly attribute double clientX; |
| 35 readonly attribute EventTarget target; | 37 readonly attribute double clientY; |
| 36 readonly attribute unsigned long identifier; | 38 readonly attribute double pageX; |
| 37 readonly attribute double radiusX; | 39 readonly attribute double pageY; |
| 38 readonly attribute double radiusY; | 40 |
| 39 readonly attribute float force; | 41 // Touch Events Extensions |
| 42 // http://rawgit.com/w3c/touch-events/master/touchevents.html#touch-interfac
e |
| 43 // FIXME: radiusX and radiusY should be float, not double. |
| 44 readonly attribute double radiusX; |
| 45 readonly attribute double radiusY; |
| 46 readonly attribute float force; |
| 47 |
| 48 // Non-standard APIs |
| 40 [MeasureAs=PrefixedTouchRadiusX] readonly attribute double webkitRadiusX; | 49 [MeasureAs=PrefixedTouchRadiusX] readonly attribute double webkitRadiusX; |
| 41 [MeasureAs=PrefixedTouchRadiusY] readonly attribute double webkitRadiusY; | 50 [MeasureAs=PrefixedTouchRadiusY] readonly attribute double webkitRadiusY; |
| 42 [MeasureAs=PrefixedTouchRotationAngle] readonly attribute float webkitRotati
onAngle; | 51 [MeasureAs=PrefixedTouchRotationAngle] readonly attribute float webkitRotati
onAngle; |
| 43 [MeasureAs=PrefixedTouchForce] readonly attribute float webkitForce; | 52 [MeasureAs=PrefixedTouchForce] readonly attribute float webkitForce; |
| 44 }; | 53 }; |
| OLD | NEW |