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 2392 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2403 | 2403 |
2404 m_longTapShouldInvokeContextMenu = false; | 2404 m_longTapShouldInvokeContextMenu = false; |
2405 if (m_frame->settings() && m_frame->settings()->touchDragDropEnabled() && m_ frame->view()) { | 2405 if (m_frame->settings() && m_frame->settings()->touchDragDropEnabled() && m_ frame->view()) { |
2406 PlatformMouseEvent mouseDragEvent(adjustedPoint, gestureEvent.globalPosi tion(), LeftButton, PlatformEvent::MouseMoved, 1, | 2406 PlatformMouseEvent mouseDragEvent(adjustedPoint, gestureEvent.globalPosi tion(), LeftButton, PlatformEvent::MouseMoved, 1, |
2407 gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey (), gestureEvent.metaKey(), WTF::currentTime()); | 2407 gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey (), gestureEvent.metaKey(), WTF::currentTime()); |
2408 HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Disall owShadowContent); | 2408 HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Disall owShadowContent); |
2409 MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseDragE vent); | 2409 MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseDragE vent); |
2410 m_didStartDrag = false; | 2410 m_didStartDrag = false; |
2411 m_mouseDownMayStartDrag = true; | 2411 m_mouseDownMayStartDrag = true; |
2412 dragState().m_dragSrc = 0; | 2412 dragState().m_dragSrc = 0; |
2413 m_mouseDown = mouseDragEvent; | |
varunjain
2013/05/17 16:43:51
I think this change is correct. But I am a little
Hongbo Min
2013/05/20 01:47:15
I don't rename m_mouseDown field since it just rec
| |
2413 m_mouseDownPos = m_frame->view()->windowToContents(mouseDragEvent.positi on()); | 2414 m_mouseDownPos = m_frame->view()->windowToContents(mouseDragEvent.positi on()); |
2414 handleDrag(mev, DontCheckDragHysteresis); | 2415 handleDrag(mev, DontCheckDragHysteresis); |
2415 if (m_didStartDrag) { | 2416 if (m_didStartDrag) { |
2416 m_longTapShouldInvokeContextMenu = true; | 2417 m_longTapShouldInvokeContextMenu = true; |
2417 return true; | 2418 return true; |
2418 } | 2419 } |
2419 } | 2420 } |
2420 #if OS(ANDROID) | 2421 #if OS(ANDROID) |
2421 bool shouldLongPressSelectWord = true; | 2422 bool shouldLongPressSelectWord = true; |
2422 #else | 2423 #else |
(...skipping 1497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3920 unsigned EventHandler::accessKeyModifiers() | 3921 unsigned EventHandler::accessKeyModifiers() |
3921 { | 3922 { |
3922 #if OS(DARWIN) | 3923 #if OS(DARWIN) |
3923 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3924 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
3924 #else | 3925 #else |
3925 return PlatformEvent::AltKey; | 3926 return PlatformEvent::AltKey; |
3926 #endif | 3927 #endif |
3927 } | 3928 } |
3928 | 3929 |
3929 } // namespace WebCore | 3930 } // namespace WebCore |
OLD | NEW |