| 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 m_previousGestureScrolledNode = 0; | 357 m_previousGestureScrolledNode = 0; |
| 358 m_scrollbarHandlingScrollGesture = 0; | 358 m_scrollbarHandlingScrollGesture = 0; |
| 359 m_maxMouseMovedDuration = 0; | 359 m_maxMouseMovedDuration = 0; |
| 360 m_baseEventType = PlatformEvent::NoType; | 360 m_baseEventType = PlatformEvent::NoType; |
| 361 m_didStartDrag = false; | 361 m_didStartDrag = false; |
| 362 m_touchPressed = false; | 362 m_touchPressed = false; |
| 363 m_mouseDownMayStartSelect = false; | 363 m_mouseDownMayStartSelect = false; |
| 364 m_mouseDownMayStartDrag = false; | 364 m_mouseDownMayStartDrag = false; |
| 365 } | 365 } |
| 366 | 366 |
| 367 void EventHandler::nodeWillBeRemoved(Node* nodeToBeRemoved) | 367 void EventHandler::nodeWillBeRemoved(Node& nodeToBeRemoved) |
| 368 { | 368 { |
| 369 if (nodeToBeRemoved->contains(m_clickNode.get())) | 369 if (nodeToBeRemoved.contains(m_clickNode.get())) |
| 370 m_clickNode = 0; | 370 m_clickNode = 0; |
| 371 } | 371 } |
| 372 | 372 |
| 373 static void setSelectionIfNeeded(FrameSelection& selection, const VisibleSelecti
on& newSelection) | 373 static void setSelectionIfNeeded(FrameSelection& selection, const VisibleSelecti
on& newSelection) |
| 374 { | 374 { |
| 375 if (selection.selection() != newSelection) | 375 if (selection.selection() != newSelection) |
| 376 selection.setSelection(newSelection); | 376 selection.setSelection(newSelection); |
| 377 } | 377 } |
| 378 | 378 |
| 379 static inline bool dispatchSelectStart(Node* node) | 379 static inline bool dispatchSelectStart(Node* node) |
| (...skipping 3490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3870 unsigned EventHandler::accessKeyModifiers() | 3870 unsigned EventHandler::accessKeyModifiers() |
| 3871 { | 3871 { |
| 3872 #if OS(MACOSX) | 3872 #if OS(MACOSX) |
| 3873 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3873 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3874 #else | 3874 #else |
| 3875 return PlatformEvent::AltKey; | 3875 return PlatformEvent::AltKey; |
| 3876 #endif | 3876 #endif |
| 3877 } | 3877 } |
| 3878 | 3878 |
| 3879 } // namespace WebCore | 3879 } // namespace WebCore |
| OLD | NEW |