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 |
(...skipping 11 matching lines...) Expand all Loading... |
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 #include "config.h" | 26 #include "config.h" |
27 | 27 |
28 #include "core/dom/Touch.h" | 28 #include "core/dom/Touch.h" |
29 | 29 |
30 #include "core/frame/FrameView.h" | 30 #include "core/frame/FrameView.h" |
31 #include "core/frame/LocalFrame.h" | 31 #include "core/frame/LocalFrame.h" |
| 32 #include "platform/geometry/FloatPoint.h" |
32 | 33 |
33 namespace WebCore { | 34 namespace WebCore { |
34 | 35 |
35 static int contentsX(LocalFrame* frame) | 36 static FloatPoint contentsOffset(LocalFrame* frame) |
36 { | 37 { |
37 if (!frame) | 38 if (!frame) |
38 return 0; | 39 return FloatPoint(); |
39 FrameView* frameView = frame->view(); | 40 FrameView* frameView = frame->view(); |
40 if (!frameView) | 41 if (!frameView) |
41 return 0; | 42 return FloatPoint(); |
42 return frameView->scrollX() / frame->pageZoomFactor(); | 43 float scale = 1.0f / frame->pageZoomFactor(); |
| 44 return FloatPoint(frameView->scrollPosition()).scaledBy(scale); |
43 } | 45 } |
44 | 46 |
45 static int contentsY(LocalFrame* frame) | 47 Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, const
FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float
rotationAngle, float force) |
46 { | |
47 if (!frame) | |
48 return 0; | |
49 FrameView* frameView = frame->view(); | |
50 if (!frameView) | |
51 return 0; | |
52 return frameView->scrollY() / frame->pageZoomFactor(); | |
53 } | |
54 | |
55 Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, int sc
reenX, int screenY, int pageX, int pageY, int radiusX, int radiusY, float rotati
onAngle, float force) | |
56 : m_target(target) | 48 : m_target(target) |
57 , m_identifier(identifier) | 49 , m_identifier(identifier) |
58 , m_clientX(pageX - contentsX(frame)) | 50 , m_clientPos(pagePos - contentsOffset(frame)) |
59 , m_clientY(pageY - contentsY(frame)) | 51 , m_screenPos(screenPos) |
60 , m_screenX(screenX) | 52 , m_pagePos(pagePos) |
61 , m_screenY(screenY) | 53 , m_radius(radius) |
62 , m_pageX(pageX) | |
63 , m_pageY(pageY) | |
64 , m_radiusX(radiusX) | |
65 , m_radiusY(radiusY) | |
66 , m_rotationAngle(rotationAngle) | 54 , m_rotationAngle(rotationAngle) |
67 , m_force(force) | 55 , m_force(force) |
68 { | 56 { |
69 ScriptWrappable::init(this); | 57 ScriptWrappable::init(this); |
70 float scaleFactor = frame->pageZoomFactor(); | 58 float scaleFactor = frame->pageZoomFactor(); |
71 float x = pageX * scaleFactor; | 59 m_absoluteLocation = roundedLayoutPoint(pagePos.scaledBy(scaleFactor)); |
72 float y = pageY * scaleFactor; | |
73 m_absoluteLocation = roundedLayoutPoint(FloatPoint(x, y)); | |
74 } | 60 } |
75 | 61 |
76 Touch::Touch(EventTarget* target, unsigned identifier, int clientX, int clientY,
int screenX, int screenY, int pageX, int pageY, int radiusX, int radiusY, float
rotationAngle, float force, LayoutPoint absoluteLocation) | 62 Touch::Touch(EventTarget* target, unsigned identifier, const FloatPoint& clientP
os, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& rad
ius, float rotationAngle, float force, LayoutPoint absoluteLocation) |
77 : m_target(target) | 63 : m_target(target) |
78 , m_identifier(identifier) | 64 , m_identifier(identifier) |
79 , m_clientX(clientX) | 65 , m_clientPos(clientPos) |
80 , m_clientY(clientY) | 66 , m_screenPos(screenPos) |
81 , m_screenX(screenX) | 67 , m_pagePos(pagePos) |
82 , m_screenY(screenY) | 68 , m_radius(radius) |
83 , m_pageX(pageX) | |
84 , m_pageY(pageY) | |
85 , m_radiusX(radiusX) | |
86 , m_radiusY(radiusY) | |
87 , m_rotationAngle(rotationAngle) | 69 , m_rotationAngle(rotationAngle) |
88 , m_force(force) | 70 , m_force(force) |
89 , m_absoluteLocation(absoluteLocation) | 71 , m_absoluteLocation(absoluteLocation) |
90 { | 72 { |
91 ScriptWrappable::init(this); | 73 ScriptWrappable::init(this); |
92 } | 74 } |
93 | 75 |
94 PassRefPtrWillBeRawPtr<Touch> Touch::cloneWithNewTarget(EventTarget* eventTarget
) const | 76 PassRefPtrWillBeRawPtr<Touch> Touch::cloneWithNewTarget(EventTarget* eventTarget
) const |
95 { | 77 { |
96 return adoptRefWillBeNoop(new Touch(eventTarget, m_identifier, m_clientX, m_
clientY, m_screenX, m_screenY, m_pageX, m_pageY, m_radiusX, m_radiusY, m_rotatio
nAngle, m_force, m_absoluteLocation)); | 78 return adoptRefWillBeNoop(new Touch(eventTarget, m_identifier, m_clientPos,
m_screenPos, m_pagePos, m_radius, m_rotationAngle, m_force, m_absoluteLocation))
; |
97 } | 79 } |
98 | 80 |
99 void Touch::trace(Visitor* visitor) | 81 void Touch::trace(Visitor* visitor) |
100 { | 82 { |
101 visitor->trace(m_target); | 83 visitor->trace(m_target); |
102 } | 84 } |
103 | 85 |
104 } // namespace WebCore | 86 } // namespace WebCore |
OLD | NEW |