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

Side by Side Diff: third_party/WebKit/Source/modules/device_orientation/DeviceMotionEvent.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Apple Inc. All rights reserved. 2 * Copyright (C) 2010 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 { 43 {
44 return adoptRefWillBeNoop(new DeviceMotionEvent); 44 return adoptRefWillBeNoop(new DeviceMotionEvent);
45 } 45 }
46 static PassRefPtrWillBeRawPtr<DeviceMotionEvent> create(const AtomicString& eventType, DeviceMotionData* deviceMotionData) 46 static PassRefPtrWillBeRawPtr<DeviceMotionEvent> create(const AtomicString& eventType, DeviceMotionData* deviceMotionData)
47 { 47 {
48 return adoptRefWillBeNoop(new DeviceMotionEvent(eventType, deviceMotionD ata)); 48 return adoptRefWillBeNoop(new DeviceMotionEvent(eventType, deviceMotionD ata));
49 } 49 }
50 50
51 void initDeviceMotionEvent(const AtomicString& type, bool bubbles, bool canc elable, DeviceMotionData*); 51 void initDeviceMotionEvent(const AtomicString& type, bool bubbles, bool canc elable, DeviceMotionData*);
52 52
53 DeviceMotionData* deviceMotionData() const { return m_deviceMotionData.get() ; } 53 DeviceMotionData* getDeviceMotionData() const { return m_deviceMotionData.ge t(); }
54 54
55 DeviceAcceleration* acceleration(); 55 DeviceAcceleration* acceleration();
56 DeviceAcceleration* accelerationIncludingGravity(); 56 DeviceAcceleration* accelerationIncludingGravity();
57 DeviceRotationRate* rotationRate(); 57 DeviceRotationRate* rotationRate();
58 double interval(bool& isNull) const; 58 double interval(bool& isNull) const;
59 59
60 const AtomicString& interfaceName() const override; 60 const AtomicString& interfaceName() const override;
61 61
62 DECLARE_VIRTUAL_TRACE(); 62 DECLARE_VIRTUAL_TRACE();
63 63
64 private: 64 private:
65 DeviceMotionEvent(); 65 DeviceMotionEvent();
66 DeviceMotionEvent(const AtomicString& eventType, DeviceMotionData*); 66 DeviceMotionEvent(const AtomicString& eventType, DeviceMotionData*);
67 67
68 PersistentWillBeMember<DeviceMotionData> m_deviceMotionData; 68 PersistentWillBeMember<DeviceMotionData> m_deviceMotionData;
69 PersistentWillBeMember<DeviceAcceleration> m_acceleration; 69 PersistentWillBeMember<DeviceAcceleration> m_acceleration;
70 PersistentWillBeMember<DeviceAcceleration> m_accelerationIncludingGravity; 70 PersistentWillBeMember<DeviceAcceleration> m_accelerationIncludingGravity;
71 PersistentWillBeMember<DeviceRotationRate> m_rotationRate; 71 PersistentWillBeMember<DeviceRotationRate> m_rotationRate;
72 }; 72 };
73 73
74 DEFINE_TYPE_CASTS(DeviceMotionEvent, Event, event, event->interfaceName() == Eve ntNames::DeviceMotionEvent, event.interfaceName() == EventNames::DeviceMotionEve nt); 74 DEFINE_TYPE_CASTS(DeviceMotionEvent, Event, event, event->interfaceName() == Eve ntNames::DeviceMotionEvent, event.interfaceName() == EventNames::DeviceMotionEve nt);
75 75
76 } // namespace blink 76 } // namespace blink
77 77
78 #endif // DeviceMotionEvent_h 78 #endif // DeviceMotionEvent_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698