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

Side by Side Diff: third_party/WebKit/Source/web/WebInputEventConversion.cpp

Issue 1760183002: Fixed missing pointerTypes for touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
« no previous file with comments | « content/renderer/pepper/event_conversion.cc ('k') | no next file » | 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 608 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 case PlatformEvent::Char: 619 case PlatformEvent::Char:
620 return WebInputEvent::Char; 620 return WebInputEvent::Char;
621 default: 621 default:
622 return WebInputEvent::Undefined; 622 return WebInputEvent::Undefined;
623 } 623 }
624 } 624 }
625 625
626 static WebTouchPoint toWebTouchPoint(const Touch* touch, const LayoutObject* lay outObject, WebTouchPoint::State state) 626 static WebTouchPoint toWebTouchPoint(const Touch* touch, const LayoutObject* lay outObject, WebTouchPoint::State state)
627 { 627 {
628 WebTouchPoint point; 628 WebTouchPoint point;
629 point.pointerType = WebPointerProperties::PointerType::Touch;
Navid Zolghadr 2016/03/03 19:11:20 Do we by any chance pass this point while we are h
mustaq 2016/03/03 19:18:36 No, this reverse conversion is used for plugins.
629 point.id = touch->identifier(); 630 point.id = touch->identifier();
630 point.screenPosition = touch->screenLocation(); 631 point.screenPosition = touch->screenLocation();
631 point.position = convertAbsoluteLocationForLayoutObjectFloat(touch->absolute Location(), *layoutObject); 632 point.position = convertAbsoluteLocationForLayoutObjectFloat(touch->absolute Location(), *layoutObject);
632 point.radiusX = touch->radiusX(); 633 point.radiusX = touch->radiusX();
633 point.radiusY = touch->radiusY(); 634 point.radiusY = touch->radiusY();
634 point.rotationAngle = touch->rotationAngle(); 635 point.rotationAngle = touch->rotationAngle();
635 point.force = touch->force(); 636 point.force = touch->force();
636 point.state = state; 637 point.state = state;
637 return point; 638 return point;
638 } 639 }
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
740 break; 741 break;
741 case GestureSourceTouchscreen: 742 case GestureSourceTouchscreen:
742 sourceDevice = WebGestureDeviceTouchscreen; 743 sourceDevice = WebGestureDeviceTouchscreen;
743 break; 744 break;
744 case GestureSourceUninitialized: 745 case GestureSourceUninitialized:
745 ASSERT_NOT_REACHED(); 746 ASSERT_NOT_REACHED();
746 } 747 }
747 } 748 }
748 749
749 } // namespace blink 750 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/pepper/event_conversion.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698