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

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

Issue 1192563002: Pass real tilt information to PointerEvents. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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 3522 matching lines...) Expand 10 before | Expand all | Expand 10 after
3533 3533
3534 const AtomicString& eventName = pointerEventNameForTouchPointState(point State); 3534 const AtomicString& eventName = pointerEventNameForTouchPointState(point State);
3535 3535
3536 bool isEnterOrLeave = false; 3536 bool isEnterOrLeave = false;
3537 3537
3538 PointerEventInit pointerEventInit; 3538 PointerEventInit pointerEventInit;
3539 pointerEventInit.setPointerId(pointerId); 3539 pointerEventInit.setPointerId(pointerId);
3540 pointerEventInit.setWidth(touchInfo.adjustedRadius.width()); 3540 pointerEventInit.setWidth(touchInfo.adjustedRadius.width());
3541 pointerEventInit.setHeight(touchInfo.adjustedRadius.height()); 3541 pointerEventInit.setHeight(touchInfo.adjustedRadius.height());
3542 pointerEventInit.setPressure(point.force()); 3542 pointerEventInit.setPressure(point.force());
3543 pointerEventInit.setTiltX(point.pointerProperties().tiltX);
3544 pointerEventInit.setTiltY(point.pointerProperties().tiltY);
3543 pointerEventInit.setPointerType(PointerTypeStrForTouch); 3545 pointerEventInit.setPointerType(PointerTypeStrForTouch);
3544 pointerEventInit.setIsPrimary(m_pointerIdManager.isPrimary(PointerIdMana ger::PointerTypeTouch, pointerId)); 3546 pointerEventInit.setIsPrimary(m_pointerIdManager.isPrimary(PointerIdMana ger::PointerTypeTouch, pointerId));
3545 pointerEventInit.setScreenX(point.screenPos().x()); 3547 pointerEventInit.setScreenX(point.screenPos().x());
3546 pointerEventInit.setScreenY(point.screenPos().y()); 3548 pointerEventInit.setScreenY(point.screenPos().y());
3547 pointerEventInit.setClientX(touchInfo.adjustedPagePoint.x()); 3549 pointerEventInit.setClientX(touchInfo.adjustedPagePoint.x());
3548 pointerEventInit.setClientY(touchInfo.adjustedPagePoint.y()); 3550 pointerEventInit.setClientY(touchInfo.adjustedPagePoint.y());
3549 pointerEventInit.setButton(0); 3551 pointerEventInit.setButton(0);
3550 pointerEventInit.setButtons(pointerReleasedOrCancelled ? 0 : 1); 3552 pointerEventInit.setButtons(pointerReleasedOrCancelled ? 0 : 1);
3551 3553
3552 pointerEventInit.setCtrlKey(event.ctrlKey()); 3554 pointerEventInit.setCtrlKey(event.ctrlKey());
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
4003 unsigned EventHandler::accessKeyModifiers() 4005 unsigned EventHandler::accessKeyModifiers()
4004 { 4006 {
4005 #if OS(MACOSX) 4007 #if OS(MACOSX)
4006 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 4008 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
4007 #else 4009 #else
4008 return PlatformEvent::AltKey; 4010 return PlatformEvent::AltKey;
4009 #endif 4011 #endif
4010 } 4012 }
4011 4013
4012 } // namespace blink 4014 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | Source/core/inspector/InspectorInputAgent.cpp » ('j') | public/platform/WebPointerProperties.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698