| 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 2953 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2964 } | 2964 } |
| 2965 } | 2965 } |
| 2966 | 2966 |
| 2967 void EventHandler::applyTouchAdjustment(PlatformGestureEvent* gestureEvent, HitT
estResult* hitTestResult) | 2967 void EventHandler::applyTouchAdjustment(PlatformGestureEvent* gestureEvent, HitT
estResult* hitTestResult) |
| 2968 { | 2968 { |
| 2969 if (!shouldApplyTouchAdjustment(*gestureEvent)) | 2969 if (!shouldApplyTouchAdjustment(*gestureEvent)) |
| 2970 return; | 2970 return; |
| 2971 | 2971 |
| 2972 Node* adjustedNode = nullptr; | 2972 Node* adjustedNode = nullptr; |
| 2973 IntPoint adjustedPoint = gestureEvent->position(); | 2973 IntPoint adjustedPoint = gestureEvent->position(); |
| 2974 IntSize radius = gestureEvent->area(); | |
| 2975 radius.scale(1.f / 2); | |
| 2976 bool adjusted = false; | 2974 bool adjusted = false; |
| 2977 switch (gestureEvent->type()) { | 2975 switch (gestureEvent->type()) { |
| 2978 case PlatformEvent::GestureTap: | 2976 case PlatformEvent::GestureTap: |
| 2979 case PlatformEvent::GestureTapUnconfirmed: | 2977 case PlatformEvent::GestureTapUnconfirmed: |
| 2980 case PlatformEvent::GestureTapDown: | 2978 case PlatformEvent::GestureTapDown: |
| 2981 case PlatformEvent::GestureShowPress: | 2979 case PlatformEvent::GestureShowPress: |
| 2982 adjusted = bestClickableNodeForHitTestResult(*hitTestResult, adjustedPoi
nt, adjustedNode); | 2980 adjusted = bestClickableNodeForHitTestResult(*hitTestResult, adjustedPoi
nt, adjustedNode); |
| 2983 break; | 2981 break; |
| 2984 case PlatformEvent::GestureLongPress: | 2982 case PlatformEvent::GestureLongPress: |
| 2985 case PlatformEvent::GestureLongTap: | 2983 case PlatformEvent::GestureLongTap: |
| (...skipping 1157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4143 unsigned EventHandler::accessKeyModifiers() | 4141 unsigned EventHandler::accessKeyModifiers() |
| 4144 { | 4142 { |
| 4145 #if OS(MACOSX) | 4143 #if OS(MACOSX) |
| 4146 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 4144 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 4147 #else | 4145 #else |
| 4148 return PlatformEvent::AltKey; | 4146 return PlatformEvent::AltKey; |
| 4149 #endif | 4147 #endif |
| 4150 } | 4148 } |
| 4151 | 4149 |
| 4152 } // namespace blink | 4150 } // namespace blink |
| OLD | NEW |