| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 | 253 |
| 254 void EventHandler::clear() | 254 void EventHandler::clear() |
| 255 { | 255 { |
| 256 m_hoverTimer.stop(); | 256 m_hoverTimer.stop(); |
| 257 m_cursorUpdateTimer.stop(); | 257 m_cursorUpdateTimer.stop(); |
| 258 m_fakeMouseMoveEventTimer.stop(); | 258 m_fakeMouseMoveEventTimer.stop(); |
| 259 m_activeIntervalTimer.stop(); | 259 m_activeIntervalTimer.stop(); |
| 260 m_resizeScrollableArea = 0; | 260 m_resizeScrollableArea = 0; |
| 261 m_nodeUnderMouse = nullptr; | 261 m_nodeUnderMouse = nullptr; |
| 262 m_lastNodeUnderMouse = nullptr; | 262 m_lastNodeUnderMouse = nullptr; |
| 263 m_instanceUnderMouse = nullptr; | |
| 264 m_lastInstanceUnderMouse = nullptr; | 263 m_lastInstanceUnderMouse = nullptr; |
| 265 m_lastMouseMoveEventSubframe = nullptr; | 264 m_lastMouseMoveEventSubframe = nullptr; |
| 266 m_lastScrollbarUnderMouse = nullptr; | 265 m_lastScrollbarUnderMouse = nullptr; |
| 267 m_clickCount = 0; | 266 m_clickCount = 0; |
| 268 m_clickNode = nullptr; | 267 m_clickNode = nullptr; |
| 269 m_frameSetBeingResized = nullptr; | 268 m_frameSetBeingResized = nullptr; |
| 270 m_dragTarget = nullptr; | 269 m_dragTarget = nullptr; |
| 271 m_shouldOnlyFireDragOverEvent = false; | 270 m_shouldOnlyFireDragOverEvent = false; |
| 272 m_mousePositionIsUnknown = true; | 271 m_mousePositionIsUnknown = true; |
| 273 m_lastKnownMousePosition = IntPoint(); | 272 m_lastKnownMousePosition = IntPoint(); |
| (...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1827 | 1826 |
| 1828 // If we're capturing, we always go right to that node. | 1827 // If we're capturing, we always go right to that node. |
| 1829 if (m_capturingMouseEventsNode) | 1828 if (m_capturingMouseEventsNode) |
| 1830 result = m_capturingMouseEventsNode.get(); | 1829 result = m_capturingMouseEventsNode.get(); |
| 1831 else { | 1830 else { |
| 1832 // If the target node is a text node, dispatch on the parent node - rdar
://4196646 | 1831 // If the target node is a text node, dispatch on the parent node - rdar
://4196646 |
| 1833 if (result && result->isTextNode()) | 1832 if (result && result->isTextNode()) |
| 1834 result = NodeRenderingTraversal::parent(result); | 1833 result = NodeRenderingTraversal::parent(result); |
| 1835 } | 1834 } |
| 1836 m_nodeUnderMouse = result; | 1835 m_nodeUnderMouse = result; |
| 1837 m_instanceUnderMouse = instanceAssociatedWithShadowTreeElement(result); | |
| 1838 | 1836 |
| 1839 // <use> shadow tree elements may have been recloned, update node under mous
e in any case | 1837 // <use> shadow tree elements may have been recloned, update node under mous
e in any case |
| 1840 if (m_lastInstanceUnderMouse) { | 1838 if (m_lastInstanceUnderMouse) { |
| 1841 SVGElement* lastCorrespondingElement = m_lastInstanceUnderMouse->corresp
ondingElement(); | 1839 SVGElement* lastCorrespondingElement = m_lastInstanceUnderMouse->corresp
ondingElement(); |
| 1842 SVGElement* lastCorrespondingUseElement = m_lastInstanceUnderMouse->corr
espondingUseElement(); | 1840 SVGElement* lastCorrespondingUseElement = m_lastInstanceUnderMouse->corr
espondingUseElement(); |
| 1843 | 1841 |
| 1844 if (lastCorrespondingElement && lastCorrespondingUseElement) { | 1842 if (lastCorrespondingElement && lastCorrespondingUseElement) { |
| 1845 HashSet<SVGElementInstance*> instances = lastCorrespondingElement->i
nstancesForElement(); | 1843 HashSet<SVGElementInstance*> instances = lastCorrespondingElement->i
nstancesForElement(); |
| 1846 | 1844 |
| 1847 // Locate the recloned shadow tree element for our corresponding ins
tance | 1845 // Locate the recloned shadow tree element for our corresponding ins
tance |
| (...skipping 1936 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3784 unsigned EventHandler::accessKeyModifiers() | 3782 unsigned EventHandler::accessKeyModifiers() |
| 3785 { | 3783 { |
| 3786 #if OS(MACOSX) | 3784 #if OS(MACOSX) |
| 3787 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3785 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3788 #else | 3786 #else |
| 3789 return PlatformEvent::AltKey; | 3787 return PlatformEvent::AltKey; |
| 3790 #endif | 3788 #endif |
| 3791 } | 3789 } |
| 3792 | 3790 |
| 3793 } // namespace WebCore | 3791 } // namespace WebCore |
| OLD | NEW |