Chromium Code Reviews| 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 2620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2631 } | 2631 } |
| 2632 | 2632 |
| 2633 if (adjusted) { | 2633 if (adjusted) { |
| 2634 hitTestResult->resolveRectBasedTest(adjustedNode, m_frame->view()->windo wToContents(adjustedPoint)); | 2634 hitTestResult->resolveRectBasedTest(adjustedNode, m_frame->view()->windo wToContents(adjustedPoint)); |
| 2635 gestureEvent->applyTouchAdjustment(adjustedPoint); | 2635 gestureEvent->applyTouchAdjustment(adjustedPoint); |
| 2636 } | 2636 } |
| 2637 } | 2637 } |
| 2638 | 2638 |
| 2639 bool EventHandler::sendContextMenuEvent(const PlatformMouseEvent& event) | 2639 bool EventHandler::sendContextMenuEvent(const PlatformMouseEvent& event) |
| 2640 { | 2640 { |
| 2641 // Clear caret blinking suspended state to make sure that mourse blinks | |
|
Inactive
2014/07/15 16:02:46
s/mourse/caret
Sunil Ratnu
2014/07/15 17:10:55
Done.
| |
| 2642 // when we tap on an empty field and start typing again. | |
| 2643 if (m_frame && m_frame->selection().isCaretBlinkingSuspended()) | |
| 2644 m_frame->selection().setCaretBlinkingSuspended(false); | |
| 2645 | |
| 2641 Document* doc = m_frame->document(); | 2646 Document* doc = m_frame->document(); |
| 2642 FrameView* v = m_frame->view(); | 2647 FrameView* v = m_frame->view(); |
| 2643 if (!v) | 2648 if (!v) |
| 2644 return false; | 2649 return false; |
| 2645 | 2650 |
| 2646 // Clear mouse press state to avoid initiating a drag while context menu is up. | 2651 // Clear mouse press state to avoid initiating a drag while context menu is up. |
| 2647 m_mousePressed = false; | 2652 m_mousePressed = false; |
| 2648 LayoutPoint viewportPos = v->windowToContents(event.position()); | 2653 LayoutPoint viewportPos = v->windowToContents(event.position()); |
| 2649 HitTestRequest request(HitTestRequest::Active); | 2654 HitTestRequest request(HitTestRequest::Active); |
| 2650 MouseEventWithHitTestResults mev = doc->prepareMouseEvent(request, viewportP os, event); | 2655 MouseEventWithHitTestResults mev = doc->prepareMouseEvent(request, viewportP os, event); |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3817 unsigned EventHandler::accessKeyModifiers() | 3822 unsigned EventHandler::accessKeyModifiers() |
| 3818 { | 3823 { |
| 3819 #if OS(MACOSX) | 3824 #if OS(MACOSX) |
| 3820 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3825 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3821 #else | 3826 #else |
| 3822 return PlatformEvent::AltKey; | 3827 return PlatformEvent::AltKey; |
| 3823 #endif | 3828 #endif |
| 3824 } | 3829 } |
| 3825 | 3830 |
| 3826 } // namespace WebCore | 3831 } // namespace WebCore |
| OLD | NEW |