Source/core/dom/Touch.cpp - Issue 1170703003: Touch.identifier should be long, not unsigned long

Side by Side Diff: Source/core/dom/Touch.cpp

Issue 1170703003: Touch.identifier should be long, not unsigned long (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Updating as per review comments 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

OLD	NEW
1 /*	1 /*

2 * Copyright 2008, The Android Open Source Project	2 * Copyright 2008, The Android Open Source Project

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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * * Redistributions of source code must retain the above copyright	7 * * Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * * Redistributions in binary form must reproduce the above copyright	9 * * Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 26 matching lines...) Expand all Loading...
37 {	37 {

38 if (!frame)	38 if (!frame)

39 return FloatPoint();	39 return FloatPoint();

40 FrameView* frameView = frame->view();	40 FrameView* frameView = frame->view();

41 if (!frameView)	41 if (!frameView)

42 return FloatPoint();	42 return FloatPoint();

43 float scale = 1.0f / frame->pageZoomFactor();	43 float scale = 1.0f / frame->pageZoomFactor();

44 return FloatPoint(frameView->scrollPosition()).scaledBy(scale);	44 return FloatPoint(frameView->scrollPosition()).scaledBy(scale);

45 }	45 }

46	46

47 Touch::Touch(LocalFrame* frame, EventTarget* target, unsigned identifier, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float rotationAngle, float force)	47 Touch::Touch(LocalFrame* frame, EventTarget* target, int identifier, const Float Point& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float rota tionAngle, float force)

48 : m_target(target)	48 : m_target(target)

49 , m_identifier(identifier)	49 , m_identifier(identifier)

50 , m_clientPos(pagePos - contentsOffset(frame))	50 , m_clientPos(pagePos - contentsOffset(frame))

51 , m_screenPos(screenPos)	51 , m_screenPos(screenPos)

52 , m_pagePos(pagePos)	52 , m_pagePos(pagePos)

53 , m_radius(radius)	53 , m_radius(radius)

54 , m_rotationAngle(rotationAngle)	54 , m_rotationAngle(rotationAngle)

55 , m_force(force)	55 , m_force(force)

56 {	56 {

57 float scaleFactor = frame ? frame->pageZoomFactor() : 1.0f;	57 float scaleFactor = frame ? frame->pageZoomFactor() : 1.0f;

58 m_absoluteLocation = roundedLayoutPoint(pagePos.scaledBy(scaleFactor));	58 m_absoluteLocation = roundedLayoutPoint(pagePos.scaledBy(scaleFactor));

59 }	59 }

60	60

61 Touch::Touch(EventTarget* target, unsigned identifier, const FloatPoint& clientP os, const FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& rad ius, float rotationAngle, float force, LayoutPoint absoluteLocation)	61 Touch::Touch(EventTarget* target, int identifier, const FloatPoint& clientPos, c onst FloatPoint& screenPos, const FloatPoint& pagePos, const FloatSize& radius, float rotationAngle, float force, LayoutPoint absoluteLocation)

62 : m_target(target)	62 : m_target(target)

63 , m_identifier(identifier)	63 , m_identifier(identifier)

64 , m_clientPos(clientPos)	64 , m_clientPos(clientPos)

65 , m_screenPos(screenPos)	65 , m_screenPos(screenPos)

66 , m_pagePos(pagePos)	66 , m_pagePos(pagePos)

67 , m_radius(radius)	67 , m_radius(radius)

68 , m_rotationAngle(rotationAngle)	68 , m_rotationAngle(rotationAngle)

69 , m_force(force)	69 , m_force(force)

70 , m_absoluteLocation(absoluteLocation)	70 , m_absoluteLocation(absoluteLocation)

71 {	71 {

72 }	72 }

73	73

74 PassRefPtrWillBeRawPtr<Touch> Touch::cloneWithNewTarget(EventTarget* eventTarget ) const	74 PassRefPtrWillBeRawPtr<Touch> Touch::cloneWithNewTarget(EventTarget* eventTarget ) const

75 {	75 {

76 return adoptRefWillBeNoop(new Touch(eventTarget, m_identifier, m_clientPos, m_screenPos, m_pagePos, m_radius, m_rotationAngle, m_force, m_absoluteLocation)) ;	76 return adoptRefWillBeNoop(new Touch(eventTarget, m_identifier, m_clientPos, m_screenPos, m_pagePos, m_radius, m_rotationAngle, m_force, m_absoluteLocation)) ;

77 }	77 }

78	78

79 DEFINE_TRACE(Touch)	79 DEFINE_TRACE(Touch)

80 {	80 {

81 visitor->trace(m_target);	81 visitor->trace(m_target);

82 }	82 }

83	83

84 } // namespace blink	84 } // namespace blink

OLD	NEW

« no previous file with comments | « Source/core/dom/Touch.h ('k') | Source/core/dom/Touch.idl » ('j') | Source/core/inspector/InspectorInputAgent.cpp » ('J')