| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "sky/engine/config.h" | 5 #include "sky/engine/config.h" |
| 6 #include "sky/engine/core/frame/NewEventHandler.h" | 6 #include "sky/engine/core/frame/NewEventHandler.h" |
| 7 | 7 |
| 8 #include "sky/engine/core/dom/Document.h" | 8 #include "sky/engine/core/dom/Document.h" |
| 9 #include "sky/engine/core/dom/NodeRenderingTraversal.h" | 9 #include "sky/engine/core/dom/NodeRenderingTraversal.h" |
| 10 #include "sky/engine/core/editing/Editor.h" | 10 #include "sky/engine/core/editing/Editor.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 HitTestResult result(point); | 72 HitTestResult result(point); |
| 73 if (!m_frame.contentRenderer()) | 73 if (!m_frame.contentRenderer()) |
| 74 return result; | 74 return result; |
| 75 m_frame.contentRenderer()->hitTest(HitTestRequest(HitTestRequest::ReadOnly),
result); | 75 m_frame.contentRenderer()->hitTest(HitTestRequest(HitTestRequest::ReadOnly),
result); |
| 76 return result; | 76 return result; |
| 77 } | 77 } |
| 78 | 78 |
| 79 bool NewEventHandler::dispatchPointerEvent(PointerState& state, const WebPointer
Event& event) | 79 bool NewEventHandler::dispatchPointerEvent(PointerState& state, const WebPointer
Event& event) |
| 80 { | 80 { |
| 81 RefPtr<PointerEvent> pointerEvent = PointerEvent::create(event); | 81 RefPtr<PointerEvent> pointerEvent = PointerEvent::create(event); |
| 82 pointerEvent->setDX(event.x - state.x); | 82 pointerEvent->setDx(event.x - state.x); |
| 83 pointerEvent->setDY(event.y - state.y); | 83 pointerEvent->setDy(event.y - state.y); |
| 84 state.x = event.x; | 84 state.x = event.x; |
| 85 state.y = event.y; | 85 state.y = event.y; |
| 86 // TODO(abarth): Keep track of how many pointers are targeting the same node | 86 // TODO(abarth): Keep track of how many pointers are targeting the same node |
| 87 // and only mark the first one as primary. | 87 // and only mark the first one as primary. |
| 88 return state.target->dispatchEvent(pointerEvent.release()); | 88 return state.target->dispatchEvent(pointerEvent.release()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 bool NewEventHandler::dispatchGestureEvent(Node& target, const WebGestureEvent&
event) | 91 bool NewEventHandler::dispatchGestureEvent(Node& target, const WebGestureEvent&
event) |
| 92 { | 92 { |
| 93 RefPtr<GestureEvent> gestureEvent = GestureEvent::create(event); | 93 RefPtr<GestureEvent> gestureEvent = GestureEvent::create(event); |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 auto it = m_stateForPointer.find(event.pointer); | 244 auto it = m_stateForPointer.find(event.pointer); |
| 245 if (it == m_stateForPointer.end()) | 245 if (it == m_stateForPointer.end()) |
| 246 return false; | 246 return false; |
| 247 PointerState stateCopy = it->second; | 247 PointerState stateCopy = it->second; |
| 248 m_stateForPointer.erase(it); | 248 m_stateForPointer.erase(it); |
| 249 ASSERT(stateCopy.target); | 249 ASSERT(stateCopy.target); |
| 250 return dispatchPointerEvent(stateCopy, event); | 250 return dispatchPointerEvent(stateCopy, event); |
| 251 } | 251 } |
| 252 | 252 |
| 253 } | 253 } |
| OLD | NEW |