Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: Source/core/dom/Touch.h

Issue 335413003: Added unprefixed version of Touch radius and force (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 // DOM Touch implementation 53 // DOM Touch implementation
54 EventTarget* target() const { return m_target.get(); } 54 EventTarget* target() const { return m_target.get(); }
55 unsigned identifier() const { return m_identifier; } 55 unsigned identifier() const { return m_identifier; }
56 double clientX() const { return m_clientPos.x(); } 56 double clientX() const { return m_clientPos.x(); }
57 double clientY() const { return m_clientPos.y(); } 57 double clientY() const { return m_clientPos.y(); }
58 double screenX() const { return m_screenPos.x(); } 58 double screenX() const { return m_screenPos.x(); }
59 double screenY() const { return m_screenPos.y(); } 59 double screenY() const { return m_screenPos.y(); }
60 double pageX() const { return m_pagePos.x(); } 60 double pageX() const { return m_pagePos.x(); }
61 double pageY() const { return m_pagePos.y(); } 61 double pageY() const { return m_pagePos.y(); }
62 double radiusX() const { return m_radius.width(); }
Rick Byers 2014/06/22 16:57:59 nit: put each new line directly above it's prefixe
gnana 2014/06/23 11:08:57 Done.
63 double radiusY() const { return m_radius.height(); }
64 float force() const { return m_force; }
62 double webkitRadiusX() const { return m_radius.width(); } 65 double webkitRadiusX() const { return m_radius.width(); }
63 double webkitRadiusY() const { return m_radius.height(); } 66 double webkitRadiusY() const { return m_radius.height(); }
64 float webkitRotationAngle() const { return m_rotationAngle; } 67 float webkitRotationAngle() const { return m_rotationAngle; }
65 float webkitForce() const { return m_force; } 68 float webkitForce() const { return m_force; }
66 69
67 // Blink-internal methods 70 // Blink-internal methods
68 const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; } 71 const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
69 const FloatPoint& screenLocation() const { return m_screenPos; } 72 const FloatPoint& screenLocation() const { return m_screenPos; }
70 PassRefPtrWillBeRawPtr<Touch> cloneWithNewTarget(EventTarget*) const; 73 PassRefPtrWillBeRawPtr<Touch> cloneWithNewTarget(EventTarget*) const;
71 74
(...skipping 22 matching lines...) Expand all
94 float m_force; 97 float m_force;
95 // FIXME(rbyers): Shouldn't we be able to migrate callers to relying on scre enPos, pagePos 98 // FIXME(rbyers): Shouldn't we be able to migrate callers to relying on scre enPos, pagePos
96 // or clientPos? absoluteLocation appears to be the same as pagePos but with out browser 99 // or clientPos? absoluteLocation appears to be the same as pagePos but with out browser
97 // scale applied. 100 // scale applied.
98 LayoutPoint m_absoluteLocation; 101 LayoutPoint m_absoluteLocation;
99 }; 102 };
100 103
101 } // namespace WebCore 104 } // namespace WebCore
102 105
103 #endif /* Touch_h */ 106 #endif /* Touch_h */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698