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 3622 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3633 changedTouches[pointState].m_touches->append(touch); | 3633 changedTouches[pointState].m_touches->append(touch); |
3634 changedTouches[pointState].m_targets.add(touchTarget); | 3634 changedTouches[pointState].m_targets.add(touchTarget); |
3635 } | 3635 } |
3636 } | 3636 } |
3637 if (allTouchReleased) | 3637 if (allTouchReleased) |
3638 m_touchSequenceDocument.clear(); | 3638 m_touchSequenceDocument.clear(); |
3639 | 3639 |
3640 // Now iterate the changedTouches list and m_targets within it, sending | 3640 // Now iterate the changedTouches list and m_targets within it, sending |
3641 // events to the targets as required. | 3641 // events to the targets as required. |
3642 bool swallowedEvent = false; | 3642 bool swallowedEvent = false; |
3643 RefPtrWillBeRawPtr<TouchList> emptyList = TouchList::create(); | |
sof
2014/05/03 15:05:34
The compile fix from https://codereview.chromium.o
| |
3644 for (unsigned state = 0; state != PlatformTouchPoint::TouchStateEnd; ++state ) { | 3643 for (unsigned state = 0; state != PlatformTouchPoint::TouchStateEnd; ++state ) { |
3645 if (!changedTouches[state].m_touches) | 3644 if (!changedTouches[state].m_touches) |
3646 continue; | 3645 continue; |
3647 | 3646 |
3648 const AtomicString& stateName(eventNameForTouchPointState(static_cast<Pl atformTouchPoint::State>(state))); | 3647 const AtomicString& stateName(eventNameForTouchPointState(static_cast<Pl atformTouchPoint::State>(state))); |
3649 const EventTargetSet& targetsForState = changedTouches[state].m_targets; | 3648 const EventTargetSet& targetsForState = changedTouches[state].m_targets; |
3650 for (EventTargetSet::const_iterator it = targetsForState.begin(); it != targetsForState.end(); ++it) { | 3649 for (EventTargetSet::const_iterator it = targetsForState.begin(); it != targetsForState.end(); ++it) { |
3651 EventTarget* touchEventTarget = it->get(); | 3650 EventTarget* touchEventTarget = it->get(); |
3652 RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create( | 3651 RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create( |
3653 touches.get(), touchesByTarget.get(touchEventTarget), changedTou ches[state].m_touches.get(), | 3652 touches.get(), touchesByTarget.get(touchEventTarget), changedTou ches[state].m_touches.get(), |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3785 unsigned EventHandler::accessKeyModifiers() | 3784 unsigned EventHandler::accessKeyModifiers() |
3786 { | 3785 { |
3787 #if OS(MACOSX) | 3786 #if OS(MACOSX) |
3788 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3787 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
3789 #else | 3788 #else |
3790 return PlatformEvent::AltKey; | 3789 return PlatformEvent::AltKey; |
3791 #endif | 3790 #endif |
3792 } | 3791 } |
3793 | 3792 |
3794 } // namespace WebCore | 3793 } // namespace WebCore |
OLD | NEW |