Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(995)

Side by Side Diff: Source/core/page/EventHandler.cpp

Issue 247483002: Allow touch events to be uncancelable (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix build on some platforms Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/events/TouchEvent.cpp ('k') | Source/platform/PlatformTouchEvent.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 3636 matching lines...) Expand 10 before | Expand all | Expand 10 after
3647 const EventTargetSet& targetsForState = changedTouches[state].m_targets; 3647 const EventTargetSet& targetsForState = changedTouches[state].m_targets;
3648 3648
3649 for (EventTargetSet::const_iterator it = targetsForState.begin(); it != targetsForState.end(); ++it) { 3649 for (EventTargetSet::const_iterator it = targetsForState.begin(); it != targetsForState.end(); ++it) {
3650 EventTarget* touchEventTarget = it->get(); 3650 EventTarget* touchEventTarget = it->get();
3651 RefPtrWillBeRawPtr<TouchList> targetTouches(isTouchCancelEvent ? emp tyList.get() : touchesByTarget.get(touchEventTarget)); 3651 RefPtrWillBeRawPtr<TouchList> targetTouches(isTouchCancelEvent ? emp tyList.get() : touchesByTarget.get(touchEventTarget));
3652 ASSERT(targetTouches); 3652 ASSERT(targetTouches);
3653 3653
3654 RefPtrWillBeRawPtr<TouchEvent> touchEvent = 3654 RefPtrWillBeRawPtr<TouchEvent> touchEvent =
3655 TouchEvent::create(effectiveTouches.get(), targetTouches.get(), changedTouches[state].m_touches.get(), 3655 TouchEvent::create(effectiveTouches.get(), targetTouches.get(), changedTouches[state].m_touches.get(),
3656 stateName, touchEventTarget->toNode()->document().domWindow( ), 3656 stateName, touchEventTarget->toNode()->document().domWindow( ),
3657 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey( ), event.metaKey()); 3657 0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey( ), event.metaKey(), event.cancelable());
3658 touchEventTarget->toNode()->dispatchTouchEvent(touchEvent.get()); 3658 touchEventTarget->toNode()->dispatchTouchEvent(touchEvent.get());
3659 swallowedEvent = swallowedEvent || touchEvent->defaultPrevented() || touchEvent->defaultHandled(); 3659 swallowedEvent = swallowedEvent || touchEvent->defaultPrevented() || touchEvent->defaultHandled();
3660 } 3660 }
3661 } 3661 }
3662 3662
3663 return swallowedEvent; 3663 return swallowedEvent;
3664 } 3664 }
3665 3665
3666 TouchAction EventHandler::intersectTouchAction(TouchAction action1, TouchAction action2) 3666 TouchAction EventHandler::intersectTouchAction(TouchAction action1, TouchAction action2)
3667 { 3667 {
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
3787 unsigned EventHandler::accessKeyModifiers() 3787 unsigned EventHandler::accessKeyModifiers()
3788 { 3788 {
3789 #if OS(MACOSX) 3789 #if OS(MACOSX)
3790 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3790 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3791 #else 3791 #else
3792 return PlatformEvent::AltKey; 3792 return PlatformEvent::AltKey;
3793 #endif 3793 #endif
3794 } 3794 }
3795 3795
3796 } // namespace WebCore 3796 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/events/TouchEvent.cpp ('k') | Source/platform/PlatformTouchEvent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698