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

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

Issue 1161783006: Populates sourceDevice attribute into TouchEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 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
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 4031 matching lines...) Expand 10 before | Expand all | Expand 10 after
4042 for (unsigned state = 0; state != PlatformTouchPoint::TouchStateEnd; ++state ) { 4042 for (unsigned state = 0; state != PlatformTouchPoint::TouchStateEnd; ++state ) {
4043 if (!changedTouches[state].m_touches) 4043 if (!changedTouches[state].m_touches)
4044 continue; 4044 continue;
4045 4045
4046 const AtomicString& stateName(eventNameForTouchPointState(static_cast<Pl atformTouchPoint::State>(state))); 4046 const AtomicString& stateName(eventNameForTouchPointState(static_cast<Pl atformTouchPoint::State>(state)));
4047 const EventTargetSet& targetsForState = changedTouches[state].m_targets; 4047 const EventTargetSet& targetsForState = changedTouches[state].m_targets;
4048 for (const RefPtrWillBeMember<EventTarget>& eventTarget : targetsForStat e) { 4048 for (const RefPtrWillBeMember<EventTarget>& eventTarget : targetsForStat e) {
4049 EventTarget* touchEventTarget = eventTarget.get(); 4049 EventTarget* touchEventTarget = eventTarget.get();
4050 RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create( 4050 RefPtrWillBeRawPtr<TouchEvent> touchEvent = TouchEvent::create(
4051 touches.get(), touchesByTarget.get(touchEventTarget), changedTou ches[state].m_touches.get(), 4051 touches.get(), touchesByTarget.get(touchEventTarget), changedTou ches[state].m_touches.get(),
4052 stateName, touchEventTarget->toNode()->document().domWindow(), 4052 stateName, touchEventTarget->toNode()->document().domWindow(), I nputDevice::touchEventInstance(),
4053 event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey (), event.cancelable(), event.causesScrollingIfUncanceled(), event.timestamp()); 4053 event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey (), event.cancelable(), event.causesScrollingIfUncanceled(), event.timestamp());
4054 touchEventTarget->toNode()->dispatchTouchEvent(touchEvent.get()); 4054 touchEventTarget->toNode()->dispatchTouchEvent(touchEvent.get());
4055 swallowedEvent = swallowedEvent || touchEvent->defaultPrevented() || touchEvent->defaultHandled(); 4055 swallowedEvent = swallowedEvent || touchEvent->defaultPrevented() || touchEvent->defaultHandled();
4056 } 4056 }
4057 } 4057 }
4058 4058
4059 return swallowedEvent; 4059 return swallowedEvent;
4060 } 4060 }
4061 4061
4062 TouchAction EventHandler::intersectTouchAction(TouchAction action1, TouchAction action2) 4062 TouchAction EventHandler::intersectTouchAction(TouchAction action1, TouchAction action2)
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
4174 unsigned EventHandler::accessKeyModifiers() 4174 unsigned EventHandler::accessKeyModifiers()
4175 { 4175 {
4176 #if OS(MACOSX) 4176 #if OS(MACOSX)
4177 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4177 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4178 #else 4178 #else
4179 return PlatformEvent::AltKey; 4179 return PlatformEvent::AltKey;
4180 #endif 4180 #endif
4181 } 4181 }
4182 4182
4183 } // namespace blink 4183 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698