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

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

Issue 1149563003: Make Touch.radiusX/Y float and make Touch.webkit* aliases in the IDL (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/core/dom/Touch.idl » ('j') | Source/core/dom/Touch.idl » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 // DOM Touch implementation 55 // DOM Touch implementation
56 EventTarget* target() const { return m_target.get(); } 56 EventTarget* target() const { return m_target.get(); }
57 unsigned identifier() const { return m_identifier; } 57 unsigned identifier() const { return m_identifier; }
58 double clientX() const { return m_clientPos.x(); } 58 double clientX() const { return m_clientPos.x(); }
59 double clientY() const { return m_clientPos.y(); } 59 double clientY() const { return m_clientPos.y(); }
60 double screenX() const { return m_screenPos.x(); } 60 double screenX() const { return m_screenPos.x(); }
61 double screenY() const { return m_screenPos.y(); } 61 double screenY() const { return m_screenPos.y(); }
62 double pageX() const { return m_pagePos.x(); } 62 double pageX() const { return m_pagePos.x(); }
63 double pageY() const { return m_pagePos.y(); } 63 double pageY() const { return m_pagePos.y(); }
64 double radiusX() const { return m_radius.width(); } 64 float radiusX() const { return m_radius.width(); }
65 double webkitRadiusX() const { return m_radius.width(); } 65 float radiusY() const { return m_radius.height(); }
66 double radiusY() const { return m_radius.height(); } 66 float rotationAngle() const { return m_rotationAngle; }
67 double webkitRadiusY() const { return m_radius.height(); }
68 float webkitRotationAngle() const { return m_rotationAngle; }
69 float force() const { return m_force; } 67 float force() const { return m_force; }
70 float webkitForce() const { return m_force; }
71 68
72 // Blink-internal methods 69 // Blink-internal methods
73 const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; } 70 const LayoutPoint& absoluteLocation() const { return m_absoluteLocation; }
74 const FloatPoint& screenLocation() const { return m_screenPos; } 71 const FloatPoint& screenLocation() const { return m_screenPos; }
75 PassRefPtrWillBeRawPtr<Touch> cloneWithNewTarget(EventTarget*) const; 72 PassRefPtrWillBeRawPtr<Touch> cloneWithNewTarget(EventTarget*) const;
76 73
77 DECLARE_TRACE(); 74 DECLARE_TRACE();
78 75
79 private: 76 private:
80 Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, 77 Touch(LocalFrame* frame, EventTarget* target, unsigned identifier,
(...skipping 18 matching lines...) Expand all
99 float m_force; 96 float m_force;
100 // FIXME(rbyers): Shouldn't we be able to migrate callers to relying on scre enPos, pagePos 97 // FIXME(rbyers): Shouldn't we be able to migrate callers to relying on scre enPos, pagePos
101 // or clientPos? absoluteLocation appears to be the same as pagePos but with out browser 98 // or clientPos? absoluteLocation appears to be the same as pagePos but with out browser
102 // scale applied. 99 // scale applied.
103 LayoutPoint m_absoluteLocation; 100 LayoutPoint m_absoluteLocation;
104 }; 101 };
105 102
106 } // namespace blink 103 } // namespace blink
107 104
108 #endif // Touch_h 105 #endif // Touch_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Touch.idl » ('j') | Source/core/dom/Touch.idl » ('J')

Powered by Google App Engine
This is Rietveld 408576698