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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 750013004: Added experimental tilt and tiltDirection to the Touch interface (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Keep eventSender.setTouchPointTilt under "if" + added 4th argument (set_state_moved) Created 5 years, 9 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
« LayoutTests/fast/events/touch/touch-tilt.html ('K') | « Source/core/dom/Touch.h ('k') | Source/core/dom/Touch.idl » ('j') | no next file with comments »
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 26 matching lines...) Expand all
37 { 37 {
38 if (!frame) 38 if (!frame)
39 return FloatPoint(); 39 return FloatPoint();
40 FrameView* frameView = frame->view(); 40 FrameView* frameView = frame->view();
41 if (!frameView) 41 if (!frameView)
42 return FloatPoint(); 42 return FloatPoint();
43 float scale = 1.0f / frame->pageZoomFactor(); 43 float scale = 1.0f / frame->pageZoomFactor();
44 return FloatPoint(frameView->scrollPosition()).scaledBy(scale); 44 return FloatPoint(frameView->scrollPosition()).scaledBy(scale);
45 } 45 }
46 46
47 Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float rotationAngle, float force) 47 Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float rotationAngle, float force, float tilt, float tiltDirection)
48 : m_target(target) 48 : m_target(target)
49 , m_identifier(identifier) 49 , m_identifier(identifier)
50 , m_clientPos(pagePos - contentsOffset(frame)) 50 , m_clientPos(pagePos - contentsOffset(frame))
51 , m_screenPos(screenPos) 51 , m_screenPos(screenPos)
52 , m_pagePos(pagePos) 52 , m_pagePos(pagePos)
53 , m_radius(radius) 53 , m_radius(radius)
54 , m_rotationAngle(rotationAngle) 54 , m_rotationAngle(rotationAngle)
55 , m_force(force) 55 , m_force(force)
56 , m_tilt(tilt)
57 , m_tiltDirection(tiltDirection)
56 { 58 {
57 float scaleFactor = frame ? frame->pageZoomFactor() : 1.0f; 59 float scaleFactor = frame ? frame->pageZoomFactor() : 1.0f;
58 m_absoluteLocation = roundedLayoutPoint(pagePos.scaledBy(scaleFactor)); 60 m_absoluteLocation = roundedLayoutPoint(pagePos.scaledBy(scaleFactor));
59 } 61 }
60 62
61 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) 63 Touch::Touch(EventTarget* target, unsigned identifier, const FloatPoint& clientP os, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& rad ius, float rotationAngle, float force, float tilt, float tiltDirection, LayoutPo int absoluteLocation)
62 : m_target(target) 64 : m_target(target)
63 , m_identifier(identifier) 65 , m_identifier(identifier)
64 , m_clientPos(clientPos) 66 , m_clientPos(clientPos)
65 , m_screenPos(screenPos) 67 , m_screenPos(screenPos)
66 , m_pagePos(pagePos) 68 , m_pagePos(pagePos)
67 , m_radius(radius) 69 , m_radius(radius)
68 , m_rotationAngle(rotationAngle) 70 , m_rotationAngle(rotationAngle)
69 , m_force(force) 71 , m_force(force)
72 , m_tilt(tilt)
73 , m_tiltDirection(tiltDirection)
70 , m_absoluteLocation(absoluteLocation) 74 , m_absoluteLocation(absoluteLocation)
71 { 75 {
72 } 76 }
73 77
74 PassRefPtrWillBeRawPtr<Touch> Touch::cloneWithNewTarget(EventTarget* eventTarget ) const 78 PassRefPtrWillBeRawPtr<Touch> Touch::cloneWithNewTarget(EventTarget* eventTarget ) const
75 { 79 {
76 return adoptRefWillBeNoop(new Touch(eventTarget, m_identifier, m_clientPos, m_screenPos, m_pagePos, m_radius, m_rotationAngle, m_force, m_absoluteLocation)) ; 80 return adoptRefWillBeNoop(new Touch(eventTarget, m_identifier, m_clientPos, m_screenPos, m_pagePos, m_radius, m_rotationAngle, m_force, m_tilt, m_tiltDirect ion, m_absoluteLocation));
77 } 81 }
78 82
79 DEFINE_TRACE(Touch) 83 DEFINE_TRACE(Touch)
80 { 84 {
81 visitor->trace(m_target); 85 visitor->trace(m_target);
82 } 86 }
83 87
84 } // namespace blink 88 } // namespace blink
OLDNEW
« LayoutTests/fast/events/touch/touch-tilt.html ('K') | « Source/core/dom/Touch.h ('k') | Source/core/dom/Touch.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698