| 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 3853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3864 if (effectiveTouchAction != TouchActionAuto) | 3864 if (effectiveTouchAction != TouchActionAuto) |
| 3865 m_frame->page()->chromeClient().setTouchAction(effectiveTouchAct
ion); | 3865 m_frame->page()->chromeClient().setTouchAction(effectiveTouchAct
ion); |
| 3866 } | 3866 } |
| 3867 } | 3867 } |
| 3868 | 3868 |
| 3869 m_touchPressed = !allTouchReleased; | 3869 m_touchPressed = !allTouchReleased; |
| 3870 | 3870 |
| 3871 // If there's no document receiving touch events, or no handlers on the | 3871 // If there's no document receiving touch events, or no handlers on the |
| 3872 // document set to receive the events, then we can skip all the rest of | 3872 // document set to receive the events, then we can skip all the rest of |
| 3873 // this work. | 3873 // this work. |
| 3874 if (!m_touchSequenceDocument || !m_touchSequenceDocument->frameHost() || !m_
touchSequenceDocument->frameHost()->eventHandlerRegistry().hasEventHandlers(Even
tHandlerRegistry::TouchEvent) || !m_touchSequenceDocument->frame()) { | 3874 if (!m_touchSequenceDocument |
| 3875 || !m_touchSequenceDocument->frame() |
| 3876 || !m_touchSequenceDocument->frameHost() |
| 3877 || !(m_touchSequenceDocument->frameHost()->eventHandlerRegistry().hasEve
ntHandlers(EventHandlerRegistry::TouchEvent) |
| 3878 || m_touchSequenceDocument->frameHost()->eventHandlerRegistry().hasE
ventHandlers(EventHandlerRegistry::TouchMoveEvent))) { |
| 3875 if (allTouchReleased) { | 3879 if (allTouchReleased) { |
| 3876 m_touchSequenceDocument.clear(); | 3880 m_touchSequenceDocument.clear(); |
| 3877 m_touchSequenceUserGestureToken.clear(); | 3881 m_touchSequenceUserGestureToken.clear(); |
| 3878 } | 3882 } |
| 3879 return false; | 3883 return false; |
| 3880 } | 3884 } |
| 3881 | 3885 |
| 3882 // Compute and store the common info used by both PointerEvent and TouchEven
t. | 3886 // Compute and store the common info used by both PointerEvent and TouchEven
t. |
| 3883 WillBeHeapVector<TouchInfo> touchInfos(points.size()); | 3887 WillBeHeapVector<TouchInfo> touchInfos(points.size()); |
| 3884 | 3888 |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4030 unsigned EventHandler::accessKeyModifiers() | 4034 unsigned EventHandler::accessKeyModifiers() |
| 4031 { | 4035 { |
| 4032 #if OS(MACOSX) | 4036 #if OS(MACOSX) |
| 4033 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 4037 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 4034 #else | 4038 #else |
| 4035 return PlatformEvent::AltKey; | 4039 return PlatformEvent::AltKey; |
| 4036 #endif | 4040 #endif |
| 4037 } | 4041 } |
| 4038 | 4042 |
| 4039 } // namespace blink | 4043 } // namespace blink |
| OLD | NEW |