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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 #include "core/style/ComputedStyle.h" | 84 #include "core/style/ComputedStyle.h" |
85 #include "core/svg/SVGDocumentExtensions.h" | 85 #include "core/svg/SVGDocumentExtensions.h" |
86 #include "platform/PlatformGestureEvent.h" | 86 #include "platform/PlatformGestureEvent.h" |
87 #include "platform/PlatformKeyboardEvent.h" | 87 #include "platform/PlatformKeyboardEvent.h" |
88 #include "platform/PlatformTouchEvent.h" | 88 #include "platform/PlatformTouchEvent.h" |
89 #include "platform/PlatformWheelEvent.h" | 89 #include "platform/PlatformWheelEvent.h" |
90 #include "platform/RuntimeEnabledFeatures.h" | 90 #include "platform/RuntimeEnabledFeatures.h" |
91 #include "platform/TraceEvent.h" | 91 #include "platform/TraceEvent.h" |
92 #include "platform/WindowsKeyboardCodes.h" | 92 #include "platform/WindowsKeyboardCodes.h" |
93 #include "platform/geometry/FloatPoint.h" | 93 #include "platform/geometry/FloatPoint.h" |
| 94 #include "platform/graphics/GraphicsScreen.h" |
94 #include "platform/graphics/Image.h" | 95 #include "platform/graphics/Image.h" |
95 #include "platform/heap/Handle.h" | 96 #include "platform/heap/Handle.h" |
96 #include "platform/scroll/ScrollAnimatorBase.h" | 97 #include "platform/scroll/ScrollAnimatorBase.h" |
97 #include "platform/scroll/Scrollbar.h" | 98 #include "platform/scroll/Scrollbar.h" |
98 #include "wtf/Assertions.h" | 99 #include "wtf/Assertions.h" |
99 #include "wtf/CurrentTime.h" | 100 #include "wtf/CurrentTime.h" |
100 #include "wtf/StdLibExtras.h" | 101 #include "wtf/StdLibExtras.h" |
101 #include "wtf/TemporaryChange.h" | 102 #include "wtf/TemporaryChange.h" |
102 | 103 |
103 namespace blink { | 104 namespace blink { |
(...skipping 3362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3466 // We are starting a text/image/url drag, so the cursor should be an arrow | 3467 // We are starting a text/image/url drag, so the cursor should be an arrow |
3467 // FIXME <rdar://7577595>: Custom cursors aren't supported during drag and d
rop (default to pointer). | 3468 // FIXME <rdar://7577595>: Custom cursors aren't supported during drag and d
rop (default to pointer). |
3468 m_frame->view()->setCursor(pointerCursor()); | 3469 m_frame->view()->setCursor(pointerCursor()); |
3469 | 3470 |
3470 if (initiator == DragInitiator::Mouse && !dragHysteresisExceeded(event.event
().position())) | 3471 if (initiator == DragInitiator::Mouse && !dragHysteresisExceeded(event.event
().position())) |
3471 return true; | 3472 return true; |
3472 | 3473 |
3473 // Once we're past the hysteresis point, we don't want to treat this gesture
as a click | 3474 // Once we're past the hysteresis point, we don't want to treat this gesture
as a click |
3474 invalidateClick(); | 3475 invalidateClick(); |
3475 | 3476 |
| 3477 WillPaintForDevice device(Page::screenId(m_frame->page())); |
3476 if (!tryStartDrag(event)) { | 3478 if (!tryStartDrag(event)) { |
3477 // Something failed to start the drag, clean up. | 3479 // Something failed to start the drag, clean up. |
3478 clearDragDataTransfer(); | 3480 clearDragDataTransfer(); |
3479 dragState().m_dragSrc = nullptr; | 3481 dragState().m_dragSrc = nullptr; |
3480 } | 3482 } |
3481 | 3483 |
3482 m_mouseDownMayStartDrag = false; | 3484 m_mouseDownMayStartDrag = false; |
3483 // Whether or not the drag actually started, no more default handling (like
selection). | 3485 // Whether or not the drag actually started, no more default handling (like
selection). |
3484 return true; | 3486 return true; |
3485 } | 3487 } |
(...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4169 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() | 4171 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() |
4170 { | 4172 { |
4171 #if OS(MACOSX) | 4173 #if OS(MACOSX) |
4172 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo
rmEvent::AltKey); | 4174 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo
rmEvent::AltKey); |
4173 #else | 4175 #else |
4174 return PlatformEvent::AltKey; | 4176 return PlatformEvent::AltKey; |
4175 #endif | 4177 #endif |
4176 } | 4178 } |
4177 | 4179 |
4178 } // namespace blink | 4180 } // namespace blink |
OLD | NEW |